sn0w/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
8837 commits 13 branches 64 tags 302 MiB
Commit graph

680 commits

Author SHA1 Message Date
Ivan Tashkinov
64095961fe [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes 
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex
 2019-10-02 20:42:40 +03:00
Egor Kislitsyn
e0c68eeb02
Move :favourites and :bookmarks actions to StatusController 2019-10-02 21:31:19 +07:00
Egor Kislitsyn
7f2bc57725
Move follows, mutes and blocks actions to AccountController 2019-10-02 21:22:21 +07:00
Egor Kislitsyn
d3c404af12
Add MastoFEController 2019-10-02 20:36:08 +07:00
Egor Kislitsyn
1c6e1055c8
Add CustomEmojiController 2019-10-02 19:16:34 +07:00
Egor Kislitsyn
c8b01f6667
Extract instance actions from MastodonAPIController to InstanceController 2019-10-02 14:13:52 +07:00
kaniini
8557176808 Merge branch 'split-masto-api/auth' into 'develop' 
Extract auth actions from `MastodonAPIController` to `AuthController`

See merge request pleroma/pleroma!1759
 2019-10-02 07:02:56 +00:00
kaniini
9b38bf4af4 Merge branch 'features/private-reblogs' into 'develop' 
Allow receiving private self-announces over ActivityPub

See merge request pleroma/pleroma!1766
 2019-10-02 07:02:24 +00:00
feld
1255ec888d Revert "Add upload limits to /api/v1/instance" 
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
 2019-10-01 22:16:29 +00:00
Thibaut Girka
427d0c2a00 Store private announcements in object.data["announcements"], filter them on display 2019-10-01 22:39:25 +02:00
Thibaut Girka
7d5a9f3f6d Add tests for privately announcing statuses via API 2019-10-01 20:38:29 +02:00
Egor Kislitsyn
af690d1033
Extract auth actions from MastodonAPIController to AuthController 2019-10-01 15:54:45 +07:00
Egor Kislitsyn
2dad6dd020
Extract apps actions from MastodonAPIController to AppController 2019-10-01 15:21:46 +07:00
Egor Kislitsyn
39695c4436 Extract suggestions actions from MastodonAPIController to SuggestionController 2019-10-01 15:07:49 +07:00
Egor Kislitsyn
585bc57edb
Extract media actions from MastodonAPIController to MediaController 2019-10-01 14:36:35 +07:00
Egor Kislitsyn
36a34c36fe
Extract poll actions from MastodonAPIController to PollController 2019-10-01 11:44:34 +07:00
kPherox
f364438032
Add rel="ugc" 2019-10-01 02:24:06 +09:00
kPherox
a0f101ee80
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials 2019-10-01 01:40:33 +09:00
Egor Kislitsyn
0c6009dd2e
Extract mascot actions from MastodonAPIController to MascotController 2019-09-30 19:32:43 +07:00
Egor Kislitsyn
987e0b8be8
Move update_credentials to MastodonAPI.AccountController 2019-09-30 19:10:56 +07:00
Egor Kislitsyn
c0ce2d5faf
Move account_register, relationships and verify_credentials to MastodonAPI.AccountController 2019-09-30 19:10:55 +07:00
Egor Kislitsyn
122cc050ab
Move account_lists test to MastodonAPI.AccountControllerTest 2019-09-30 19:10:55 +07:00
Egor Kislitsyn
38db4878a4
Disable async in DomainBlockControllerTest 2019-09-30 19:10:55 +07:00
Egor Kislitsyn
3c5ecb70b4
Add PleromaAPI.AccountController 2019-09-30 19:10:55 +07:00
Egor Kislitsyn
e7aef27c00
Fix merge 2019-09-30 19:10:54 +07:00
Egor Kislitsyn
1207e88195
Fix ReportControllerTest 2019-09-30 18:30:10 +07:00
kaniini
0e356cc800 Merge branch 'split-masto-api/reports' into 'develop' 
Extract report actions from `MastodonAPIController` to `ReportController`

See merge request pleroma/pleroma!1744
 2019-09-30 11:17:30 +00:00
kaniini
74d8fadf37 Merge branch 'split-masto-api/conversations' into 'develop' 
Extract conversation actions from `MastodonAPIController` to ConversationController

See merge request pleroma/pleroma!1743
 2019-09-30 10:49:40 +00:00
Egor Kislitsyn
b7f27a4f58
Extract report actions from MastodonAPIController to ReportController 
Update MastodonAPI.ReportView
 2019-09-30 17:44:10 +07:00
Ariadne Conill
b7877e9b1c mastodon api: implement rendering of listen activities 2019-09-30 10:39:17 +00:00
Egor Kislitsyn
d4d88b3361
Extract conversation actions from MastodonAPIController to ConversationController 2019-09-30 16:52:07 +07:00
rinpatch
e9d1aa75d5 Revert subscription refactoring. 
As discussed in pleroma-meta#2

This reverts commit eb9aa7aa10, reversing
changes made to c4fbb56984.
 2019-09-29 18:43:27 +03:00
kaniini
6d74a7528c Merge branch 'feature/follow-requests-count' into 'develop' 
Mastodon API: add follow_requests_count

See merge request pleroma/pleroma!1726
 2019-09-29 11:44:31 +00:00
Maksim Pechnikov
1053319cd6 Merge branch 'develop' into tests/mastodon_api_controller.ex 2019-09-28 10:36:04 +03:00
Haelwenn (lanodan) Monnier
9202904da9
status_controller.ex: Posting media status without content defined 2019-09-28 01:53:41 +02:00
rinpatch
374f83d29b Fix not being able to post empty statuses with attachments 
Attachment field was filled in after the empty status check
 2019-09-28 01:58:06 +03:00
kaniini
92d08d4113 Merge branch 'split-masto-api/follow-requests' into 'develop' 
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`

See merge request pleroma/pleroma!1730
 2019-09-27 07:54:54 +00:00
kaniini
68bf99baf2 Merge branch 'split-masto-api/domain-blocks' into 'develop' 
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`

See merge request pleroma/pleroma!1729
 2019-09-27 07:54:08 +00:00
kaniini
27a3221d57 Merge branch 'split-masto-api/scheduled-statuses' into 'develop' 
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`

See merge request pleroma/pleroma!1728
 2019-09-27 07:53:22 +00:00
Egor Kislitsyn
408750b94e Extract domain blocks actions from MastodonAPIController to DomainBlockController 2019-09-27 14:28:05 +07:00
Egor Kislitsyn
99c5a35890 Extract follow requests actions from MastodonAPIController to FollowRequestController 2019-09-27 14:25:17 +07:00
Egor Kislitsyn
0a5b106ddd Extract scheduled statuses actions from MastodonAPIController to ScheduledActivityController 2019-09-27 13:36:28 +07:00
Egor Kislitsyn
621377f378 Extract filter actions from MastodonAPIController to FilterController 2019-09-27 13:06:25 +07:00
kaniini
91e2bcf218 Merge branch 'refactor/status-controller' into 'develop' 
Extract status actions from `MastodonAPIController` to `StatusController`

See merge request pleroma/pleroma!1719
 2019-09-27 04:37:48 +00:00
Ariadne Conill
14294243a2 mastodon api: implement follow_requests_count 2019-09-27 04:22:40 +00:00
Egor Kislitsyn
5ea5c58a85 Move view logic from StatusController.context to StatusView and add a test 2019-09-27 10:52:47 +07:00
Egor Kislitsyn
76b7e5cd5b Move StatusController tests from MastodonAPIControllerTest to StatusControllerTest 2019-09-27 10:52:47 +07:00
kaniini
eb9aa7aa10 Merge branch 'refactor/subscription' into 'develop' 
Refactor subscription functionality

Closes #1130

See merge request pleroma/pleroma!1664
 2019-09-27 03:51:24 +00:00
Egor Kislitsyn
98d1347a4e Extract status actions from MastodonAPIController into StatusController 2019-09-27 10:51:15 +07:00
Maksim Pechnikov
3d722dc200 Merge branch 'develop' into tests/mastodon_api_controller.ex 2019-09-26 16:16:30 +03:00
Roman Chvanikov
b4b147000c Merge develop 2019-09-26 10:38:54 +03:00
Egor Kislitsyn
3572cf29b7 Extract timeline actions from MastodonAPIController into TimelineController 2019-09-26 10:53:42 +07:00
kaniini
6abe12dced Merge branch 'refactor/notification-controller' into 'develop' 
Extract notification actions from `MastodonAPIController` into `NotificationController`

See merge request pleroma/pleroma!1646
 2019-09-26 03:13:22 +00:00
kaniini
48a82c4609 Merge branch 'refactor/user' into 'develop' 
Simplify updating user's `info`

See merge request pleroma/pleroma!1712
 2019-09-26 03:00:38 +00:00
Hakaba Hitoyo
5fb72170a7 Revert "add _discoverable_ keyword into ActivityPub @context" 
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
 2019-09-26 02:57:41 +00:00
Egor Kislitsyn
209395c7e6 Add User.change_info/2 and User.update_info/2 2019-09-24 19:50:07 +07:00
Egor Kislitsyn
a66a7a328f Extract notification actions from MastodonAPIController into NotificationController 2019-09-24 15:16:44 +07:00
Maksim Pechnikov
d75d0ae134 Merge branch 'develop' into tests/mastodon_api_controller.ex 2019-09-24 08:06:04 +03:00
kaniini
19263f30c3 Merge branch 'support-rel-ugc' into 'develop' 
Add support for `rel="ugc"`

Closes #1255

See merge request pleroma/pleroma!1679
 2019-09-23 22:41:31 +00:00
Maksim Pechnikov
494bb6bac6 updated tests 2019-09-23 22:37:30 +03:00
Maksim Pechnikov
179fa32dd5 Merge branch 'develop' into tests/mastodon_api_controller.ex 2019-09-23 21:41:57 +03:00
eugenijm
7cf1252455 Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (GET /api/v1/timelines/public) 2019-09-20 18:27:00 +03:00
Ivan Tashkinov
6f67aed3ac [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes 
# Conflicts:
#	lib/pleroma/web/admin_api/admin_api_controller.ex
 2019-09-19 10:59:09 +03:00
Egor Kislitsyn
95c948110c Add rel="ugc" to hashtags and mentions 2019-09-19 14:56:10 +07:00
Egor Kislitsyn
cf3041220a Add support for rel="ugc" 2019-09-19 14:56:10 +07:00
eugenijm
fe5e0b7846 Mastodon API: Return pleroma.direct_conversation_id when creating direct messages (POST /api/v1/statuses) 2019-09-19 08:59:25 +03:00
rinpatch
b0ec82d24a Merge branch 'chores/bump-copyright-year' into 'develop' 
Bump copyright years of files changed in 2019

See merge request pleroma/pleroma!1698
 2019-09-18 21:57:49 +00:00
Haelwenn (lanodan) Monnier
447514dfa2
Bump copyright years of files changed in 2019 
Done via the following command:
git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
 2019-09-18 23:21:11 +02:00
Ivan Tashkinov
01c1078015 [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes 
# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub_controller.ex
 2019-09-17 22:53:26 +03:00
eugenijm
450bf7a63c Mastodon API: Add a setting to hide follow/follower count from the user view (hide_follows_count and hide_followers_count) 2019-09-17 14:45:47 +03:00
Roman Chvanikov
6042e21b25 Move subscription notifications to a separate controller 2019-09-16 21:59:49 +03:00
Roman Chvanikov
76c3e290fc Merge develop 2019-09-16 20:30:42 +03:00
Egor Kislitsyn
ca88e37a8f Fix a race condition in tests 2019-09-16 12:55:05 +07:00
Ivan Tashkinov
efbc2edba1 [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes 
# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub_controller.ex
#	lib/pleroma/web/router.ex
 2019-09-15 18:52:27 +03:00
Ivan Tashkinov
e6f43a831b [#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes). 2019-09-15 18:22:08 +03:00
Ivan Tashkinov
610236d6be [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 
# Conflicts:
#	docs/config.md
 2019-09-15 10:12:24 +03:00
Roman Chvanikov
d7457c9165 Merge branch 'develop' into refactor/subscription 2019-09-14 18:29:51 +03:00
Ivan Tashkinov
6bcedb693c [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 
# Conflicts:
#	docs/config.md
#	mix.lock
 2019-09-14 16:11:44 +03:00
rinpatch
a78a7ee455 Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs 2019-09-14 10:50:08 +00:00
rinpatch
85b6144ffd Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs 2019-09-14 10:46:35 +00:00
rinpatch
5c5ebd3861 Mastodon API: Respect post privacy in favourited/reblogged endpoints 2019-09-14 01:50:15 +03:00
stwf
25a64a4aa0 Capture test error messages where appropriate 2019-09-13 11:46:41 -04:00
Roman Chvanikov
0bd2b85edb Separate Subscription Notifications from regular Notifications 2019-09-13 18:25:27 +03:00
Maksim Pechnikov
bc3e8c033b fix formatting 2019-09-13 15:06:34 +03:00
Maksim Pechnikov
ec5aaf5bd7 fix tests 2019-09-13 14:59:58 +03:00
Maksim Pechnikov
d8a178274b fix Activity.get_by_id 2019-09-13 07:12:34 +03:00
Maksim
58b17196fa Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs 2019-09-13 03:58:58 +00:00
Egor Kislitsyn
b40b10b53d Add an endpoint to get multiple statuses by IDs 2019-09-10 13:39:45 +07:00
Maksim Pechnikov
ab2f21e470 tests for mastodon_api_controller.ex 2019-09-06 21:50:00 +03:00
Ivan Tashkinov
ca1ba1e272 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 
# Conflicts:
#	test/web/twitter_api/twitter_api_controller_test.exs
 2019-09-06 13:26:05 +03:00
rinpatch
896ffabe37 Merge branch 'so-long-twitterapi' into 'develop' 
Removing TwitterAPI

See merge request pleroma/pleroma!1605
 2019-09-06 08:43:38 +00:00
Haelwenn
fe7cf44c40 Merge branch 'feature/mastoapi-accounts-external' into 'develop' 
Mastdon API: Add ability to get a remote account by nickname to `/api/v1/accounts/:id`

See merge request pleroma/pleroma!1622
 2019-09-05 12:48:27 +00:00
rinpatch
b312ca3d52 Mastodon API Poll view: Fix handling of polls without an end date 2019-09-05 12:03:39 +03:00
Ivan Tashkinov
79cf629e1a Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-09-05 11:30:41 +03:00
rinpatch
3face45467 Mastodon API: Add pleroma.thread_muted to Status entity 
Needed for pleroma-fe!941
 2019-09-04 14:17:23 +03:00
rinpatch
cc1d1ee406 Mastdon API: Add ability to get a remote account by nickname to 
`/api/v1/accounts/:id`
 2019-09-03 19:26:10 +03:00
Ivan Tashkinov
e890ea7e82 [#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 
# Conflicts:
#	config/config.exs
 2019-08-31 14:25:43 +03:00
rinpatch
90c2dae9a4 Remove most of Pleroma.Web.TwitterAPI.TwitterAPI 2019-08-31 10:20:34 +03:00
Egor Kislitsyn
019ced0558 Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test/web/mastodon_api/views 2019-08-26 19:37:57 +07:00
Egor Kislitsyn
30510ade0e Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests 2019-08-26 19:37:54 +07:00
kPherox
eb75ea502d
Update test for custom fields when content-type urlencoded 2019-08-26 16:55:26 +09:00
kPherox
b8777b01ae
Update test for custom fields when name empty string 2019-08-26 03:30:31 +09:00
kPherox
45e21a9df4
Rename fields to fields_attributes 2019-08-25 07:34:11 +09:00
lain
efb8818e9e Activity Expiration: Switch to 'expires_in' system. 2019-08-24 17:22:48 +02:00
lain
cc6c0b4ba6 Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration 2019-08-24 15:48:33 +02:00
Ivan Tashkinov
7101ba1a21 Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-08-22 21:01:28 +03:00
Ivan Tashkinov
256ff09aa8 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 
# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/scheduled_activity_worker.ex
#	lib/pleroma/web/federator/retry_queue.ex
#	lib/pleroma/web/oauth/token/clean_worker.ex
#	test/user_test.exs
#	test/web/federator_test.exs
 2019-08-22 20:59:58 +03:00
Maksim Pechnikov
85bd8a4e31 fixed clear config after test 2019-08-21 21:24:35 +03:00
lain
ef43016b2c Merge branch 'feature/custom-fields' into 'develop' 
Add custom profile fields

See merge request pleroma/pleroma!1488
 2019-08-20 12:44:14 +00:00
Maksim
a320358703 added test helpers to clear config after tests 2019-08-19 15:34:29 +00:00
lain
7ab2dbbdb6 Merge branch 'pleroma-conversations' into 'develop' 
Extended Pleroma Conversations

See merge request pleroma/pleroma!1535
 2019-08-16 12:55:33 +00:00
Ivan Tashkinov
8778c16dac Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-08-14 21:44:50 +03:00
Ivan Tashkinov
a180c1360e [#1149] Oban mailer job. Adjusted tests. 2019-08-14 21:42:21 +03:00
stwf
d81f63845a Implement Pleroma.Stats as GenServer 2019-08-14 11:59:33 -04:00
lain
560dbad538 Merge remote-tracking branch 'origin/develop' into pleroma-conversations 2019-08-14 15:30:40 +02:00
Egor Kislitsyn
f7bbf99caa Use info.fields instead of source_data for remote users 2019-08-14 14:52:54 +07:00
Egor Kislitsyn
2c35d4b0b0 Add configurable account field name length limit 2019-08-14 14:52:54 +07:00
Egor Kislitsyn
db3c05f6b4 Add configurable account field value length limit 2019-08-14 14:52:54 +07:00
Egor Kislitsyn
d6094b405d Fix tests 2019-08-14 14:52:54 +07:00
Egor Kislitsyn
e0ac5c7a66 Add custom profile fields 2019-08-14 14:52:54 +07:00
Maksim
04da1166db tests for /web/mastodon_api/mastodon_api.ex 2019-08-13 21:12:37 +00:00
lain
511ccea5aa ConversationView: Align parameter names with other views. 2019-08-12 14:23:06 +02:00
lain
23c46f7e72 Conversations: Use 'recipients' for accounts in conversation view. 
According to gargron, this is the intended usage.
 2019-08-12 12:51:08 +02:00
kaniini
84808e1697 Merge branch 'develop' into 'fix/hide-follows-counters' 
# Conflicts:
#   CHANGELOG.md
 2019-08-10 18:49:04 +00:00
rinpatch
0802a08871 Mastodon API: Fix thread mute detection 
It was calling CommonAPI.thread_muted? with post author's account
instead of viewer's one.
 2019-08-10 16:27:46 +03:00
rinpatch
409bcad54b Mastodon API: Set follower/following counters to 0 when hiding 
followers/following is enabled

We are already doing that in AP representation, so I think we should do
it here as well for consistency.
 2019-08-09 16:53:55 +03:00
lain
a2b98f6d58 Merge remote-tracking branch 'origin/develop' into pleroma-conversations 2019-08-08 16:04:20 +02:00
lain
d6fe220e32 Linting. 2019-08-05 16:11:23 +02:00
lain
3af6d14da7 Pleroma Conversations API: Add a way to set recipients. 2019-08-05 15:09:19 +02:00
Sergey Suprunenko
040347b248 Remove spaces from the domain search 2019-08-03 18:13:20 +00:00
feld
d93d777915 Fix/mediaproxy whitelist base url 2019-08-02 17:07:09 +00:00
lain
7483679a7b StatusView: Return direct conversation id. 2019-07-31 15:12:29 +02:00
Sergey Suprunenko
c0e258cf21 Redirect not logged-in users to the MastoFE login page on private instances 2019-07-29 16:17:22 +00:00
Sachin Joshi
242f5c585e add account confirmation email resend in mastodon api 2019-07-28 20:30:10 +00:00
Sergey Suprunenko
b20020da16 Show the url advertised in the Activity in the Status JSON response 2019-07-24 19:28:21 +00:00
Mike Verdone
0e2b5a3e6a WIP 2019-07-24 17:25:11 +02:00
Eugenij
4504135894 Add domain_blocking to the relationship API (GET /api/v1/accounts/relationships) 2019-07-24 15:12:27 +00:00
Mike Verdone
2c83eb0b15 Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor" 
This reverts commit 2981821db8.
 2019-07-24 17:09:59 +02:00
Mike Verdone
2981821db8 squash! Expose expires_at datetime in mastoAPI only for the activity actor 
NOTE: rewrite the commit msg
 2019-07-24 16:51:09 +02:00
Mike Verdone
3cb471ec06 Expose expires_at datetime in mastoAPI only for the activity actor 
In the "pleroma" section of the MastoAPI for status activities you can
see an expires_at item that states when the activity will expire, or
nothing if the activity will not expire.

The expires_at date is only visible to the person who posted the
activity. This is the conservative approach in case some attacker
decides to write a logger for expiring posts. However, in the future of
OCAP, signed requests, and all that stuff, this attack might not be that
likely. Some other pleroma dev should remove the restriction in the code
at that time, if they're satisfied with the security implications of
doing so.
 2019-07-24 14:47:22 +02:00
Mike Verdone
704960b3c1 Add support for activity expiration to common and Masto API 
The "expires_at" parameter accepts an ISO8601-formatted date which
defines when the activity will expire.

At this point the API will not give you any feedback about if your post
will expire or not.
 2019-07-24 14:45:14 +02:00
Mike Verdone
8ba7a151ad Cleanup: fix a comment 2019-07-24 13:14:52 +02:00
Ariadne Conill
d3bdb8e704 rich media: parser: splice the given URL into the result 2019-07-23 23:51:29 +00:00
Sadposter
c400565427 fix test names because i cannot type 2019-07-23 15:47:17 +01:00
Sadposter
299c0e965b actually reblog on the reblog test 2019-07-23 15:38:19 +01:00
Sadposter
7026018c8c Use correct URL for tests 2019-07-23 15:31:35 +01:00
Sadposter
452980652d Mix format 2019-07-23 15:13:05 +01:00
Sadposter
fd1fa5a2ec add tests for unauthed reqs to liked/reblogged_by 2019-07-23 15:08:41 +01:00
Sadposter
a5d6287ba8 Hide blocked users from interactions 2019-07-22 02:42:29 +00:00
Sergey Suprunenko
43a7cd27fe [tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest 2019-07-20 13:07:51 +00:00
Eugenij
4bf2bb9cff Fix password reset for non-test env 
Fixes `Plug.Conn.NotSentError` that causes a 5xx error in response
instead of 404 and 400.

Fixes pattern matching error caused by different response format
in test and non-test env: `Pleroma.Emails.Mailer.deliver_async` returns
:ok when PleromaJobQueue is enabled and `{:ok, _}` when it's disabled.
In tests, it's disabled.
 2019-07-17 18:09:31 +00:00
Alexander Strizhakov
10f82c88b8 mastoapi password reset 
added rate limit to password reset

configure rate limit in runtime
 2019-07-16 21:44:50 +00:00
Eugenij
520ee6c591 Add pleroma.deactivated to the Account entity (Mastodon API) 2019-07-16 11:14:46 +00:00
Eugenij
c4ca142e14 Add the blocked_by attribute to the relationship API (GET /api/v1/accounts/relationships) 2019-07-16 11:04:11 +00:00
rinpatch
996fd58ac4 Merge branch 'bugfix/poll-id-as-string' into 'develop' 
Status View: Poll ids are strings.

See merge request pleroma/pleroma!1430
 2019-07-16 06:06:22 +00:00
lain
7a24def473 Mastodon Controller: Fix tests. 2019-07-16 14:01:18 +09:00
lain
1ed24bcc76 Status View: Poll ids are strings. 
All ids in mastodon are strings, in general.
 2019-07-16 12:47:40 +09:00
Sergey Suprunenko
b74300bc7a Add more tests for MastodonAPIController and CommonAPI 2019-07-15 19:47:23 +00:00
Egor Kislitsyn
64a946643e Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-07-15 14:11:54 +07:00
Egor Kislitsyn
a87c313309 Support list visibility in StatusView 2019-07-15 14:00:29 +07:00
Alexander Strizhakov
e7c39b7ac8 Feature/1072 muting notifications 2019-07-14 13:29:31 +00:00
Mark Felder
360e4cdaa2 Move these to pleroma namespace in Mastodon API 2019-07-12 11:25:58 -05:00
Eugenij
4198c3ac39 Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel 2019-07-11 13:55:31 +00:00
Haelwenn (lanodan) Monnier
252e129b1e
MastoAPI: Add categories to custom emojis 
Note: This isn’t in a release yet, can be seen in mastofe on the
rebase/glitch-soc branch.
 2019-07-10 17:02:37 +02:00
Sergey Suprunenko
ff55e3c16f Create mentions only for explicitly mentioned users 2019-07-10 13:29:50 +00:00
Maksim
008c55e4e9 add test for search_controller/ 100% coverage 2019-07-10 08:28:03 +00:00
Ivan Tashkinov
829e997223 [#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests 
# Conflicts:
#	lib/pleroma/object.ex
#	test/web/activity_pub/transmogrifier_test.exs
#	test/web/ostatus/ostatus_test.exs
 2019-07-09 21:46:16 +03:00
kaniini
1417627d07 Merge branch 'remove-avatar-header' into 'develop' 
Ability to reset avatar, profile banner and backgroud

See merge request pleroma/pleroma!1187
 2019-07-09 17:51:41 +00:00
Ivan Tashkinov
daff85a985 [#878] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity. 2019-07-08 19:53:02 +03:00
rinpatch
72b88c82bc Mastodon API: Fix embedded relationships not being rendered inside of statuses 2019-07-08 12:07:08 +03:00
Eugenij
1f76740e10 Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses) 2019-06-30 09:08:46 +00:00
Sergey Suprunenko
d53fb55bb7 Return correct response when reply to a direct message is not direct itself 2019-06-26 10:59:27 +00:00
Maksim Pechnikov
4ad15ad2a9 add ignore hosts and TLDs for rich_media 2019-06-25 22:25:37 +03:00
Sachin Joshi
a0c65bbd6c Merge branch 'develop' into 'remove-avatar-header' 
# Conflicts:
#   CHANGELOG.md
 2019-06-23 03:25:50 +00:00
rinpatch
c7acca2abb Mastodon API: Sanitize display names 
Closes #1000
 2019-06-18 14:12:11 +03:00
lain
a440cf856d Mastodon API: Return the token needed for the chat. 2019-06-15 10:59:35 +02:00
rinpatch
62ffc00a5d Merge branch 'feature/add-background-image-to-mastoapi' into 'develop' 
AccountView: Add user background.

See merge request pleroma/pleroma!1280
 2019-06-14 16:49:28 +00:00
Maksim
ee4ed87fb4 [#948] /api/v1/account_search added optional parameters (limit, offset, following) 2019-06-14 11:39:57 +00:00
lain
eac298083f MastodonAPI: Add a way to update the background image. 2019-06-14 11:19:22 +02:00
lain
5965efb216 AccountView: Add user background. 2019-06-13 19:08:05 +02:00
lain
63ab3c30eb Merge branch 'feature/rate-limiter' into 'develop' 
Feature/Rate Limiter

Closes #943

See merge request pleroma/pleroma!1266
 2019-06-11 11:32:01 +00:00
Egor Kislitsyn
ad04d12de6 Replace MastodonAPIController.account_register/2 rate limiter 2019-06-11 16:06:03 +07:00
Sergey Suprunenko
365268d522 Add more tests for using media_proxy and whitelists 2019-06-10 11:34:11 +00:00
lain
7e9f7ea0c2 MastodonAPI: Add test for user search. 2019-06-06 16:16:22 +02:00
Egor Kislitsyn
5b04f07a1e Limit search for unauthenticated users to local users only 2019-06-05 16:51:04 +07:00
Maksim Pechnikov
4f2e359687 Merge branch 'develop' into issue/941 2019-06-04 09:49:08 +03:00
kaniini
9d2563a3de Merge branch 'generic-fe-settings' into 'develop' 
Generic settings store for frontend user settings

See merge request pleroma/pleroma!1221
 2019-06-04 05:43:43 +00:00
Maksim Pechnikov
64ada7f960 fix tests 2019-06-03 22:51:14 +03:00
Maksim Pechnikov
f13d6c7f78 update api to set skip_thread_containment 2019-06-03 21:02:57 +03:00
rinpatch
dc91bcc0af Merge branch 'develop' into feature/polls-2-electric-boogalo 2019-06-03 13:16:17 +03:00
lambda
314758c25b Merge branch 'align-mastodon-conversations' into 'develop' 
Mastodon Conversations API: Align to Mastodon behavior

See merge request pleroma/pleroma!1215
 2019-06-03 09:48:37 +00:00
rinpatch
026b245dbc Merge branch 'develop' into feature/polls-2-electric-boogalo 2019-06-03 11:14:52 +03:00
rinpatch
2fe3a20638 Make error message about author's inability to vote more sensible 2019-06-02 23:33:15 +03:00
rinpatch
c47da0e65d Add tests for poll view 2019-06-02 23:25:33 +03:00
kaniini
5402d04e3c Merge branch 'feature/notification-control-part-2' into 'develop' 
notification controls, part 2

See merge request pleroma/pleroma!1204
 2019-06-02 08:25:37 +00:00
rinpatch
cfa588e357 Fix Credo issues 2019-06-01 21:42:29 +03:00
rinpatch
65db5e9f52 Resolve merge conflicts 2019-06-01 16:29:58 +03:00
rinpatch
300d94c628 Add poll votes 
Also in this commit by accident:
- Fix query ordering causing exclude_poll_votes to not work
- Do not create notifications for Answer objects
 2019-06-01 16:17:46 +03:00
Haelwenn (lanodan) Monnier
5d3ece2861
Remove now useless flavours switching 2019-06-01 01:44:10 +02:00
lain
7861974ab2 MastodonAPI: Add extension to set and get pleroma_settings_store. 2019-05-31 14:50:18 +02:00