Commit graph

4493 commits

Author SHA1 Message Date
Maksim Pechnikov 8b97b6f5ba Merge branch 'develop' into issue/1276-2 2020-05-06 14:47:50 +03:00
Egor Kislitsyn 06c69c0a0a
Fix description 2020-05-06 14:18:19 +04:00
lain 07e7c80bc9 Merge branch 'plug-if-unless-func-options-refactoring' into 'develop'
Refactoring of :if_func / :unless_func plug options

See merge request pleroma/pleroma!2446
2020-05-06 09:14:05 +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 df846eda71 Merge branch 'bugfix/sensitive_object' into 'develop'
Transmogrifier.set_sensitive/1: Keep sensitive set to true

Closes #954

See merge request pleroma/pleroma!2470
2020-05-06 09:04:13 +00:00
lain c3f1ce80eb Merge branch 'fix/1726-user-pagination' into 'develop'
Pagination fix for service users filters in admin api

Closes #1726

See merge request pleroma/pleroma!2452
2020-05-06 09:01:42 +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 f84c8f2f0d Merge branch 'feature/1728-webfinger-acct-scheme' into 'develop'
Webfinger: Request account info with the acct scheme

Closes #1728

See merge request pleroma/pleroma!2465
2020-05-06 08:46:45 +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
Maksim Pechnikov fb38b7339c Merge branch 'develop' into issue/1276-2 2020-05-06 05:55:39 +03:00
Egor Kislitsyn 332e016bcd
Add OpenAPI spec for ScheduledActivityController 2020-05-05 23:42:24 +04:00
Egor Kislitsyn 6ba25d1197
Add Attachment schema 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
lain b34debe615 Undoing: Move undoing reactions to the pipeline everywhere. 2020-05-05 16:17:09 +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
lain 42a2acac46 Merge branch 'feature/1720-status-view' into 'develop'
Admin API fetch status by id

Closes #1720

See merge request pleroma/pleroma!2475
2020-05-05 13:40:12 +00:00
Egor Kislitsyn ec1e4b4f1a
Add OpenAPI spec for FollowRequestController 2020-05-05 17:40:00 +04:00
minibikini 42a4a863f1
Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex 2020-05-05 17:24:40 +04:00
minibikini 3817f179d7
Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex 2020-05-05 17:24:40 +04:00
minibikini b5189d2c50
Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex 2020-05-05 17:24:40 +04:00
Egor Kislitsyn 88a14da817
Add OpenAPI spec for InstanceController 2020-05-05 17:24:16 +04:00
Alexander Strizhakov e7d8ab8303
admin_api fetch status by id 2020-05-05 16:18:56 +03:00
lain a3071f0231 Undoing: Move undoing likes to the pipeline everywhere. 2020-05-05 15:08:41 +02:00
Egor Kislitsyn f2bf4390f4
Fix descriptions for List API spec 2020-05-05 17:05:35 +04: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
lain f1da8882f9 UndoValidator: Add UndoValidator. 2020-05-05 14:17:47 +02:00
rinpatch 33f2976020 Merge branch 'feature/1737-magic-key-field' into 'develop'
User, Webfinger: Remove OStatus vestiges

Closes #1737

See merge request pleroma/pleroma!2471
2020-05-05 12:10:10 +00:00
rinpatch 5482a1f6ef Merge branch 'openapi/validation-plug' into 'develop'
Ignore unexpected query params and ENUM values

Closes #1719

See merge request pleroma/pleroma!2468
2020-05-05 12:08:58 +00:00
lain d201527004 Apply suggestion to lib/pleroma/web/web_finger/web_finger.ex 2020-05-05 11:17:44 +00:00
lain db55dc9445 ActivityPub: Remove react_with_emoji. 2020-05-05 12:28:28 +02:00
lain ad771546d8 Transmogrifier: Move emoji reactions to common pipeline. 2020-05-05 12:11:46 +02:00
lain f21f538293 LikeValidator: Add defaults for recipients back in. 2020-05-05 10:38:59 +02:00
lain c297667f16 Merge branch 'fix/issue-1729' into 'develop'
Only update follower/following stats for actor types of users and bots.

Closes #1565 and #1729

See merge request pleroma/pleroma!2464
2020-05-05 08:21:39 +00:00
lain 2cb3f8a8cf Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator 2020-05-05 10:19:01 +02:00
lain 6400998820 AP C2S: Restrict creation to Notes for now. 2020-05-05 10:12:37 +02:00
lain f897da2115 WebFinger: Add back in subscribe_address.
It's used for remote following.
2020-05-05 09:36:38 +02:00
lain 8bed6ea922 User, Webfinger: Remove OStatus vestiges
Mainly the `magic_key` field
2020-05-05 09:25:09 +02:00
Haelwenn (lanodan) Monnier bf0e41f0da
Transmogrifier.set_sensitive/1: Keep sensitive set to true 2020-05-04 23:36:00 +02:00
Egor Kislitsyn e55fd530bc
Render better errors for ENUM validation 2020-05-04 22:33:34 +04:00
Egor Kislitsyn f070b5569c
Add a config option to enable strict validation 2020-05-04 22:33:05 +04:00
Egor Kislitsyn 4b9ab67aa8
Ignore unexpected ENUM values in query string 2020-05-04 21:46:25 +04:00
minibikini bfbff7d826 Apply suggestion to lib/pleroma/web/api_spec/cast_and_validate.ex 2020-05-04 16:38:23 +00:00
Egor Kislitsyn d08c63500b
Ignore unexpected query params 2020-05-04 20:16:44 +04:00
lain 3559dd1085 Transmogrifier: Rely on LikeValidator. 2020-05-04 17:18:38 +02:00
lain 0f9bed022f LikeValidator: Fix up context. 2020-05-04 17:18:17 +02:00
lain e03c301ebe LikeValidator: Fix up missing recipients. 2020-05-04 17:08:31 +02:00
lain 13ab8defc0 Pipeline: Move transctioning to common pipeline. 2020-05-04 14:34:19 +02:00
lain ec24c70db8 ActivityPub: Don't fetch Application follower counts. 2020-05-04 14:22:54 +02:00
Maksim Pechnikov fe7a0d660e Merge branch 'develop' into issue/1276-2 2020-05-04 06:08:49 +03:00
lain a7966f2080 Webfinger: Request account info with the acct scheme 2020-05-03 13:48:01 +02:00
lain 1974d0cc42 DeleteValidator: The deleted activity id is an object id 2020-05-03 13:02:57 +02:00
lain 6fb96f64c1 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator 2020-05-03 12:55:29 +02:00
lain 4dfc617cdf Transmogrifier: Don't fetch actor that's guaranteed to be there. 2020-05-03 12:51:28 +02:00
Lain Soykaf f20a1a27ef DeleteValidator: Improve code readability 2020-05-03 12:19:01 +02:00
Mark Felder 370e313e2d Only update follower/following stats for actor types of users and bots. 2020-05-02 13:28:10 -05:00
rinpatch 3126f8a334 Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
Feature/1710 consolidate instance info

Closes #1710

See merge request pleroma/pleroma!2430
2020-05-02 16:44:55 +00:00
eugenijm 66a8e1312d Mastodon API: do not create a following relationship if the corresponding follow request doesn't exist when calling POST /api/v1/follow_requests/:id/authorize 2020-05-02 19:05:13 +03:00
rinpatch e55876409b Deactivate local users on deletion instead of deleting the record
Prevents the possibility of re-registration, which allowed to read
DMs of the deleted account.

Also includes a migration that tries to find any already deleted
accounts and insert skeletons for them.

Closes pleroma/pleroma#1687
2020-05-02 19:05:13 +03:00
Ivan Tashkinov 2d07ed7747 [#1732] Made AP C2S :followers and :following endpoints serve on no auth
(as for related :api pipeline endpoints).
2020-05-02 18:28:04 +03:00
Haelwenn 0dfb5ad0ad Merge branch 'bugfix/static-fe.css' into 'develop'
static-fe.css: Restore and move to /priv/static/static-fe

See merge request pleroma/pleroma!2458
2020-05-02 06:37:33 +00:00
Haelwenn (lanodan) Monnier c6ddfa8f95
static-fe.css: Restore and move to /priv/static/static-fe 2020-05-02 08:28:42 +02:00
rinpatch c18ef452b0 OpenAPI: Add follow_request to notification types
Closes #1731
2020-05-01 23:14:20 +03:00
rinpatch 85105f7aae OpenAPI: Remove max pagination limit from the spec
In an ideal world clients wouldn't try to request more than the max
hardcoded limit, but SubwayTooter does.
2020-05-01 21:33:34 +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
lain 44fbd09709 Merge branch 'issue/1577' into 'develop'
[#1577] fix mediaType of object

See merge request pleroma/pleroma!2372
2020-05-01 12:38:46 +00:00
lain 1ead5f49b8 AdminApiController: Use common pipeline for user deletion. 2020-05-01 14:30:39 +02:00
lain ebbd9c7f36 AdminAPIController: Refactor. 2020-05-01 14:22:39 +02:00
lain 2008fa9c7f Merge branch 'fix/captcha' into 'develop'
Fix account registration when captcha is enabled but not provided

Closes #1712

See merge request pleroma/pleroma!2438
2020-05-01 11:47:58 +00:00
lain ab01863abf Merge branch 'feature/delete-validator' of git.pleroma.social:pleroma/pleroma into feature/delete-validator 2020-05-01 13:35:42 +02:00
lain 5f42e6629d DeleteValidator: Only allow deletion of certain types. 2020-05-01 13:34:47 +02:00
Alexander Strizhakov ecf37b46d2
pagination fix for service users filters 2020-05-01 14:31:24 +03:00
Maksim Pechnikov a92c713d9c Merge branch 'develop' into issue/1276-2 2020-05-01 06:21:59 +03:00
Lain Soykaf 93f64aba78 Merge branch 'develop' of ssh://git.pleroma.social/pleroma/pleroma into feature/delete-validator 2020-04-30 22:44:31 +02:00
lain 32b8386ede DeleteValidator: Don't federate local deletions of remote objects.
Closes #1497
2020-04-30 21:23:18 +02:00
lain a81342a234 Merge branch 'dismiss-notification-on-follow-request-rejection' into 'develop'
Dismiss the follow request notification on rejection

See merge request pleroma/pleroma!2447
2020-04-30 18:38:52 +00:00
lain 999d639873 ActivityPub: Remove delete function.
This is handled by the common pipeline now.
2020-04-30 20:13:47 +02:00
lain 5da08c2b73 SideEffects: Fix comment 2020-04-30 19:53:30 +02:00
lain 500f5ec14e SideEffects: On deletion, reduce the reply count cache 2020-04-30 19:47:13 +02:00
lain 60db58a1c6 Credo fixes. 2020-04-30 18:38:37 +02:00
lain ab60ee1776 SideEffects: On deletion, reduce the User note count. 2020-04-30 18:19:39 +02:00
lain c832d96fc9 SideEffects: Stream out deletes. 2020-04-30 17:58:09 +02:00
lain 4500fdc04c DeleteValidator: Add internal helper field after validation. 2020-04-30 17:53:02 +02:00
eugenijm bef34568f0 Dismiss the follow request notification on rejection 2020-04-30 18:38:19 +03:00
Ivan Tashkinov 2c4844237f Refactoring of :if_func / :unless_func plug options (general availability). Added tests for Pleroma.Web.Plug. 2020-04-30 18:19:51 +03:00
Alexander Strizhakov 4a487e4d0b
fix for auth check 2020-04-30 17:50:57 +03:00
lain 14c6672193 AP C2S: Use common pipelin for deletes. 2020-04-30 16:49:41 +02:00
lain fdd8e7f276 CommonAPI: Use common pipeline for deletions. 2020-04-30 16:15:38 +02:00