akkoma
4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete...
lain [Sun, 3 May 2020 10:55:29 +0000 (12:55 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator

4 years agoTransmogrifier: Don't fetch actor that's guaranteed to be there.
lain [Sun, 3 May 2020 10:51:28 +0000 (12:51 +0200)]
Transmogrifier: Don't fetch actor that's guaranteed to be there.

4 years agoDeleteValidator: Improve code readability
Lain Soykaf [Sun, 3 May 2020 10:19:01 +0000 (12:19 +0200)]
DeleteValidator: Improve code readability

4 years agoReplace deprecated Roma by Fedi.
lain [Sat, 2 May 2020 18:10:50 +0000 (18:10 +0000)]
Replace deprecated Roma by Fedi.

4 years agoMerge branch 'feature/1710-consolidate-instance-info' into 'develop'
rinpatch [Sat, 2 May 2020 16:44:55 +0000 (16:44 +0000)]
Merge branch 'feature/1710-consolidate-instance-info' into 'develop'

Feature/1710 consolidate instance info

Closes #1710

See merge request pleroma/pleroma!2430

4 years agoCHANGELOG.md: Add entry for re-registration ban
rinpatch [Thu, 30 Apr 2020 21:33:04 +0000 (00:33 +0300)]
CHANGELOG.md: Add entry for re-registration ban

4 years agoReword changelog entry for follow relationship bug
rinpatch [Thu, 30 Apr 2020 21:28:28 +0000 (00:28 +0300)]
Reword changelog entry for follow relationship bug

4 years agoMastodon API: do not create a following relationship if the corresponding follow...
eugenijm [Mon, 27 Apr 2020 14:41:38 +0000 (17:41 +0300)]
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`

4 years agoDeactivate local users on deletion instead of deleting the record
rinpatch [Wed, 29 Apr 2020 11:26:31 +0000 (14:26 +0300)]
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

4 years agoMerge branch 'fix/1732-authless-following-followers' into 'develop'
rinpatch [Sat, 2 May 2020 15:39:31 +0000 (15:39 +0000)]
Merge branch 'fix/1732-authless-following-followers' into 'develop'

[FIX] [#1732] Made AP C2S :followers and :following endpoints serve on no auth

Closes #1732

See merge request pleroma/pleroma!2463

4 years ago[#1732] Made AP C2S :followers and :following endpoints serve on no auth
Ivan Tashkinov [Sat, 2 May 2020 15:28:04 +0000 (18:28 +0300)]
[#1732] Made AP C2S :followers and :following endpoints serve on no auth
(as for related :api pipeline endpoints).

4 years agoMerge branch 'follow-request-notifications' into 'develop'
rinpatch [Sat, 2 May 2020 12:24:49 +0000 (12:24 +0000)]
Merge branch 'follow-request-notifications' into 'develop'

Follow request notifications enforcement

See merge request pleroma/pleroma!2451

4 years agoMerge branch 'pleroma-fe-2020-05-02-5f90b6a3' into 'develop'
rinpatch [Sat, 2 May 2020 12:24:22 +0000 (12:24 +0000)]
Merge branch 'pleroma-fe-2020-05-02-5f90b6a3' into 'develop'

PleromaFE bundle supporting follow request notifications

See merge request pleroma/pleroma!2462

4 years agoPleromaFE bundle supporting follow request notifications.
Ivan Tashkinov [Sat, 2 May 2020 11:37:40 +0000 (14:37 +0300)]
PleromaFE bundle supporting follow request notifications.
https://git.pleroma.social/pleroma/pleroma-fe/-/commit/5f90b6a384583a00769eeca3a6c6e2deec8bdd24

4 years agoMerge branch 'bugfix/static-fe.css' into 'develop'
Haelwenn [Sat, 2 May 2020 06:37:33 +0000 (06:37 +0000)]
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

4 years agostatic-fe.css: Restore and move to /priv/static/static-fe
Haelwenn (lanodan) Monnier [Fri, 1 May 2020 19:15:43 +0000 (21:15 +0200)]
static-fe.css: Restore and move to /priv/static/static-fe

4 years agoMerge remote-tracking branch 'remotes/origin/develop' into follow-request-notifications
Ivan Tashkinov [Sat, 2 May 2020 04:39:19 +0000 (07:39 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into follow-request-notifications

4 years agoMerge branch 'fix/sporadic-test-failure-alias' into 'develop'
rinpatch [Fri, 1 May 2020 22:01:35 +0000 (22:01 +0000)]
Merge branch 'fix/sporadic-test-failure-alias' into 'develop'

Fix sporadic test compilation failure caused by unused alias

See merge request pleroma/pleroma!2460

4 years agoMerge branch 'fix/notificatons-follow-request-validation' into 'develop'
rinpatch [Fri, 1 May 2020 20:22:37 +0000 (20:22 +0000)]
Merge branch 'fix/notificatons-follow-request-validation' into 'develop'

OpenAPI: Add `follow_request` to notification types

Closes #1731

See merge request pleroma/pleroma!2459

4 years agoOpenAPI: Add `follow_request` to notification types
rinpatch [Fri, 1 May 2020 19:48:30 +0000 (22:48 +0300)]
OpenAPI: Add `follow_request` to notification types

Closes #1731

4 years agoFix sporadic test compilation failure caused by unused alias
rinpatch [Fri, 1 May 2020 19:50:40 +0000 (22:50 +0300)]
Fix sporadic test compilation failure caused by unused alias

4 years agoMerge branch 'fix/openapi-limit' into 'develop'
lain [Fri, 1 May 2020 18:46:18 +0000 (18:46 +0000)]
Merge branch 'fix/openapi-limit' into 'develop'

OpenAPI: Remove max pagination limit from the spec

See merge request pleroma/pleroma!2457

4 years agoOpenAPI: Remove max pagination limit from the spec
rinpatch [Fri, 1 May 2020 18:33:34 +0000 (21:33 +0300)]
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.

4 years agoMerge branch 'bugfix/1727-fix-signature-decoding' into 'develop'
rinpatch [Fri, 1 May 2020 16:48:31 +0000 (16:48 +0000)]
Merge branch 'bugfix/1727-fix-signature-decoding' into 'develop'

Bugfix/1727 fix signature decoding

Closes #1727

See merge request pleroma/pleroma!2454

4 years agoMerge branch 'fix-notifications-loading-in-pleroma-fe' into 'develop'
lain [Fri, 1 May 2020 15:38:36 +0000 (15:38 +0000)]
Merge branch 'fix-notifications-loading-in-pleroma-fe' into 'develop'

Notifications loading fix (PleromaFE)

See merge request pleroma/pleroma!2455

4 years agoUpdated PleromaFE bundle to prevent notifications loading issue due to unsupported...
Ivan Tashkinov [Fri, 1 May 2020 14:59:29 +0000 (17:59 +0300)]
Updated PleromaFE bundle to prevent notifications loading issue due to unsupported parameter (`with_move`).

4 years agoMappedSignatureToIdentityPlug: Fix.
lain [Fri, 1 May 2020 13:58:47 +0000 (15:58 +0200)]
MappedSignatureToIdentityPlug: Fix.

4 years agoSignature: Handle non-ap ids in key ids.
lain [Fri, 1 May 2020 13:54:38 +0000 (15:54 +0200)]
Signature: Handle non-ap ids in key ids.

Mastodon and Gab sometimes send the format `acct:name@server`.

4 years agoMerge branch 'openapi/notifications' into 'develop'
lain [Fri, 1 May 2020 13:09:36 +0000 (13:09 +0000)]
Merge branch 'openapi/notifications' into 'develop'

Add OpenAPI spec for NotificationController

See merge request pleroma/pleroma!2437

4 years agoMerge branch 'openapi/reports' into 'develop'
lain [Fri, 1 May 2020 12:48:56 +0000 (12:48 +0000)]
Merge branch 'openapi/reports' into 'develop'

Add OpenAPI spec for ReportController

See merge request pleroma/pleroma!2434

4 years agoMerge branch 'issue/1577' into 'develop'
lain [Fri, 1 May 2020 12:38:46 +0000 (12:38 +0000)]
Merge branch 'issue/1577' into 'develop'

[#1577] fix mediaType of object

See merge request pleroma/pleroma!2372

4 years agoAdminApiController: Use common pipeline for user deletion.
lain [Fri, 1 May 2020 12:30:39 +0000 (14:30 +0200)]
AdminApiController: Use common pipeline for user deletion.

4 years agoAdminAPIController: Refactor.
lain [Fri, 1 May 2020 12:22:39 +0000 (14:22 +0200)]
AdminAPIController: Refactor.

4 years agoUser deletion mix task: Use common pipeline.
lain [Fri, 1 May 2020 12:05:25 +0000 (14:05 +0200)]
User deletion mix task: Use common pipeline.

4 years agoMerge branch 'fix/captcha' into 'develop'
lain [Fri, 1 May 2020 11:47:58 +0000 (11:47 +0000)]
Merge branch 'fix/captcha' into 'develop'

Fix account registration when captcha is enabled but not provided

Closes #1712

See merge request pleroma/pleroma!2438

4 years agoMerge branch 'feature/delete-validator' of git.pleroma.social:pleroma/pleroma into...
lain [Fri, 1 May 2020 11:35:42 +0000 (13:35 +0200)]
Merge branch 'feature/delete-validator' of git.pleroma.social:pleroma/pleroma into feature/delete-validator

4 years agoDeleteValidator: Only allow deletion of certain types.
lain [Fri, 1 May 2020 11:34:47 +0000 (13:34 +0200)]
DeleteValidator: Only allow deletion of certain types.

4 years agoMade follow request notifications non-optional (removed config switch).
Ivan Tashkinov [Fri, 1 May 2020 06:51:41 +0000 (09:51 +0300)]
Made follow request notifications non-optional (removed config switch).

4 years agoMerge branch 'update/admin-fe-20200429' into 'develop'
rinpatch [Thu, 30 Apr 2020 22:33:56 +0000 (22:33 +0000)]
Merge branch 'update/admin-fe-20200429' into 'develop'

Update AdminFE build in preparation for the 2.0.3 release

See merge request pleroma/pleroma!2442

4 years agoMerge branch 'tests/more-apc2s' into 'develop'
lain [Thu, 30 Apr 2020 22:19:26 +0000 (22:19 +0000)]
Merge branch 'tests/more-apc2s' into 'develop'

Increase tests on AP C2S

See merge request pleroma/pleroma!2449

4 years agoMerge branch 'develop' of ssh://git.pleroma.social/pleroma/pleroma into feature/delet...
Lain Soykaf [Thu, 30 Apr 2020 20:44:31 +0000 (22:44 +0200)]
Merge branch 'develop' of ssh://git.pleroma.social/pleroma/pleroma into feature/delete-validator

4 years agoDeleteValidator: Don't federate local deletions of remote objects.
lain [Thu, 30 Apr 2020 19:23:18 +0000 (21:23 +0200)]
DeleteValidator: Don't federate local deletions of remote objects.

Closes #1497

4 years agoMerge branch 'dismiss-notification-on-follow-request-rejection' into 'develop'
lain [Thu, 30 Apr 2020 18:38:52 +0000 (18:38 +0000)]
Merge branch 'dismiss-notification-on-follow-request-rejection' into 'develop'

Dismiss the follow request notification on rejection

See merge request pleroma/pleroma!2447

4 years agoActivityPub: Remove `delete` function.
lain [Thu, 30 Apr 2020 18:13:47 +0000 (20:13 +0200)]
ActivityPub: Remove `delete` function.

This is handled by the common pipeline now.

4 years agoUser: Use common pipeline to delete user activities
lain [Thu, 30 Apr 2020 18:08:25 +0000 (20:08 +0200)]
User: Use common pipeline to delete user activities

4 years agoSideEffects: Fix comment
lain [Thu, 30 Apr 2020 17:53:30 +0000 (19:53 +0200)]
SideEffects: Fix comment

4 years agoSideEffects: On deletion, reduce the reply count cache
lain [Thu, 30 Apr 2020 17:47:13 +0000 (19:47 +0200)]
SideEffects: On deletion, reduce the reply count cache

4 years agoIncrease tests on AP C2S
Haelwenn (lanodan) Monnier [Thu, 30 Apr 2020 16:55:25 +0000 (18:55 +0200)]
Increase tests on AP C2S

Related: https://git.pleroma.social/pleroma/pleroma/-/issues/954

4 years agoCredo fixes.
lain [Thu, 30 Apr 2020 16:38:37 +0000 (18:38 +0200)]
Credo fixes.

4 years agoSideEffects: On deletion, reduce the User note count.
lain [Thu, 30 Apr 2020 16:19:39 +0000 (18:19 +0200)]
SideEffects: On deletion, reduce the User note count.

4 years agoSideEffectsTest: Test streaming.
lain [Thu, 30 Apr 2020 16:10:36 +0000 (18:10 +0200)]
SideEffectsTest: Test streaming.

4 years agoMerge branch 'emoji-upload' into 'develop'
Haelwenn [Thu, 30 Apr 2020 16:09:51 +0000 (16:09 +0000)]
Merge branch 'emoji-upload' into 'develop'

Updated emoji API endpoints

Closes #1649, #1604, and #1545

See merge request pleroma/pleroma!2179

4 years agoObjectValidator: Refactor.
lain [Thu, 30 Apr 2020 15:58:31 +0000 (17:58 +0200)]
ObjectValidator: Refactor.

4 years agoSideEffects: Stream out deletes.
lain [Thu, 30 Apr 2020 15:58:09 +0000 (17:58 +0200)]
SideEffects: Stream out deletes.

4 years agoDeleteValidator: Add internal helper field after validation.
lain [Thu, 30 Apr 2020 15:53:02 +0000 (17:53 +0200)]
DeleteValidator: Add internal helper field after validation.

4 years agoStreamerTest: Separate deletion test.
lain [Thu, 30 Apr 2020 15:52:29 +0000 (17:52 +0200)]
StreamerTest: Separate deletion test.

4 years agoDismiss the follow request notification on rejection
eugenijm [Thu, 30 Apr 2020 12:02:35 +0000 (15:02 +0300)]
Dismiss the follow request notification on rejection

4 years agofix for auth check
Alexander Strizhakov [Thu, 30 Apr 2020 14:50:57 +0000 (17:50 +0300)]
fix for auth check

4 years agoAP C2S: Use common pipelin for deletes.
lain [Thu, 30 Apr 2020 14:49:41 +0000 (16:49 +0200)]
AP C2S: Use common pipelin for deletes.

4 years agoCommonAPI: Use common pipeline for deletions.
lain [Thu, 30 Apr 2020 14:15:38 +0000 (16:15 +0200)]
CommonAPI: Use common pipeline for deletions.

4 years agoCredo fixes.
lain [Thu, 30 Apr 2020 13:58:37 +0000 (15:58 +0200)]
Credo fixes.

4 years agoSideEffects: Handle deletions.
lain [Thu, 30 Apr 2020 13:57:27 +0000 (15:57 +0200)]
SideEffects: Handle deletions.

4 years agoDeleteValidator: Deleting a user is valid.
lain [Thu, 30 Apr 2020 13:42:30 +0000 (15:42 +0200)]
DeleteValidator: Deleting a user is valid.

4 years agoTransmogrifier: Handle incoming deletes for non-user objects.
lain [Thu, 30 Apr 2020 13:26:23 +0000 (15:26 +0200)]
Transmogrifier: Handle incoming deletes for non-user objects.

4 years agodocs update
Alexander Strizhakov [Wed, 1 Apr 2020 10:57:27 +0000 (13:57 +0300)]
docs update

4 years agodocs fix
Alexander Strizhakov [Tue, 31 Mar 2020 08:38:37 +0000 (11:38 +0300)]
docs fix

4 years agolist of options for pack metadata
Alexander Strizhakov [Mon, 30 Mar 2020 07:07:37 +0000 (10:07 +0300)]
list of options for pack metadata

4 years agoerror rename
Alexander Strizhakov [Mon, 30 Mar 2020 06:09:27 +0000 (09:09 +0300)]
error rename

4 years agochangelog entry
Alexander Strizhakov [Sat, 28 Mar 2020 18:21:23 +0000 (21:21 +0300)]
changelog entry

4 years agoemoji api packs changes in routes with docs update
Alexander Strizhakov [Sat, 28 Mar 2020 18:15:14 +0000 (21:15 +0300)]
emoji api packs changes in routes with docs update

4 years agoremoving entry from changelog
Alexander Strizhakov [Sat, 28 Mar 2020 12:00:48 +0000 (15:00 +0300)]
removing entry from changelog

4 years agodocs update
Alexander Strizhakov [Sat, 28 Mar 2020 10:55:17 +0000 (13:55 +0300)]
docs update

4 years agorefactor emoji api with fixes
Alexander Strizhakov [Sat, 28 Mar 2020 10:34:32 +0000 (13:34 +0300)]
refactor emoji api with fixes

4 years agoDeleteValidator: Mastodon sends unaddressed deletes.
lain [Thu, 30 Apr 2020 12:37:14 +0000 (14:37 +0200)]
DeleteValidator: Mastodon sends unaddressed deletes.

4 years agoreturn data only for updated emoji
Alexander Strizhakov [Thu, 6 Feb 2020 15:01:12 +0000 (18:01 +0300)]
return data only for updated emoji

4 years agoTransmogrifier Tests: Extract deletion tests.
lain [Thu, 30 Apr 2020 12:14:00 +0000 (14:14 +0200)]
Transmogrifier Tests: Extract deletion tests.

4 years agoObjectValidator: Add actor fetcher.
lain [Thu, 30 Apr 2020 12:13:08 +0000 (14:13 +0200)]
ObjectValidator: Add actor fetcher.

4 years agoTypo fix.
lain [Thu, 30 Apr 2020 11:57:47 +0000 (13:57 +0200)]
Typo fix.

4 years agoMerge branch '1364-no-pushes-from-blocked-domains-users' into 'develop'
lain [Thu, 30 Apr 2020 10:29:46 +0000 (10:29 +0000)]
Merge branch '1364-no-pushes-from-blocked-domains-users' into 'develop'

[#1364] [FIX] Disabled notifications on activities from blocked domains (unless actors are followed)

See merge request pleroma/pleroma!2367

4 years agoMerge branch 'develop' into openapi/notifications
Egor Kislitsyn [Thu, 30 Apr 2020 09:52:07 +0000 (13:52 +0400)]
Merge branch 'develop' into openapi/notifications

4 years agoMerge branch 'develop' into openapi/reports
Egor Kislitsyn [Thu, 30 Apr 2020 09:51:27 +0000 (13:51 +0400)]
Merge branch 'develop' into openapi/reports

4 years agoMerge branch 'fix/add-exclude-replies-openapi' into 'develop'
rinpatch [Wed, 29 Apr 2020 22:01:17 +0000 (22:01 +0000)]
Merge branch 'fix/add-exclude-replies-openapi' into 'develop'

Add exlude_replies to OpenAPI spec for account timelines

See merge request pleroma/pleroma!2443

4 years agoAdd exlude_replies to OpenAPI spec for account timelines
rinpatch [Wed, 29 Apr 2020 21:49:59 +0000 (00:49 +0300)]
Add exlude_replies to OpenAPI spec for account timelines

4 years agoUpdate AdminFE build in preparation for the 2.0.3 release
Mark Felder [Wed, 29 Apr 2020 20:49:48 +0000 (15:49 -0500)]
Update AdminFE build in preparation for the 2.0.3 release

4 years agoChange Pleroma.CaptchaTest to be a regular module instead of GenServer
Egor Kislitsyn [Wed, 29 Apr 2020 17:01:16 +0000 (21:01 +0400)]
Change Pleroma.CaptchaTest to be a regular module instead of GenServer

4 years agoAdd tests for account registration with captcha enabled and improve errors
Egor Kislitsyn [Wed, 29 Apr 2020 16:48:08 +0000 (20:48 +0400)]
Add tests for account registration with captcha enabled and improve errors

4 years agoFix account registration when captcha is enabled but not provided
Egor Kislitsyn [Wed, 29 Apr 2020 10:31:13 +0000 (14:31 +0400)]
Fix account registration when captcha is enabled but not provided

4 years agoDocument `captcha_answer_data` parameter
Egor Kislitsyn [Wed, 29 Apr 2020 10:30:07 +0000 (14:30 +0400)]
Document `captcha_answer_data` parameter

4 years agoObjectValidator: Add validation for `Delete`s.
lain [Wed, 29 Apr 2020 17:09:51 +0000 (19:09 +0200)]
ObjectValidator: Add validation for `Delete`s.

4 years agoLikeValidator: Use Recipients Type.
lain [Wed, 29 Apr 2020 17:08:36 +0000 (19:08 +0200)]
LikeValidator: Use Recipients Type.

4 years agoObject Validator Types: Add Recipients.
lain [Wed, 29 Apr 2020 17:08:08 +0000 (19:08 +0200)]
Object Validator Types: Add Recipients.

4 years agoMerge branch 'automatic-authentication-and-instance-publicity-checks' into 'develop'
lain [Wed, 29 Apr 2020 11:09:30 +0000 (11:09 +0000)]
Merge branch 'automatic-authentication-and-instance-publicity-checks' into 'develop'

Automatic checks of authentication / authorization / instance publicity

See merge request pleroma/pleroma!2409

4 years agoadded test
Maksim Pechnikov [Wed, 29 Apr 2020 05:13:10 +0000 (08:13 +0300)]
added test

4 years agoAdd OpenAPI spec for NotificationController
Egor Kislitsyn [Tue, 28 Apr 2020 17:27:54 +0000 (21:27 +0400)]
Add OpenAPI spec for NotificationController

4 years ago[#2349] Post-merge fix.
Ivan Tashkinov [Tue, 28 Apr 2020 17:04:25 +0000 (20:04 +0300)]
[#2349] Post-merge fix.

4 years agoMerge remote-tracking branch 'remotes/origin/develop' into automatic-authentication...
Ivan Tashkinov [Tue, 28 Apr 2020 16:56:20 +0000 (19:56 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks

# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex

4 years agoMerge branch 'docs/notification_destroy_multiple' into 'develop'
lain [Tue, 28 Apr 2020 15:40:18 +0000 (15:40 +0000)]
Merge branch 'docs/notification_destroy_multiple' into 'develop'

Document DELETE /api/v1/notifications/destroy_multiple

Closes #1711

See merge request pleroma/pleroma!2435

4 years agoDocument DELETE /api/v1/notifications/destroy_multiple
Mark Felder [Tue, 28 Apr 2020 15:13:58 +0000 (10:13 -0500)]
Document DELETE /api/v1/notifications/destroy_multiple

4 years agoAdd OpenAPI spec for ReportController
Egor Kislitsyn [Tue, 28 Apr 2020 12:50:37 +0000 (16:50 +0400)]
Add OpenAPI spec for ReportController

4 years agoMerge branch 'openapi/account' into 'develop'
rinpatch [Tue, 28 Apr 2020 11:57:16 +0000 (11:57 +0000)]
Merge branch 'openapi/account' into 'develop'

Add OpenAPI specs for AccountController

See merge request pleroma/pleroma!2374