Commit graph

3549 commits

Author SHA1 Message Date
dakkar
534c35cca2 merge: Add "force content warning" setting for user moderation (resolves #905) (!876)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/876

Closes #905

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2025-02-20 10:20:49 +00:00
Marie
d67eefaaf5 merge: Add separate redis for rate limit (!908)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/908

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2025-02-18 23:27:56 +00:00
dakkar
9e3667b2a3 fix names that annoy @dakkar 2025-02-18 20:57:55 +00:00
dakkar
029f67b7e5 fix time zone for CustomEmojiService test
otherwise, the timestamps that the test uses for queries are
interpreted as UTC (because they have a TZ in the string), but the
truncated date is interpreted in the session timezone, which defaults
to the server timezone, which can be anything

thanks to @fEmber for noticing
2025-02-18 20:57:55 +00:00
Hazelnoot
c28b27b57f merge: Optionally log remote ActivityPub objects to database (!833)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/833

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2025-02-18 19:51:13 +00:00
Hazelnoot
788751d24d implement redisForRateLimit 2025-02-18 10:36:29 -05:00
Marie
3dfd018305 merge: Fix error message when a peertube object is rejected for bad ID / URL (!900)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/900

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2025-02-17 19:47:36 +00:00
Marie
0e01c94efc merge: Increase rate limit on server-info to avoid errors and blank graphs (!903)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/903

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2025-02-17 19:46:31 +00:00
Marie
25da35eab2 merge: relax validation of Announce / renote timestamps (resolves #799) (!905)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/905

Closes #799

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2025-02-17 19:46:11 +00:00
Hazelnoot
f183df3044 fix error message when a peertube object is reject for bad ID / URL 2025-02-16 19:27:06 -05:00
Hazelnoot
17ec2df3e1 increase rate limit on server-info to avoid errors and blank graphs 2025-02-16 19:26:29 -05:00
Hazelnoot
9de5ecae51 delete fetch logs when a note or user is deleted 2025-02-16 19:25:42 -05:00
Hazelnoot
dbaeb7f2ac fix unit tests using mock-resolver 2025-02-16 19:25:25 -05:00
Hazelnoot
71be39ecc8 add missing await in ApLogCleanupService 2025-02-16 19:25:24 -05:00
Hazelnoot
4858276465 don't log slow activities, as this is known to happen under regular circumstances 2025-02-16 19:25:24 -05:00
Hazelnoot
81944b3bdf implement AP fetch logs 2025-02-16 19:25:22 -05:00
Hazelnoot
cc2edae7ab rename activity_log and activity_context to ap_inbox_log and ap_context 2025-02-16 19:25:04 -05:00
Hazelnoot
0979392925 make activity_log.duration nullable 2025-02-16 19:25:04 -05:00
Hazelnoot
15148b7875 fix activity duration calculation
* Ensure that timing is recorded even if an exception is thrown.
* Round to the correct decimal place.
2025-02-16 19:25:04 -05:00
Hazelnoot
871c63b48b print warning when activity processing exceeds 10 seonds 2025-02-16 19:25:04 -05:00
Hazelnoot
e35e92beb9 log inbound activity duration 2025-02-16 19:25:04 -05:00
Hazelnoot
07cd01ec34 add missing constraint names to SkActivityLog and SkActivityContext 2025-02-16 19:25:04 -05:00
Hazelnoot
561f46b8d4 add logging for ActivityLogCleanupService 2025-02-16 19:25:04 -05:00
Hazelnoot
b65b4ecadc add inbound activity logger for debugging 2025-02-16 19:25:02 -05:00
Hazelnoot
ec0b2933e6 add admin/cw-user to new endpoints list 2025-02-16 19:22:55 -05:00
Hazelnoot
e60fe879d6 document "special character" as zero-width space in activitypub unit tests 2025-02-16 19:20:42 -05:00
Hazelnoot
86b26fb58e adjust types to avoid merge conflicts in NoteCreateService.ts and NoteEditService.ts 2025-02-16 19:20:42 -05:00
Hazelnoot
5c86929b58 fix type errors in NoteCreateService.ts 2025-02-16 19:20:42 -05:00
Hazelnoot
c54b6bf55d append mandatory CW in Update(Note) activities 2025-02-16 19:20:41 -05:00
Hazelnoot
583f55bc5a fix type error in WebhookTestService.ts 2025-02-16 19:20:41 -05:00
Hazelnoot
3d23cdc0e4 append mandatory CW in note previews 2025-02-16 19:20:41 -05:00
Hazelnoot
c5933f369e move mandatoryCW from admin-user to PackedUserLite (public field) 2025-02-16 19:20:41 -05:00
Hazelnoot
6c2034a373 append default CW when rendering AP Note objects 2025-02-16 19:20:41 -05:00
Hazelnoot
563e32316f factor out common append-content-warning routine for use in both frontend and backend 2025-02-16 19:20:41 -05:00
Hazelnoot
7814c6e54e remove mandatory CW logic from NoteCreateService and NoteEditService 2025-02-16 19:20:41 -05:00
Hazelnoot
b256ac32d0 don't duplicate mandatory CWs 2025-02-16 19:20:41 -05:00
Hazelnoot
568d82a974 record ModLog entry when setting a user's content warning 2025-02-16 19:20:41 -05:00
Hazelnoot
935a62f5e5 fix typescript errors in WebhookTestService.ts 2025-02-16 19:20:41 -05:00
Hazelnoot
ea89348b62 add user-level "force content warning" moderation feature 2025-02-16 19:20:37 -05:00
Hazelnoot
2bf8648ebc refresh cache when marking a user as NSFW 2025-02-16 19:15:23 -05:00
Hazelnoot
feeaf26641 fix lint errors in NoteCreateService & NoteEditService 2025-02-16 19:15:22 -05:00
Hazelnoot
3ab310e472 relax validation of Announce(Note) timestamps 2025-02-16 19:14:58 -05:00
Hazelnoot
6d459cdf80 Update ApImageService.ts 2025-02-16 19:14:24 -05:00
Hazelnoot
447534d094 support Peertube preview thumbnails 2025-02-16 19:14:24 -05:00
Hazelnoot
2d7918a9b7 merge: Merge upstream 2025.2.0 (!886)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/886

Approved-by: Marie <github@yuugi.dev>
Approved-by: Amber Null <puppygirlhornyposting@gmail.com>
2025-02-16 21:42:35 +00:00
dakkar
e5c41444e6 merge: fill myReaction in more cases - may fix #944 (!907)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/907

Closes #944

Approved-by: Charlotte <timo.herngreen@gmail.com>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
2025-02-16 13:39:27 +00:00
dakkar
949664147e fill myReaction in more cases - may fix !944
* first of all, fetch from the buffer all the notes we may
	need (including replied-to ones)
* then, distinguish between "we know there's no myReaction" and "we
  don't know if there's any myReaction"
* finally, look at both a note and the note it's replying to
2025-02-16 11:41:32 +00:00
Hazelnoot
ec29e12c97 Merge branch 'develop' into merge/2024-02-03
# Conflicts:
#	packages/backend/src/core/SearchService.ts
2025-02-15 11:30:26 -05:00
Marie
dc6f13728c merge: Fix timeout when searching notes by host without meilisearch (resolves #940) (!896)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/896

Closes #940

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2025-02-15 11:00:33 +00:00
Hazelnoot
c67d985254 Merge branch 'develop' into merge/2024-02-03
# Conflicts:
#	packages/backend/src/core/SearchService.ts
#	packages/misskey-js/src/autogen/types.ts
2025-02-14 23:48:36 -05:00