a77a7a3620
Add /api/v2/instance route
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-28 20:10:10 +02:00
Alex Gleason
e88d52c4de
Fix OStatusControllerTest
2022-10-27 14:21:13 -05:00
Alex Gleason
bddd4375bf
Expose favicon URL in instance API
2022-10-27 13:51:25 -05:00
Alex Gleason
35f16d9c47
Render title and favicon on all pages that serve index.html
2022-10-27 13:29:36 -05:00
Alex Gleason
f303a02e86
Let favicon be configurable
2022-10-27 13:15:15 -05:00
tusooa
9fbf01f7a9
Merge branch 'push-updates' into 'develop'
...
Push.Impl: support edits
See merge request pleroma/pleroma!3760
2022-10-27 12:51:29 +00:00
Haelwenn (lanodan) Monnier
16b06160ac
CommonAPI: generate ModerationLog for all admin/moderator deletes
...
As a side-effect it also changes the ChatMessage delete ID to an
Activity.id rather than MessageReference.id
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2958
2022-10-14 18:51:08 +02:00
Alex Gleason
0447197378
Merge branch 'merge-pleroma' into 'develop'
...
Merge Pleroma
See merge request soapbox-pub/rebased!184
2022-10-10 01:22:54 +00:00
Alex Gleason
035d9e71eb
Merge remote-tracking branch 'origin/develop' into merge-pleroma
2022-10-09 13:58:19 -05:00
Alex Gleason
7ac6f4b6ea
Merge remote-tracking branch 'origin/develop' into link-tag-fix
2022-10-09 13:57:29 -05:00
Alex Gleason
ddaeb09e54
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
2022-10-09 13:46:48 -05:00
Alex Gleason
147f6c4f63
Tag erratic Move tests
2022-10-09 13:37:27 -05:00
Alex Gleason
11dfc2589a
Add support for FEP-e232 quotes without quoteUrl
2022-10-09 13:27:16 -05:00
Tusooa Zhu
dd82fd234f
Merge branch 'release/2.4.4' into mergeback/2.4.4
2022-10-08 22:15:09 -04:00
Alex Gleason
0cd15c997c
TagValidator: allow Link tags, don't go nuclear for unrecognized Tag types
2022-10-01 19:56:11 -05:00
1b238a4fad
Push.Impl: support edits
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-01 23:28:02 +02:00
Alex Gleason
544be36c80
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
2022-09-28 17:29:53 -05:00
c6fddd6e0a
Add migration cooldown period
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-28 23:48:45 +02:00
Haelwenn
3f1c31b7cd
Merge branch 'fix/exclude-deactivated-in-search' into 'develop'
...
User: search: exclude inactive users from user search
See merge request pleroma/pleroma!3755
2022-09-27 23:58:45 +00:00
Haelwenn
d43d02bf41
Merge branch 'from/upstream-develop/tusooa/fix-static-tests' into 'develop'
...
Make instance document controller test sync
Closes #2940
See merge request pleroma/pleroma!3757
2022-09-27 21:50:43 +00:00
Haelwenn
5d7d623390
Merge branch 'bugfix/elixir-1.14' into 'develop'
...
Bugfix: Elixir 1.14
See merge request pleroma/pleroma!3740
2022-09-27 21:46:03 +00:00
Tusooa Zhu
e66c02b775
Make instance document controller test sync
2022-09-20 12:34:10 -04:00
tusooa
ac95b8b4f3
Merge branch 'websocketex' into 'develop'
...
Use Websockex to replace websocket_client
See merge request pleroma/pleroma!3743
2022-09-18 17:09:12 +00:00
tusooa
1a7107f4a5
Merge branch 'remove_from_followers' into 'develop'
...
MastoAPI: POST /api/v1/accounts/:id/remove_from_followers
See merge request pleroma/pleroma!3647
2022-09-16 23:24:13 +00:00
a1batross
7f63b4c315
User: search: exclude deactivated users from user search
...
This way we don't pollute search results with deactivated and deleted users
2022-09-16 00:49:16 +03:00
Tusooa Zhu
ea60c4e709
Fix wrong relationship direction
2022-09-14 20:24:04 -04:00
Alex Gleason
2f259173c3
Tag erratic tests
2022-09-13 15:57:50 -05:00
Alex Gleason
f5e77a3eaa
soapbox-fe --> soapbox
2022-09-13 15:26:28 -05:00
FloatingGhost
6bdf451ce8
Use set of pregenerated RSA keys
...
Randomness is a huge resource sink, so let's just use
a some that we made earlier
2022-09-11 21:33:20 +02:00
Hélène
0b19625bfb
ObjectView: do not fetch an object for its ID
...
Non-Create/Listen activities had their associated object field
normalized and fetched, but only to use their `id` field, which is both
slow and redundant. This also failed on Undo activities, which delete
the associated object/activity in database.
Undo activities will now render properly and database loads should
improve ever so slightly.
2022-09-11 04:54:04 +02:00
marcin mikołajczak
98ccf6cbdc
Merge branch 'webfinger-expanding' into 'develop'
...
Webfinger expanding
See merge request soapbox-pub/rebased!96
2022-09-10 22:03:10 +00:00
Tusooa Zhu
50923f5438
Fix User.get_or_fetch/1 with usernames starting with http
2022-09-08 11:58:17 -04:00
Alex Gleason
4b62d36fe5
NotificationTest: update edit notification test for async worker
2022-09-06 12:00:13 -05:00
Alex Gleason
ce9bacc3be
Merge branch 'fix-subscriptions' into 'develop'
...
Create notifications async with NotificationWorker, #91
See merge request soapbox-pub/rebased!173
2022-09-06 16:33:02 +00:00
Alex Gleason
5b8b21b9e9
Fix tests for async notifications
2022-09-05 14:25:23 -05:00
Haelwenn
b8d6cb5845
Merge branch 'from/upstream-develop/tusooa/2892-backup-scope' into 'develop'
...
Make backups require its own scope
Closes #2892
See merge request pleroma/pleroma!3721
2022-09-05 15:42:02 +00:00
Haelwenn
346c130ddc
Merge branch 'fix/user-private-key-generation' into 'develop'
...
User: generate private keys on user creation
See merge request pleroma/pleroma!3737
2022-09-05 15:38:15 +00:00
tusooa
9874b4c985
Merge branch 'develop' into 'from/upstream-develop/tusooa/2892-backup-scope'
...
# Conflicts:
# CHANGELOG.md
2022-09-05 15:00:19 +00:00
d4eccd86b3
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-05 15:30:14 +02:00
Hélène
cd237d22f1
User: generate private keys on user creation
...
This fixes a race condition bug where keys could be regenerated
post-federation, causing activities and HTTP signatures from an user to
be dropped due to key differences.
2022-09-05 03:51:17 +02:00
tusooa
f8afba95b2
Merge branch 'fix/gts-federation' into 'develop'
...
GoToSocial federation fixes
See merge request pleroma/pleroma!3725
2022-09-05 01:10:34 +00:00
tusooa
20347898e2
Merge branch 'fix/federation-context-issues' into 'develop'
...
Fix reply context fixing (Pleroma replies to Misskey threads) and removal of context objects
See merge request pleroma/pleroma!3717
2022-09-04 18:43:36 +00:00
Haelwenn
c63cf954de
Merge branch 'from/upstream-develop/tusooa/streaming-fix' into 'develop'
...
Streaming fix
Closes #2796
See merge request pleroma/pleroma!3738
2022-09-03 18:24:28 +00:00
Hélène
4477c6baff
Metadata/Utils: use summary as description if set
...
When generating OpenGraph and TwitterCard metadata for a post, the
summary field will be used first if it is set to generate the post
description.
2022-09-03 17:17:48 +02:00
cdf454bfd2
Merge remote-tracking branch 'pleroma/develop' into HEAD
2022-09-03 17:04:02 +02:00
marcin mikołajczak
0312f6770c
Merge branch 'develop' into 'edits'
...
# Conflicts:
# priv/static/schemas/litepub-0.1.jsonld
2022-09-03 14:14:25 +00:00
Tusooa Zhu
d19696cf60
Lint
2022-09-02 22:58:35 -04:00
Haelwenn
299255b9bb
Merge branch 'from/upstream-develop/tusooa/assoc-object-id' into 'develop'
...
Add function to calculate associated object id
Closes #2307
See merge request pleroma/pleroma!3692
2022-09-03 02:50:40 +00:00
Haelwenn
e40c221c31
Merge branch 'from/upstream-develop/tusooa/edits' into 'develop'
...
Editing
Closes #1429 , #2859 , and #2288
See merge request pleroma/pleroma!3678
2022-09-03 02:16:42 +00:00
Haelwenn
07ef72f493
Merge branch 'from/develop/tusooa/2807-remote-xact-post' into 'develop'
...
Remote interaction with posts
Closes #2807 and #978
See merge request pleroma/pleroma!3587
2022-09-03 02:03:48 +00:00
Haelwenn (lanodan) Monnier
24af2e1c58
script_test: Fix %ErlangError for Elixir 1.14
2022-09-03 03:58:22 +02:00
Haelwenn (lanodan) Monnier
2f301bbb87
timeline_controller_test: Fix test name for elixir 1.14
2022-09-03 03:58:22 +02:00
Tusooa Zhu
6d148b6637
Use Websockex to replace websocket_client
2022-09-03 02:13:00 +02:00
Haelwenn
b439e91f57
Revert "Merge branch 'rewrite/integration-test-websocket-client' into 'develop'"
...
This reverts merge request !3649
2022-09-02 22:35:40 +00:00
Haelwenn
01239456a1
Merge branch 'rewrite/integration-test-websocket-client' into 'develop'
...
Rewrite integration-test websocket client with Mint.WebSocket, closes #2812
Closes #2812
See merge request pleroma/pleroma!3649
2022-09-02 19:18:22 +00:00
Tusooa Zhu
c32e28e1b0
Fix SideEffectsTest
2022-09-01 07:33:58 -04:00
Tusooa Zhu
ffd379456b
Do not stream out Announces to public timelines
2022-08-31 15:57:06 -04:00
a15bf235cf
Merge remote-tracking branch 'pleroma/develop' into HEAD
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-30 10:15:07 +02:00
Tusooa Zhu
f9b86c3c22
Make local-only posts stream in local timeline
2022-08-27 19:34:56 -04:00
Tusooa Zhu
3afa1903ee
Do not stream out Create of ChatMessage
2022-08-27 17:51:41 -04:00
Alex Gleason
8833ea7a1b
Merge branch 'rebased-fixes' into 'develop'
...
Fix Rebased --> Pleroma instance version
See merge request soapbox-pub/rebased!167
2022-08-25 19:28:51 +00:00
Alex Gleason
d230d70170
Nodeinfo: fix Rebased --> Pleroma
2022-08-25 14:11:28 -05:00
Alex Gleason
a4c9739965
Fix Rebased --> Pleroma instance version
2022-08-25 14:02:38 -05:00
tusooa
84a573877a
Merge branch 'fix_erratic_tests' into 'develop'
...
Fix flaky rate_limiter_test.exs test "it restricts based on config values"
See merge request pleroma/pleroma!3688
2022-08-25 18:39:38 +00:00
tusooa
6811237ffd
Merge branch 'fix_flaky_transfer_task_test.exs' into 'develop'
...
Fix flaky/erratic test/pleroma/config/transfer_task_test.exs
See merge request pleroma/pleroma!3703
2022-08-25 18:38:18 +00:00
tusooa
6f10f93d62
Merge branch 'fix_erratic_participation_test' into 'develop'
...
fix flaky participation_test.exs
See merge request pleroma/pleroma!3689
2022-08-25 18:36:47 +00:00
Ilja
dc72a523c4
fix flaky participation_test.exs
2022-08-25 18:36:46 +00:00
64d515df28
Use colors from frontend configuration
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-25 14:58:28 +02:00
tusooa
8ec985eea1
Merge branch 'fix_flaky_filter_controller_test.exs_200' into 'develop'
...
fix flaky test filter_controller_test.exs:200
See merge request pleroma/pleroma!3699
2022-08-24 15:24:57 +00:00
Ilja
5b2e3a303c
fix flaky test filter_controller_test.exs:200
2022-08-24 15:24:57 +00:00
tusooa
59109f8f74
Merge branch 'fix_flaky_test_user_relationship_test.exs_81' into 'develop'
...
fix flaky test_user_relationship_test.exs:81
See merge request pleroma/pleroma!3697
2022-08-24 15:24:07 +00:00
Ilja
47e3a72b6e
fix flaky test_user_relationship_test.exs:81
2022-08-24 15:24:07 +00:00
Tusooa Zhu
779457d9a4
Add GET endpoints for remote subscription forms
...
There are two reasons for adding a GET endpoint:
0: Barely displaying the form does not change anything on the server.
1: It makes frontend development easier as they can now use a link,
instead of a form, to allow remote users to interact with local ones.
2022-08-20 21:13:51 -04:00
Tusooa Zhu
2701628786
Add remote interaction ui for posts
2022-08-20 21:13:51 -04:00
Tusooa Zhu
06678fb4ad
Add function to calculate associated object id
2022-08-20 20:43:40 -04:00
Tusooa Zhu
5a2c8ef4cc
Refactor streamer test
2022-08-19 20:24:24 -04:00
Tusooa Zhu
f459c1260b
Lint
2022-08-19 20:24:24 -04:00
Tusooa Zhu
3522852c61
Test that server will disconnect websocket upon token revocation
2022-08-19 20:24:24 -04:00
Tusooa Zhu
eb42e90c4f
Use Websockex to replace websocket_client
2022-08-19 20:24:21 -04:00
Tusooa Zhu
c62a4f1c17
Disconnect streaming sessions when token is revoked
2022-08-19 20:22:45 -04:00
Hélène
4661b56720
ArticleNotePageValidator: fix replies fixing
...
Some software, like GoToSocial, expose replies as ActivityPub
Collections, but do not expose any item array directly in the object,
causing validation to fail via the ObjectID validator. Now, Pleroma will
drop that field in this situation too.
2022-08-19 02:45:49 +02:00
a0923b96a0
Fix voters_count in polls from remote Pleroma instances
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-18 23:39:07 +02:00
322e00e45a
Revert "Merge branch 'revert-f6e02270' into 'develop'"
...
This reverts commit 5b8ad6bc91f6e02270c3
2022-08-18 23:06:18 +02:00
marcin mikołajczak
4de58c2b2c
Revert "Merge branch 'polls' into 'develop'"
...
This reverts merge request !152
2022-08-18 06:38:03 +00:00
FloatingGhost
f41d970a59
fix resolution of GTS user keys
2022-08-16 18:51:34 +02:00
fa9106bb1b
Merge remote-tracking branch 'soapbox/develop' into polls
2022-08-16 07:42:22 +02:00
95f18a7296
Add tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Signed-off-by: marcin mikołajczak <me@mkljczk.pl>
2022-08-15 21:22:06 +02:00
Hélène
bb02ee99f5
CommonFixes: more predictable context generation
...
`context` fields for objects and activities can now be generated based
on the object/activity `inReplyTo` field or its ActivityPub ID, as a
fallback method in cases where `context` fields are missing for incoming
activities and objects.
2022-08-15 01:46:55 +02:00
Alex Gleason
dae909ad34
Revert "Merge branch 'from/upstream-develop/tusooa/sync-settings' into 'develop'"
...
This reverts commit 93f12c0d0d6ce3f76b5d
2022-08-13 14:06:21 -05:00
Alex Gleason
f5713ab575
Tag erratic test
2022-08-13 14:04:21 -05:00
Alex Gleason
55c15ea81e
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
2022-08-13 13:42:11 -05:00
Haelwenn
06f9324afe
Merge branch 'from/upstream-develop/tusooa/2912-receiver-reject-mrf' into 'develop'
...
Treat MRF rejects as success in Oban worker
Closes #2912
See merge request pleroma/pleroma!3720
2022-08-12 01:37:40 +00:00
Haelwenn
93f12c0d0d
Merge branch 'from/upstream-develop/tusooa/sync-settings' into 'develop'
...
Synchronized settings for apps (frontends)
See merge request pleroma/pleroma!3698
2022-08-12 01:34:36 +00:00
Haelwenn
6ce3f76b5d
Merge branch 'from/upstream-develop/floatingghost/follow-state' into 'develop'
...
Backport: bugfix/follow-state
Closes #2902
See merge request pleroma/pleroma!3718
2022-08-12 01:32:20 +00:00
Alex Gleason
2edb44789d
Merge remote-tracking branch 'origin/develop' into odic
2022-08-11 18:17:44 -05:00
Alex Gleason
54838c959f
Expose oauth_consumer_strategies in instance API
2022-08-11 17:58:54 -05:00
Mark Felder
73b4d0d9a7
Fix the mocks to use uppercase as well
2022-08-10 21:46:56 +00:00
Hélène
3b6784b1de
CreateGenericValidator: fix reply context fixing
...
Incoming Pleroma replies to a Misskey thread were rejected due to a
broken context fix, which caused them to not be visible until a
non-Pleroma user interacted with the replies.
This fix properly sets the post-fix object context to its parent Create
activity as well, if it was changed.
2022-08-10 02:29:38 +02:00
Hélène
def0f5dc2e
StatusView: implement pleroma.context field
...
This field replaces the now deprecated conversation_id field, and now
exposes the ActivityPub object `context` directly via the MastoAPI
instead of relying on StatusNet-era data concepts.
2022-08-10 02:29:38 +02:00
Hélène
a9111bcaf2
StatusView: clear MSB on calculated conversation_id
...
This field seems to be a left-over from the StatusNet era.
If your application uses `pleroma.conversation_id`: this field is
deprecated.
It is currently stubbed instead by doing a CRC32 of the context, and
clearing the MSB to avoid overflow exceptions with signed integers on
the different clients using this field (Java/Kotlin code, mostly; see
Husky and probably other mobile clients.)
This should be removed in a future version of Pleroma. Pleroma-FE
currently depends on this field, as well.
2022-08-09 20:10:43 +02:00
