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

710 commits

Author SHA1 Message Date
Tusooa Zhu
d19696cf60
Lint 2022-09-02 22:58:35 -04:00
Tusooa Zhu
c32e28e1b0
Fix SideEffectsTest 2022-09-01 07:33:58 -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
floatingghost
f2a9285ff0
bugfix/follow-state (#104) 
Reviewed-on: AkkomaGang/akkoma#104
 2022-08-03 01:07:53 -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
301ce5bc62 Merge branch 'mute-expiration' into 'develop' 
MastoAPI: Show mutes expiration date

See merge request pleroma/pleroma!3682
 2022-07-23 00:34:15 +00:00
Haelwenn
cfb21d011f Revert "Merge branch 'fix/emoji-react-qualification' into 'develop'" 
This reverts merge request !3684
 2022-07-22 23:19:49 +00:00
FloatingGhost
09e0304b9c Add test for broken owncast federation 2022-07-22 20:30:45 +02:00
tusooa
c589b8445f Merge branch 'birthday_fix' into 'develop' 
Allow to unset birthday

See merge request pleroma/pleroma!3702
 2022-07-21 21:27:16 +00:00
Haelwenn
454f892f37 Merge branch 'fix/emoji-react-qualification' into 'develop' 
EmojiReactValidator: fix emoji qualification

See merge request pleroma/pleroma!3684
 2022-07-21 17:45:47 +00:00
Tusooa Zhu
4350a205a4
Merge remote-tracking branch 'upstream/develop' into HEAD 2022-07-21 13:44:16 -04:00
marcin mikołajczak
fb268c4378 Allow to unset birthday 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-07-17 19:46:29 +02:00
Sean King
64e16e6a4b
Document way to do notice compatibility routes with Nginx reverse-proxy instead 2022-07-16 23:44:37 -06:00
tusooa
8aba7c08d1 Merge branch 'notification_types' into 'develop' 
MastoAPI: Use `types` for filtering notifications

See merge request pleroma/pleroma!3648
 2022-07-17 03:17:43 +00:00
marcin mikołajczak
597f56b4c4 Use :utc_datetime 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-07-16 16:28:22 +02:00
Tusooa Zhu
8371fd8ca2
Implement settings api 2022-07-16 01:20:25 -04:00
tusooa
fdc71f6051 Merge branch 'short-description' into 'develop' 
Add short_description instance field

Closes #2865

See merge request pleroma/pleroma!3651
 2022-07-13 04:42:24 +00:00
Tusooa Zhu
eb2a1652bf
Add tests for short_description 2022-07-13 00:40:46 -04:00
Tusooa Zhu
c1874bc8f9
Make mutes and blocks behave the same as other lists 2022-07-12 19:03:18 -04:00
Haelwenn
420da14b61 Merge branch 'from/upstream-develop/tusooa/2830-remote-fo-mp' into 'develop' 
Pass remote follow avatar into media proxy

Closes #2830

See merge request pleroma/pleroma!3690
 2022-07-10 16:19:16 +00:00
Tusooa Zhu
2efc0ffcf0
Pass remote follow avatar into media proxy 2022-07-10 00:12:53 -04:00
marcin mikołajczak
0b16ce79f9 Add test for rendering mute expiration date 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-07-08 20:59:58 +02:00
Haelwenn
8c78fef56f EmojiReactValidator: apply lanodan's suggestions 
These changes make the encoding for the fully-qualified heart emoji very visible in editors.
 2022-07-04 00:25:54 +00:00
Haelwenn
a15b45a589 Merge branch 'bugfix/mime-validation-no-list' into 'develop' 
Bugfix: Validate mediaType only by it's format

See merge request pleroma/pleroma!3597
 2022-07-03 21:04:41 +00:00
Haelwenn
6b937d1473 Merge branch 'from/upstream-develop/tusooa/server-announcements' into 'develop' 
Server announcements (1st pass)

See merge request pleroma/pleroma!3643
 2022-07-03 20:58:20 +00:00
Hélène
11f9f2ef27
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.
 2022-06-28 21:33:57 +02:00
Hélène
a74ce2d77a
StealEmojiPolicy: fix String rejected_shortcodes 
* rejected_shortcodes is defined as a list of strings in the
  configuration description. As such, database-based configuration was
  led to handle those settings as strings, and not as the actually
  expected type, Regex.
* This caused each message passing through this MRF, if a rejected
  shortcode was set and the emoji did not exist already on the instance,
  to fail federating, as an exception was raised, swiftly caught and
  mostly silenced.
* This commit fixes the issue by introducing new behavior: strings are
  now handled as perfect matches for an emoji shortcode (meaning that if
  the emoji-to-be-pulled's shortcode is in the blacklist, it will be
  rejected), while still supporting Regex types as before.
 2022-05-18 21:25:10 +02:00
Tusooa Zhu
6e5ef7f2eb
Test local-only in ap c2s outbox 
Ref: fix-local-public
 2022-05-09 18:53:32 -04:00
Tusooa Zhu
38444aa92a
Allow authenticated users to access local-only posts in MastoAPI 
Ref: fix-local-public
 2022-05-09 18:53:18 -04:00
Haelwenn
4605efe272 Merge branch 'improve_anti_followbot_policy' into 'develop' 
Also use actor_type to determine if an account is a bot in antiFollowbotPolicy

Closes #2561

See merge request pleroma/pleroma!3498
 2022-05-08 18:10:40 +00:00
Ilja
a8093732bd Also use actor_type to determine if an account is a bot in antiFollowbotPolicy 2022-05-08 18:10:40 +00:00
Tusooa Zhu
221cb3fb81
Allow users to create backups without providing email address 
Ref: backup-without-email
 2022-05-07 00:23:55 -04:00
Tusooa Zhu
fe933b9bf2
Prevent remote access of local-only posts via /objects 
Ref: fix-local-public
 2022-05-06 13:54:21 -04:00
Tusooa Zhu
466568ae36
Lint 
Ref: fix-local-public
 2022-05-06 13:54:13 -04:00
Tusooa Zhu
826deb7375
Make local-only statuses searchable 
Ref: fix-local-public
 2022-05-06 13:54:13 -04:00
Tusooa Zhu
38af42968d
Test that anonymous users cannot see local-only posts 
Ref: fix-local-public
 2022-05-06 13:54:12 -04:00
Tusooa Zhu
c48be59f58
Show local-only statuses in public timeline for authenticated users 
Ref: fix-local-public
 2022-05-06 13:54:02 -04:00