Alex Gleason
77b1ea68a7
Merge remote-tracking branch 'upstream/develop' into aliases
2020-10-08 15:44:48 -05:00
Mark Felder
ed6511a086
Lint
2020-10-07 15:28:29 -05:00
Mark Felder
636c00037d
Fix duplicate @doc entries
2020-10-07 09:58:45 -05:00
Roman Chvanikov
8f5589cf66
Merge develop
2020-09-23 13:56:50 +03:00
Alex Gleason
3104367931
Merge remote-tracking branch 'upstream/develop' into email-fix-develop
2020-09-22 13:37:02 -05:00
Alex Gleason
23d5d7cf59
Fix #2172 HTTP error on password reset
2020-09-21 14:09:26 -05:00
Mark Felder
55562ca936
Merge branch 'develop' into feature/gen-magic
2020-09-10 16:05:22 -05:00
Roman Chvanikov
91b9985e1c
Pass expires_in param from status controller
2020-09-08 15:26:06 +03:00
43b07c31cb
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
...
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
2020-09-08 13:53:47 +03:00
Roman Chvanikov
c56e3d4f3b
Add expires_in param for account mutes
2020-09-08 13:26:44 +03:00
d1a6f67b1d
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
...
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
2020-09-02 17:11:24 +00:00
lain
581f382e71
ListController: DRY up stuff.
2020-09-02 18:32:00 +02:00
Mark Felder
cbf7f0e029
Disallow password resets for deactivated accounts.
...
Ensure all responses to password reset events are identical.
2020-09-02 09:09:13 -05:00
Haelwenn (lanodan) Monnier
d872858046
Fix removing an account from a list
...
Mastodon (Frontend) changed a different method for deletes,
keeping old format as mastodon documentation is too loose
2020-09-01 12:49:32 +02:00
lain
cfc99fe05c
TimelineController: Keys are atoms now.
...
Closes #2078
Closes #2070
2020-08-26 15:37:30 +02:00
Ivan Tashkinov
95529ab709
[ #2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).
2020-08-14 20:55:45 +03:00
lain
66122a11b5
AccountController: Build the correct update activity.
...
Will fix federation issues.
2020-08-10 10:33:05 +02:00
Alex Gleason
4af1b80381
Clean up account aliases
2020-08-07 17:37:15 -05:00
Alex Gleason
cc196e2cd5
Merge remote-tracking branch 'upstream/develop' into restrict-domain
2020-08-05 13:08:31 -05:00
Ivan Tashkinov
27b0a8b155
[ #1985 ] Prevented force login on registration if account approval and/or email confirmation needed.
...
Refactored login code in OAuthController, reused in AccountController. Added tests.
2020-07-31 14:13:38 +03:00
Haelwenn
87fe31fb5c
Merge branch '1993-confirm-users-on-registration' into 'develop'
...
AccountController: Don't explicitly ask to keep users unconfirmed.
Closes #1993
See merge request pleroma/pleroma!2809
2020-07-30 20:01:04 +00:00
lain
c25c21dd22
AccountController: Don't explicitly ask to keep users unconfirmed.
...
Confirmation is set in User.register_changeset based on the config
settings.
2020-07-29 11:47:03 +02:00
Alex Gleason
3b7c454418
Let favourites and emoji reactions optionally be hidden
2020-07-28 14:58:30 -05:00
51627a10e5
Merge branch 'unblock-domain-via-query' into 'develop'
...
Allow unblocking a domain via query params
Closes #1971
See merge request pleroma/pleroma!2783
2020-07-23 20:06:11 +00:00
Mark Felder
4bfad0b483
Support blocking via query parameters as well and document the change.
2020-07-23 12:59:40 -05:00
Ivan Tashkinov
6f5f7af607
[ #1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.
...
Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
2020-07-22 19:06:00 +03:00
Egor Kislitsyn
bdb3375933
Allow unblocking a domain via query params
2020-07-21 16:06:46 +04:00
Alex Gleason
afa8b469ed
Allow restricting public timeline by instance
2020-07-18 19:35:07 -05:00
Haelwenn (lanodan) Monnier
d29b8997f4
MastoAPI: fix & test giving MRF reject reasons
2020-07-15 15:25:33 +02:00
lain
b39eb6ecc5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
2020-07-10 12:26:53 +02:00
lain
8ca1f3e8c6
Merge branch '1723-token-fixes' into 'develop'
...
AccountController: Return scope in proper format.
Closes #1723
See merge request pleroma/pleroma!2694
2020-07-09 13:10:05 +00:00
Haelwenn
bdc7b60610
Merge branch '1925-muting-reblogs' into 'develop'
...
AccountController: Fix muting / unmuting reblogs.
Closes #1925
See merge request pleroma/pleroma!2732
2020-07-09 12:10:26 +00:00
lain
6d688f14fa
Merge branch 'bugfix/status-deletion' into 'develop'
...
#1920 fix activity deletion
See merge request pleroma/pleroma!2721
2020-07-09 09:37:52 +00:00
lain
6335b32aa8
Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'
...
[#1895 ] Made hashtag timeline respect `:restrict_unauthenticated` instance setting
Closes #1895
See merge request pleroma/pleroma!2731
2020-07-08 10:55:03 +00:00
Ivan Tashkinov
a6495f4a68
[ #1895 ] credo fix.
2020-07-08 12:54:23 +03:00
lain
c0385cf47a
AccountController: Fix muting / unmuting reblogs.
2020-07-08 11:52:29 +02:00
Ivan Tashkinov
3f8370a285
[ #1895 ] Applied code review suggestion.
2020-07-08 12:36:44 +03:00
Ivan Tashkinov
3e08e77151
[ #1895 ] Made hashtag timeline respect :restrict_unauthenticated
instance setting.
2020-07-07 20:37:11 +03:00
lain
59cf78e412
AccountController: Allow removal / reset of user images.
2020-07-07 16:53:03 +02:00
lain
74b88c0a8b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
2020-07-06 11:27:06 +02:00
Roman Chvanikov
fc1f34b851
Delete activity before sending response to client
2020-07-06 00:01:25 +03:00
lain
c2a052a346
Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'
...
MastoAPI 2.9.0: status text on deletion
See merge request pleroma/pleroma!2690
2020-07-03 15:06:33 +00:00
lain
d3efb50262
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text
2020-07-03 16:44:31 +02:00
lain
945e75c8e8
SearchController: Trim query.
2020-07-03 16:36:55 +02:00
lain
e3b5559780
AccountController: Make setting accepts_chat_messages possible.
2020-07-03 15:54:25 +02:00
lain
59540131c1
Credo fixes.
2020-06-29 14:09:03 +02:00
lain
e374872fe7
AccountOperation: Correctly describe create response.
2020-06-29 13:49:48 +02:00
Haelwenn (lanodan) Monnier
244655e884
MastoAPI: Show source field when deleting
2020-06-26 19:52:20 +02:00
lain
f378e93bf4
AccountController: Return scope in proper format.
2020-06-26 16:15:27 +02:00
lain
8cfb58a8c0
AccountController: Extract blocking to CommonAPI.
2020-06-25 11:44:04 +02:00
lain
2c603f2009
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
2020-06-23 10:17:12 +02:00
lain
59bdef0c33
Merge branch 'feature/1739-account-endpoints' into 'develop'
...
account visibility in masto api
Closes #1739
See merge request pleroma/pleroma!2488
2020-06-22 12:37:10 +00:00
lain
b05f795326
Credo fixes
2020-06-22 14:02:29 +02:00
lain
e785cd5cae
ActivityPub: Remove update
and switch to pipeline.
2020-06-22 13:59:45 +02:00
Sergey Suprunenko
b63646169d
Add support for bot field in update_credentials
2020-06-19 21:18:07 +02:00
Ivan Tashkinov
5237a2df9f
[ #1873 ] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
2020-06-19 16:14:06 +03:00
rinpatch
4ec2fb967e
Merge branch 'features/users-raw_bio' into 'develop'
...
User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326
2020-06-17 10:34:23 +00:00
href
39f7fc5b8e
Update majic & call plug before OpenApiSpex
2020-06-16 19:00:54 +02:00
href
f124f68205
Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME
2020-06-16 15:27:27 +02:00
Haelwenn
4115701f71
Merge branch 'recipients-experiments' into 'develop'
...
ActivityPub: Don't show announces of your own objects in timeline.
See merge request pleroma/pleroma!2637
2020-06-12 16:57:13 +00:00
Ivan Tashkinov
2188097066
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
2020-06-12 14:25:41 +03:00
Ivan Tashkinov
b28cec4271
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
2020-06-11 16:05:14 +03:00
lain
9e411372d0
ActivityPub: Don't show announces of your own objects in timeline.
2020-06-10 12:10:09 +02:00
lain
3b5282bef2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-08 11:19:18 +02:00
lain
7d66dd180a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-08 10:18:10 +02:00
Haelwenn (lanodan) Monnier
e1b07402ab
User: Add raw_bio, storing unformatted bio
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1643
2020-06-06 16:23:16 +02:00
Egor Kislitsyn
b02df1803e
Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
2020-06-05 23:15:10 +04:00
lain
a8ca030d85
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-05 16:53:56 +02:00
Haelwenn
d74985af23
Merge branch 'features/apc2s-pagination' into 'develop'
...
Fix AP C2S pagination
Closes #866 and #751
See merge request pleroma/pleroma!2491
2020-06-05 14:52:09 +00:00
Haelwenn
54bae06b4f
Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})
...
Unifies all the similar functions to one and simplify some blocks with it.
2020-06-05 14:48:02 +00:00
Egor Kislitsyn
317e2b8d61
Use atoms as keys in ActivityPub.fetch_*
functions options
2020-06-04 21:36:26 +04:00
6c1c2cddec
Merge branch 'fix/1794-hashtag-search-results' into 'develop'
...
[#1794 ] Improvements to hashtags extraction from search query
Closes #1794
See merge request pleroma/pleroma!2611
2020-06-02 16:30:03 +00:00
lain
127ccc4e1c
NotificationController: Don't return chat_mentions by default.
2020-06-02 14:05:53 +02:00
rinpatch
6fb900a496
Merge branch 'user-updates' into 'develop'
...
AccountController: Federate user account changes.
Closes pleroma-support#33 and #1801
See merge request pleroma/pleroma!2617
2020-06-01 20:48:11 +00:00
lain
d4d4b92f75
TimelineController: Only return Create
in public timelines.
2020-06-01 13:17:56 +02:00
lain
9460983032
AccountController: Federate user account changes.
...
Hotfixy commit, will be moved to the pipeline.
2020-06-01 13:03:22 +02:00
Steven Fuchs
6d4b80822b
Conversation pagination
2020-05-30 10:02:37 +00:00
Ivan Tashkinov
24f40b8a26
[ #1794 ] Fixed search query splitting regex to deal with Unicode. Adjusted a test.
2020-05-30 10:29:08 +03:00
Ivan Tashkinov
c181e555db
[ #1794 ] Improvements to hashtags extraction from search query.
2020-05-29 22:03:14 +03:00
Haelwenn (lanodan) Monnier
b3b367b894
Bugfix: Reuse Controller.Helper pagination for APC2S
2020-05-29 16:14:45 +02:00
lain
51bc6674f6
Mastodon API Controllers: Use the correct params for rate limiting.
2020-05-26 13:45:54 +02:00
lain
23e248694d
Announcements: Fix all tests.
2020-05-21 13:16:21 +02:00
Maksim Pechnikov
41f8f17260
fix api/v1/accounts/update_credentials
2020-05-19 09:42:41 +03:00
lain
96f7b1b140
Merge branch 'show-media-endpoint-fixes' into 'develop'
...
MediaController OAuth scope assignments fix
See merge request pleroma/pleroma!2541
2020-05-18 10:57:59 +00:00
Alexander Strizhakov
1671864d88
return :visible instead of boolean
2020-05-18 10:34:50 +03:00
Alexander Strizhakov
b1aa402229
removing 410 status
2020-05-18 10:34:50 +03:00
Alexander Strizhakov
e7bc2f980c
account visibility
2020-05-18 10:34:49 +03:00
Ivan Tashkinov
9b76565264
MediaController: enforced owner-only access in :show action.
...
Improved error response on denied access (now 403). Adjusted tests.
2020-05-18 09:51:53 +03:00
lain
4b28d812cf
Merge branch 'restricted-relations-embedding' into 'develop'
...
Restricted support for embedded relationships
See merge request pleroma/pleroma!2456
2020-05-17 07:26:51 +00:00
Ivan Tashkinov
af9dfdce6b
MediaController OAuth scope assignments fix.
...
Typo fix (`def get_media` instead of `def show`).
2020-05-17 08:46:43 +03:00
Egor Kislitsyn
bb03dfdb03
Do not require description
in update
action
2020-05-14 16:29:32 +04:00
Egor Kislitsyn
0f885b4b86
Fix OpenAPI spec
2020-05-14 16:18:30 +04:00
Haelwenn (lanodan) Monnier
099e314a1b
Add OpenAPISpex for MediaController
2020-05-14 12:13:25 +02:00
Haelwenn (lanodan) Monnier
cb363f0183
MastodonAPI: /api/v2/media endpoints
2020-05-14 10:14:28 +02:00
Ivan Tashkinov
8062d590dd
[ #2456 ] OpenAPI-related tweaks. Removed support for with_relationships
param in GET /api/v1/accounts/search
.
2020-05-13 18:56:45 +03:00
Ivan Tashkinov
59b6d5f2aa
[ #2456 ] Changed embed_relationships
param to with_relationships
.
2020-05-13 15:08:07 +03:00
Egor Kislitsyn
bcadbf964a
Add OpenAPI spec for SuggestionController
2020-05-13 14:15:24 +04:00
Ivan Tashkinov
33b798425f
[ #2456 ] Post-merge fix.
2020-05-13 12:50:52 +03:00
Ivan Tashkinov
fd2fb2bb2e
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/status_controller.ex
# lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
# test/web/mastodon_api/controllers/timeline_controller_test.exs
# test/web/mastodon_api/views/status_view_test.exs
2020-05-13 12:42:36 +03:00
lain
156c8a5088
Merge branch 'openapi/statuses' into 'develop'
...
Add OpenAPI spec for StatusController
See merge request pleroma/pleroma!2521
2020-05-13 09:34:30 +00:00
Egor Kislitsyn
7803a85d2c
Add OpenAPI spec for StatusController
2020-05-13 00:25:21 +04:00
Ivan Tashkinov
63a1a82f38
[ #2456 ] Added support for embed_relationships
param, nailed down endpoints which should support it. Fixed :source_mutes relationships subset fetching.
2020-05-12 19:14:35 +03:00
Egor Kislitsyn
3bde0fa3f6
Add OpenAPI spec for TimelineController
2020-05-11 15:43:03 +04:00
Ivan Tashkinov
aee88d11be
[ #2456 ] Removed support for embedded relationships in account view.
2020-05-10 09:16:48 +03:00
Ivan Tashkinov
14a49a0483
[ #2456 ] Dropped support for embedded pleroma/account/relationship
in statuses and notifications.
2020-05-09 18:05:44 +03:00
Ivan Tashkinov
b2924ab1fb
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
2020-05-08 21:37:55 +03:00
rinpatch
bef08b85e5
Merge branch 'feature/undo-validator-reduced' into 'develop'
...
Move Undo (except undo follow) to the common pipeline
See merge request pleroma/pleroma!2489
2020-05-07 14:28:10 +00:00
lain
f0c22df226
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced
2020-05-07 14:45:20 +02:00
Egor Kislitsyn
dc4a448f48
Add OpenAPI spec for SearchController
2020-05-07 14:04:48 +04:00
lain
4c92dfb73e
Merge branch 'openapi/polls' into 'develop'
...
Add OpenAPI spec for PollController
See merge request pleroma/pleroma!2476
2020-05-07 09:19:45 +00:00
lain
a716543267
Merge branch 'openapi/subscriptions' into 'develop'
...
Add OpenAPI spec for SubscriptionController
See merge request pleroma/pleroma!2444
2020-05-06 09:10:17 +00:00
lain
61ea8f1f5a
Merge branch 'openapi/markers' into 'develop'
...
Add OpenAPI spec for MarkerController
See merge request pleroma/pleroma!2386
2020-05-06 09:06:50 +00:00
lain
0a88bf6a9d
Merge branch 'openapi/follow_requests' into 'develop'
...
Add OpenAPI spec for FollowRequestController
See merge request pleroma/pleroma!2448
2020-05-06 09:00:39 +00:00
lain
957172a307
Merge branch 'openapi/filters' into 'develop'
...
Add OpenAPI spec for FilterController
See merge request pleroma/pleroma!2382
2020-05-06 08:51:10 +00:00
lain
1ee34d4acb
Merge branch 'openapi/instance' into 'develop'
...
Add OpenAPI spec for InstanceController
See merge request pleroma/pleroma!2450
2020-05-06 08:46:14 +00:00
lain
7fdc7078ae
Merge branch 'openapi/lists' into 'develop'
...
Add OpenAPI spec for ListController
See merge request pleroma/pleroma!2453
2020-05-06 08:43:21 +00:00
lain
76c1a7a34b
Merge branch 'openapi/conversations' into 'develop'
...
Add OpenAPI spec for ConversationController
See merge request pleroma/pleroma!2445
2020-05-06 08:40:04 +00:00
Egor Kislitsyn
332e016bcd
Add OpenAPI spec for ScheduledActivityController
2020-05-05 23:42:24 +04:00
Egor Kislitsyn
0a1394cc1a
Add OpenAPI spec for PollController
2020-05-05 20:14:22 +04:00
lain
92caae5923
Undoing: Move undoing blocks to the pipeline everywhere.
2020-05-05 18:02:24 +02:00
lain
a3bb2e5474
Undoing: Move undoing announcements to the pipeline everywhere.
2020-05-05 16:42:34 +02:00
Egor Kislitsyn
3a45952a3a
Add OpenAPI spec for ConversationController
2020-05-05 17:44:46 +04:00
Egor Kislitsyn
32ca9f2c59
Render mastodon-like errors in FilterController
2020-05-05 17:41:16 +04:00
Egor Kislitsyn
46aae346f8
Move single used schemas to Filter operation schema
2020-05-05 17:41:01 +04:00
Egor Kislitsyn
7e7a3e1544
Add OpenAPI spec for FilterController
2020-05-05 17:41:01 +04:00
Egor Kislitsyn
ec1e4b4f1a
Add OpenAPI spec for FollowRequestController
2020-05-05 17:40:00 +04:00
Egor Kislitsyn
88a14da817
Add OpenAPI spec for InstanceController
2020-05-05 17:24:16 +04:00
lain
a3071f0231
Undoing: Move undoing likes to the pipeline everywhere.
2020-05-05 15:08:41 +02:00
Egor Kislitsyn
5ec6aad567
Add OpenAPI spec for ListController
2020-05-05 17:05:34 +04:00
Egor Kislitsyn
babcae7130
Move single used schemas to Marker operation schema
2020-05-05 16:45:34 +04:00
Egor Kislitsyn
8096565653
Add OpenAPI spec for MarkerController
2020-05-05 16:44:16 +04:00
Egor Kislitsyn
d861b0790a
Add OpenAPI spec for SubscriptionController
2020-05-05 16:43:00 +04:00
Egor Kislitsyn
d08c63500b
Ignore unexpected query params
2020-05-04 20:16:44 +04:00
Ivan Tashkinov
d5cdc907e3
Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering).
...
Added support for :skip_notifications for accounts listing (index.json).
Adjusted tests.
2020-05-01 18:45:24 +03:00
lain
3370bb0e46
Merge branch 'openapi/notifications' into 'develop'
...
Add OpenAPI spec for NotificationController
See merge request pleroma/pleroma!2437
2020-05-01 13:09:36 +00:00
lain
607e06c245
Merge branch 'openapi/reports' into 'develop'
...
Add OpenAPI spec for ReportController
See merge request pleroma/pleroma!2434
2020-05-01 12:48:56 +00:00
Egor Kislitsyn
9c1adb35de
Merge branch 'develop' into openapi/notifications
2020-04-30 13:52:07 +04:00
Egor Kislitsyn
1898054da4
Merge branch 'develop' into openapi/reports
2020-04-30 13:51:27 +04:00
Egor Kislitsyn
7b0c8f0fde
Add tests for account registration with captcha enabled and improve errors
2020-04-29 21:26:07 +04:00
Egor Kislitsyn
5238ae3dd3
Add OpenAPI spec for NotificationController
2020-04-28 21:27:54 +04:00
Ivan Tashkinov
908cf22a6c
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
2020-04-28 19:56:20 +03:00
Egor Kislitsyn
560f2c1979
Add OpenAPI spec for ReportController
2020-04-28 16:50:37 +04:00
Egor Kislitsyn
dda65f7799
Move single used schemas to operation schema
2020-04-27 22:55:05 +04:00
Egor Kislitsyn
2efc00b3cf
Use json_response_and_validate_schema/2
in tests to validate OpenAPI schema
2020-04-27 20:46:52 +04:00
Egor Kislitsyn
f1ca917bb0
Merge branch 'develop' into openapi/account
2020-04-27 14:33:00 +04:00
Ivan Tashkinov
b4139cc547
[ #2409 ] Made GET /api/v1/accounts/:id/favourites
auth-optional, adjusted tests.
2020-04-24 22:25:27 +03:00
lain
d89cd0a197
Reply Filtering: Refactor.
2020-04-24 18:25:26 +02:00
Ivan Tashkinov
00e62161f6
[ #2409 ] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.
2020-04-24 16:52:38 +03:00
Alexander
6e625a427c
reply filtering
2020-04-24 15:43:49 +03:00
rinpatch
25eec6d72d
Merge branch 'bugfix/null-scheduled-at' into 'develop'
...
StatusController: Ignore nil scheduled_at parameters.
Closes #1699
See merge request pleroma/pleroma!2412
2020-04-23 11:22:30 +00:00