lain [Thu, 2 Jul 2020 07:33:50 +0000 (09:33 +0200)]
SideEffects: Refactor.
rinpatch [Wed, 1 Jul 2020 13:51:23 +0000 (13:51 +0000)]
Merge branch '1716-handle-nickname-clashes' into 'develop'
ActivityPub: Handle clashing nicknames for the same ap id
Closes #1716
See merge request pleroma/pleroma!2712
lain [Wed, 1 Jul 2020 10:26:07 +0000 (12:26 +0200)]
ActivityPub: Handle clashing nicknames for the same ap id
If we get a new user (identified by ap_id) that would have the same
nickname as an existing user, give the existing user a nickname that
is prepended with the user id, as this will never clash.
This can happen when a user switches server software and that soft-
ware generates ap ids in a different way.
lain [Wed, 1 Jul 2020 09:18:02 +0000 (09:18 +0000)]
Merge branch 'revert-
651f2695' into 'develop'
Revert "Merge branch 'avatar-removing' into 'develop'"
See merge request pleroma/pleroma!2710
lain [Wed, 1 Jul 2020 08:51:56 +0000 (08:51 +0000)]
Revert "Merge branch 'avatar-removing' into 'develop'"
This reverts merge request !2701
Haelwenn [Tue, 30 Jun 2020 20:51:10 +0000 (20:51 +0000)]
Merge branch 'chore/rename-user-settings-column' into 'develop'
Rename user.settings column
See merge request pleroma/pleroma!2707
Mark Felder [Tue, 30 Jun 2020 16:50:53 +0000 (11:50 -0500)]
Rename user.settings column
This is used exclusively by MastoFE/GlitchFE now
lain [Tue, 30 Jun 2020 10:52:55 +0000 (10:52 +0000)]
Merge branch 'preloadfixups' into 'develop'
Some fixups for the preload.
See merge request pleroma/pleroma!2692
lain [Tue, 30 Jun 2020 09:55:58 +0000 (11:55 +0200)]
Credo fixes
lain [Tue, 30 Jun 2020 09:40:34 +0000 (11:40 +0200)]
Merge branch 'preload-fixups-2' into preloadfixups
lain [Tue, 30 Jun 2020 09:35:54 +0000 (11:35 +0200)]
Preload: Load the correct instance panel
lain [Tue, 30 Jun 2020 08:42:45 +0000 (08:42 +0000)]
Merge branch 'patch-1' into 'develop'
Use correct PostgreSQL version command in bug template
See merge request pleroma/pleroma!2706
normandy [Tue, 30 Jun 2020 03:12:30 +0000 (03:12 +0000)]
Use correct PostgreSQL version command in bug template
rinpatch [Mon, 29 Jun 2020 18:06:25 +0000 (18:06 +0000)]
Merge branch 'fix-notification-filtering' into 'develop'
Notifications: Never return `nil` in the notification list.
See merge request pleroma/pleroma!2705
lain [Mon, 29 Jun 2020 16:04:14 +0000 (16:04 +0000)]
Apply suggestion to lib/pleroma/notification.ex
lain [Mon, 29 Jun 2020 15:59:40 +0000 (15:59 +0000)]
Merge branch 'fix/cast-and-validate' into 'develop'
Fix CastAndValidate plug
Closes #1889
See merge request pleroma/pleroma!2704
lain [Mon, 29 Jun 2020 15:52:56 +0000 (17:52 +0200)]
Notification: Remove TODO.
lain [Mon, 29 Jun 2020 15:48:18 +0000 (17:48 +0200)]
Notifications: Never return `nil` in the notification list.
Egor Kislitsyn [Mon, 29 Jun 2020 15:47:04 +0000 (19:47 +0400)]
Test default "content-type" for CastAndValidate
feld [Mon, 29 Jun 2020 15:24:39 +0000 (15:24 +0000)]
Merge branch 'fix/swoosh-sendmail' into 'develop'
updated swoosh
See merge request pleroma/pleroma!2703
Egor Kislitsyn [Mon, 29 Jun 2020 13:33:00 +0000 (17:33 +0400)]
Fix CastAndValidate plug
Maksim Pechnikov [Mon, 29 Jun 2020 13:22:54 +0000 (16:22 +0300)]
updated swoosh
lain [Mon, 29 Jun 2020 12:44:58 +0000 (12:44 +0000)]
Merge branch 'rich-media-parser-exclude-attachment-links' into 'develop'
excluding attachment links from RichMedia
See merge request pleroma/pleroma!2702
Alexander Strizhakov [Mon, 29 Jun 2020 12:25:57 +0000 (15:25 +0300)]
excluding attachment links from RichMedia
lain [Mon, 29 Jun 2020 11:16:30 +0000 (11:16 +0000)]
Merge branch 'avatar-removing' into 'develop'
UpdateCredentialsTest: Add test for removing profile images.
See merge request pleroma/pleroma!2701
lain [Mon, 29 Jun 2020 10:40:23 +0000 (12:40 +0200)]
UpdateCredentialsTest: Add test for removing profile images.
lain [Mon, 29 Jun 2020 09:41:00 +0000 (11:41 +0200)]
Preloaders: Use strings as keys.
lain [Mon, 29 Jun 2020 09:06:20 +0000 (11:06 +0200)]
User preloader: Put user info at correct key
lain [Mon, 29 Jun 2020 08:39:51 +0000 (08:39 +0000)]
Merge branch '1031-parent-visible' into 'develop'
Resolve "Add `pleroma.parent_visible` to the status view"
Closes #1031
See merge request pleroma/pleroma!2679
lain [Mon, 29 Jun 2020 08:32:56 +0000 (08:32 +0000)]
Merge branch 'openapi/schema-account-pleromafields' into 'develop'
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses
See merge request pleroma/pleroma!2700
Haelwenn (lanodan) Monnier [Mon, 29 Jun 2020 01:31:33 +0000 (03:31 +0200)]
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses
Haelwenn [Mon, 29 Jun 2020 00:56:02 +0000 (00:56 +0000)]
Merge branch 'docs/mastoapi-account-fields' into 'develop'
differences_in_mastoapi_responses: Update account fields
See merge request pleroma/pleroma!2699
Haelwenn (lanodan) Monnier [Mon, 29 Jun 2020 00:39:26 +0000 (02:39 +0200)]
differences_in_mastoapi_responses: Update account fields
lain [Sat, 27 Jun 2020 10:40:29 +0000 (10:40 +0000)]
Merge branch 'reduce-preloading-defaults' into 'develop'
Config: Reduce default preloaders to configuration endpoints.
See merge request pleroma/pleroma!2697
lain [Sat, 27 Jun 2020 10:18:37 +0000 (12:18 +0200)]
Config: Reduce default preloaders to configuration endpoints.
Fetching the timeline is a bit heavy to do by default.
lain [Sat, 27 Jun 2020 09:41:35 +0000 (09:41 +0000)]
Merge branch 'fix/fetcher-transmogrifier-error' into 'develop'
object/fetcher: Pass full Transmogrifier error
See merge request pleroma/pleroma!2696
Haelwenn (lanodan) Monnier [Fri, 26 Jun 2020 18:10:47 +0000 (20:10 +0200)]
object/fetcher: Pass full Transmogrifier error
Haelwenn [Fri, 26 Jun 2020 17:41:00 +0000 (17:41 +0000)]
Merge branch 'block-handling' into 'develop'
Handle blocks with the pipeline
See merge request pleroma/pleroma!2685
Haelwenn [Fri, 26 Jun 2020 16:59:46 +0000 (16:59 +0000)]
Merge branch '1258-anti-link-spam-exemption' into 'develop'
AntiSpamLinkPolicy: Exempt local users.
Closes #1258
See merge request pleroma/pleroma!2686
lain [Fri, 26 Jun 2020 12:48:23 +0000 (14:48 +0200)]
Preloading: Fix nodeinfo url.
lain [Fri, 26 Jun 2020 12:47:38 +0000 (14:47 +0200)]
Preloading: Return correct data for statusnet stuff.
lain [Fri, 26 Jun 2020 11:09:37 +0000 (11:09 +0000)]
Merge branch 'fix-chats' into 'develop'
Nodeinfo: Add chat information back in.
See merge request pleroma/pleroma!2691
lain [Fri, 26 Jun 2020 11:04:15 +0000 (13:04 +0200)]
Nodeinfo: Add chat information back in.
lain [Fri, 26 Jun 2020 10:06:00 +0000 (12:06 +0200)]
User: Don't unfollow on block when the relevant setting is set.
lain [Fri, 26 Jun 2020 09:58:40 +0000 (11:58 +0200)]
BlockValidator: Restore old behavior for incoming blocks.
Haelwenn [Fri, 26 Jun 2020 03:48:25 +0000 (03:48 +0000)]
Merge branch 'hotfix/preload-tests-nodeinfo' into 'develop'
nodeinfo: Fix MRF transparency
See merge request pleroma/pleroma!2689
Haelwenn (lanodan) Monnier [Fri, 26 Jun 2020 03:33:59 +0000 (05:33 +0200)]
nodeinfo: Fix MRF transparency
feld [Thu, 25 Jun 2020 21:35:39 +0000 (21:35 +0000)]
Merge branch 'preload-data' into 'develop'
Preload data into index.html
Closes #1660
See merge request pleroma/pleroma!2381
feld [Thu, 25 Jun 2020 21:25:02 +0000 (21:25 +0000)]
Merge branch 'mastoapi-omitted' into 'develop'
MastoAPI differences: Document not implemented features
See merge request pleroma/pleroma!2687
feld [Thu, 25 Jun 2020 20:09:19 +0000 (20:09 +0000)]
Merge branch 'update/admin-fe-
20200625' into 'develop'
Update AdminFE build
See merge request pleroma/pleroma!2688
Mark Felder [Thu, 25 Jun 2020 19:55:00 +0000 (14:55 -0500)]
Update AdminFE build
Alex Gleason [Thu, 25 Jun 2020 17:32:06 +0000 (12:32 -0500)]
MastoAPI differences: Document not implemented features
lain [Thu, 25 Jun 2020 10:42:57 +0000 (10:42 +0000)]
Merge branch 'chore/remove-reference-to-distsn' into 'develop'
Remove reference to defunct distsn.org
See merge request pleroma/pleroma!2675
lain [Thu, 25 Jun 2020 10:40:39 +0000 (12:40 +0200)]
AntiSpamLinkPolicy: Exempt local users.
lain [Thu, 25 Jun 2020 10:17:16 +0000 (10:17 +0000)]
Apply suggestion to config/description.exs
lain [Thu, 25 Jun 2020 10:14:19 +0000 (10:14 +0000)]
Merge branch 'issue/1872-ex_aws' into 'develop'
[#1872] use Pleroma.HTTP for ExAws.S3
See merge request pleroma/pleroma!2683
lain [Thu, 25 Jun 2020 10:03:14 +0000 (12:03 +0200)]
Blocking: Don't federate if the options is set.
lain [Thu, 25 Jun 2020 09:51:33 +0000 (11:51 +0200)]
ActivityPub: Remove `block`.
lain [Thu, 25 Jun 2020 09:44:04 +0000 (11:44 +0200)]
AccountController: Extract blocking to CommonAPI.
lain [Thu, 25 Jun 2020 09:33:54 +0000 (11:33 +0200)]
Transmogrifier: Switch to pipeline for Blocks.
lain [Thu, 25 Jun 2020 09:13:35 +0000 (11:13 +0200)]
ObjectValidator: Basic `Block` support.
lain [Thu, 25 Jun 2020 08:54:00 +0000 (10:54 +0200)]
Transmogrifier Test: Extract block handling.
lain [Thu, 25 Jun 2020 06:50:44 +0000 (06:50 +0000)]
Merge branch 'fix/following-request-from-deactivated' into 'develop'
Filter outstanding follower requests from deactivated accounts
Closes #1771
See merge request pleroma/pleroma!2682
Maksim Pechnikov [Thu, 25 Jun 2020 04:12:29 +0000 (07:12 +0300)]
added wrapper Pleroma.HTTP for ExAws.S3
Mark Felder [Wed, 24 Jun 2020 22:18:53 +0000 (17:18 -0500)]
Filter outstanding follower requests from deactivated accounts
lain [Wed, 24 Jun 2020 15:23:20 +0000 (15:23 +0000)]
Merge branch 'fix-emoji-pagination' into 'develop'
Fix for emoji pagination in pack show
See merge request pleroma/pleroma!2681
Alexander Strizhakov [Wed, 24 Jun 2020 15:06:30 +0000 (18:06 +0300)]
fix for emoji pagination in pack show
lain [Wed, 24 Jun 2020 12:33:00 +0000 (14:33 +0200)]
Status schema: Add parent_visible.
lain [Wed, 24 Jun 2020 12:30:12 +0000 (14:30 +0200)]
Changelog: Put info under API header.
lain [Wed, 24 Jun 2020 11:32:14 +0000 (13:32 +0200)]
Changelog: Add info about parent_visible field
lain [Wed, 24 Jun 2020 11:31:42 +0000 (13:31 +0200)]
Docs: Document added parent_visible field.
lain [Wed, 24 Jun 2020 11:29:08 +0000 (13:29 +0200)]
StatusView: Add pleroma.parent_visible
lain [Wed, 24 Jun 2020 10:42:07 +0000 (10:42 +0000)]
Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'
admin api status count per instance
See merge request pleroma/pleroma!2500
lain [Wed, 24 Jun 2020 09:00:17 +0000 (09:00 +0000)]
Merge branch 'issue/1872-updated-tzdata' into 'develop'
[#1872] use Pleroma.HTTP for Tzdata
See merge request pleroma/pleroma!2678
lain [Wed, 24 Jun 2020 08:50:33 +0000 (08:50 +0000)]
Apply suggestion to test/http/tzdata_test.exs
Maksim Pechnikov [Wed, 24 Jun 2020 06:12:32 +0000 (09:12 +0300)]
added wrapper Pleroma.HTTP for Tzdata.HTTPClient
feld [Tue, 23 Jun 2020 18:51:37 +0000 (18:51 +0000)]
Merge branch 'moving-mrf-namespace-migration-fix' into 'develop'
Moving to mrf namespace migration fix
See merge request pleroma/pleroma!2676
lain [Tue, 23 Jun 2020 18:10:33 +0000 (18:10 +0000)]
Merge branch 'update-validator' into 'develop'
Update validator
See merge request pleroma/pleroma!2668
Roman Chvanikov [Tue, 23 Jun 2020 17:56:55 +0000 (20:56 +0300)]
Merge develop
Alexander Strizhakov [Tue, 23 Jun 2020 17:18:27 +0000 (20:18 +0300)]
moving to mrf namespace migration fix
Haelwenn [Tue, 23 Jun 2020 16:38:27 +0000 (16:38 +0000)]
Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
Moving mrf settings from instance to separate mrf group
Closes #1631
See merge request pleroma/pleroma!2320
Mark Felder [Tue, 23 Jun 2020 16:17:26 +0000 (11:17 -0500)]
Remove reference to defunct distsn.org
lain [Tue, 23 Jun 2020 10:54:15 +0000 (10:54 +0000)]
Merge branch 'issue/1798' into 'develop'
[#1798] fixed migration the settings to DB
See merge request pleroma/pleroma!2655
lain [Tue, 23 Jun 2020 10:37:05 +0000 (12:37 +0200)]
ObjectValidator: Clarify type of object.
lain [Tue, 23 Jun 2020 10:06:47 +0000 (10:06 +0000)]
Merge branch 'fix_1586_provide_index_md' into 'develop'
Fix 1586 provide index md
See merge request pleroma/pleroma!2669
lain [Tue, 23 Jun 2020 10:04:51 +0000 (12:04 +0200)]
ActivityPubControllerTest: Capture error log
lain [Tue, 23 Jun 2020 09:43:20 +0000 (11:43 +0200)]
ActivityPubControllerTest: Testing changes.
lain [Tue, 23 Jun 2020 09:03:32 +0000 (11:03 +0200)]
An act of desperation.
lain [Tue, 23 Jun 2020 08:17:12 +0000 (10:17 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
Maksim Pechnikov [Tue, 23 Jun 2020 06:08:24 +0000 (09:08 +0300)]
fix tests
Maksim Pechnikov [Tue, 23 Jun 2020 03:56:17 +0000 (06:56 +0300)]
added tests
Haelwenn [Tue, 23 Jun 2020 03:04:27 +0000 (03:04 +0000)]
Merge branch '@doc/apc2s-upload-media' into 'develop'
ActivityPubController: Update upload_media @doc
See merge request pleroma/pleroma!2673
Haelwenn (lanodan) Monnier [Tue, 23 Jun 2020 02:42:44 +0000 (04:42 +0200)]
ActivityPubController: Update upload_media @doc
Small cherry-pick from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/1810
Haelwenn [Tue, 23 Jun 2020 01:55:33 +0000 (01:55 +0000)]
Merge branch 'fix/missing-default-instance_thumbnail_config' into 'develop'
Add missing default config value for :instance, instance_thumbnail
See merge request pleroma/pleroma!2672
Mark Felder [Mon, 22 Jun 2020 22:39:02 +0000 (17:39 -0500)]
Do not need a function to provide fallback value with default defined in config.exs
Mark Felder [Mon, 22 Jun 2020 22:35:02 +0000 (17:35 -0500)]
Add missing default config value for :instance, instance_thumbnail
Follows up on
b7fc61e17b
Haelwenn [Mon, 22 Jun 2020 21:59:21 +0000 (21:59 +0000)]
Merge branch 'warning/mastofe-settings-blob' into 'develop'
Add warning against parsing/reusing MastoFE settings blob
See merge request pleroma/pleroma!2671
Haelwenn (lanodan) Monnier [Mon, 22 Jun 2020 21:45:29 +0000 (23:45 +0200)]
Add warning against parsing/reusing MastoFE settings blob
lain [Mon, 22 Jun 2020 15:40:09 +0000 (15:40 +0000)]
Merge branch 'add-muted-to-notifications' into 'develop'
Add `pleroma.is_muted` property to notifications
Closes #1812
See merge request pleroma/pleroma!2670
Egor Kislitsyn [Mon, 22 Jun 2020 15:18:33 +0000 (19:18 +0400)]
Update NotificationOperation spec
projects / akkoma / log