ilja/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
14497 commits 9 branches 72 tags 310 MiB
Commit graph

5567 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Mark Felder
73b4d0d9a7 Fix the mocks to use uppercase as well 2022-08-10 21:46:56 +00:00
Tusooa Zhu
d487e0160c
Treat containment failure as cancel in ReceiverWorker 2022-08-08 08:41:33 -04:00
Tusooa Zhu
88e0e6acd5
Fix FederatorTest 2022-08-06 00:42:10 -04:00
Tusooa Zhu
a0166e92fa
Treat MRF rejects as success in Oban worker 2022-08-06 00:33:18 -04:00
floatingghost
f2a9285ff0
bugfix/follow-state (#104) 
Reviewed-on: AkkomaGang/akkoma#104
 2022-08-03 01:07:53 -04:00
Tusooa Zhu
a4fa286d20
Use actor_types() to determine whether the Update is for user 2022-08-02 10:37:28 -04:00
Haelwenn
b2ba307f4d Merge branch 'from/upstream-develop/tusooa/2871-fix-local-public' into 'develop' 
local only fixes

Closes #2871

See merge request pleroma/pleroma!3660
 2022-08-02 05:39:50 +00:00
Haelwenn
7299795eb4 Merge branch 'from/upstream-develop/tusooa/backup-without-email' into 'develop' 
Allow users to create backups without providing email address

See merge request pleroma/pleroma!3665
 2022-08-02 05:23:49 +00:00
Haelwenn
5ef2dc317d Change test case wording 2022-07-31 21:34:23 +00:00
tusooa
c80096522c Merge branch 'develop' into 'from/develop/tusooa/emit-move' 
# Conflicts:
#   CHANGELOG.md
#   test/pleroma/user_test.exs
 2022-07-31 21:32:49 +00:00
marcin mikołajczak
5d3d6a58f7 Use duration param for mute expiration duration 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-07-31 17:22:34 +02:00
Haelwenn
0814d0e0cb Merge branch 'fix/proper-emoji-qualification' into 'develop' 
Emoji: implement full-qualifier using combinations

See merge request pleroma/pleroma!3709
 2022-07-28 04:46:15 +00:00
Haelwenn
0f9f3d2897 Merge branch 'from/upstream-develop/tusooa/2384-pagination' into 'develop' 
Make mutes and blocks behave the same as other lists

Closes #2384

See merge request pleroma/pleroma!3693
 2022-07-28 04:37:10 +00:00
Hélène
fb3f6e1975
EmojiReactValidator: use new qualification method 2022-07-25 16:49:23 +02:00
Hélène
388bbc4978
EmojiReactValidator: fix emoji qualification 
Tries fully-qualifying emoji when receiving them, by adding the emoji
variation sequence to the received reaction emoji.

This issue arises when other instance software, such as Misskey, tries
reacting with emoji that have unqualified or minimally qualified
variants, like a red heart. Pleroma only accepts fully qualified emoji
in emoji reactions, and refused those emoji. Now, Pleroma will attempt
to properly qualify them first, and reject them if checks still fail.

This commit contains changes to tests proposed by lanodan.

Co-authored-by: Haelwenn <contact+git.pleroma.social@hacktivis.me>
 2022-07-24 13:36:06 +02:00
Tusooa Zhu
997f08b350
Make AntiLinkSpamPolicy history-aware 2022-07-24 00:18:09 -04:00
Tusooa Zhu
d877d2a4e7
Make HashtagPolicy history-aware 2022-07-24 00:02:39 -04:00
Tusooa Zhu
82c8fc1ede
Make NoEmptyPolicy work with Update 2022-07-23 23:24:25 -04:00
Tusooa Zhu
46a5c06853
Make NormalizeMarkup history-aware 2022-07-23 22:50:38 -04:00
Tusooa Zhu
fc7ce5f93c
Make NoPlaceholderTextPolicy history-aware 2022-07-23 22:41:04 -04:00
Tusooa Zhu
dce7e42928
Make MediaProxyWarmingPolicy history-aware 2022-07-23 22:34:03 -04:00
Tusooa Zhu
0a337063e1
Make ForceMentionsInContent history-aware 2022-07-23 22:23:57 -04:00
Tusooa Zhu
cd19537f39
Make EnsureRePrepended history-aware 2022-07-23 17:48:39 -04:00
Tusooa Zhu
eba9b0760f
Make MRF Keyword history-aware 2022-07-23 15:56:36 -04:00