Commit Graph

2520 Commits

Author SHA1 Message Date
dakkar 02d36c4518 Merge branch 'develop' into feature/2024.9.0 2024-10-11 10:10:16 +01:00
dakkar a12815eabe fix some (all?) Misskey references 2024-10-11 09:59:21 +01:00
Hazelnoot ffff1dfc7d merge: Reduce federation log spam (maybe resolves #689) (!649)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/649

Closes #689

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-10 19:43:39 +00:00
dakkar 9ea618c4a5 fix some DI mistakes after the merge 2024-10-10 13:55:52 +01:00
dakkar ebe5f678f6 fix imports in channels bubble-timeline 2024-10-09 17:57:58 +01:00
dakkar dec81d32d3 fix type in channel.ts 2024-10-09 17:56:40 +01:00
dakkar 671d71b3ba probably use correct icons in embeds 2024-10-09 17:24:33 +01:00
dakkar 43bdae4cc4 use injected meta in search-by-tag 2024-10-09 17:19:50 +01:00
dakkar 3b3bd68645 use injected meta in MastodonApiServerService 2024-10-09 17:18:38 +01:00
dakkar 9200d35f57 use injected meta in stream bubble-timeline 2024-10-09 17:17:27 +01:00
dakkar 7b7bc8b7b3 use injected meta in claim-achievement.ts 2024-10-09 17:15:27 +01:00
dakkar 96e77f8d39 use injected meta in like.ts
also, add extra errors copied from reactions/create.ts
2024-10-09 17:15:04 +01:00
dakkar 81376bcd1b use injected meta in SigninApiService 2024-10-09 17:10:02 +01:00
dakkar ee439f9c7f remove MetaService from ActivityPubServerService 2024-10-09 17:07:43 +01:00
dakkar f449e8ffe6 use injected meta is ApRendererService 2024-10-09 17:05:59 +01:00
dakkar c31ee21485 fix meta in SignupService 2024-10-09 17:04:31 +01:00
dakkar e6a78d8027 use injected meta in SponsorsService 2024-10-09 17:03:46 +01:00
dakkar b04568f378 use injected meta in bubble-timeline 2024-10-09 17:00:38 +01:00
dakkar ad33886bbb always use `this.meta` in SignupApiService 2024-10-09 16:53:46 +01:00
dakkar 11e3c95026 replace `isBlockedHost` with `isFederationAllowedHost` 2024-10-09 16:39:24 +01:00
dakkar 5856858f49 try to fix icons 2024-10-09 15:52:42 +01:00
dakkar 1a656e8eb5 copy changes from NoteCreateService to NoteEditService 2024-10-09 15:40:00 +01:00
dakkar f00576bce6 Merge remote-tracking branch 'misskey/master' into feature/2024.9.0 2024-10-09 15:17:22 +01:00
Marie 72a0f16b38 merge: Show instance sponsors if OC is set as donation url (!642)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/642

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Julia <julia@insertdomain.name>
2024-10-08 18:07:58 +00:00
Hazel K a5316c06ed don't log job name unless it has one 2024-10-08 11:01:24 -04:00
Hazel K 5171ba7113 collapse AbortErrors 2024-10-08 10:43:58 -04:00
Hazel K d867c2089b further condense error details 2024-10-08 10:43:51 -04:00
Hazel K d8e1e4890d normalize ID logging 2024-10-08 10:33:48 -04:00
Hazel K f62cd8941c condense error info 2024-10-08 10:33:34 -04:00
Hazel K b4d10aa8f8 fix maxAttempts calculation 2024-10-08 10:29:03 -04:00
Hazel K 786702e076 condense job info 2024-10-08 10:27:55 -04:00
Hazel K 83869e1c47 fix lint errors 2024-10-08 10:14:33 -04:00
Hazel K 20dd66f735 improve error summaries 2024-10-08 10:14:26 -04:00
Hazel K ed0570110b reduce federation log spam
* Don't record stack trace for unrecoverable errors.
* Avoid logging duplicate stace traces.
2024-10-08 09:30:08 -04:00
Hazelnoot a90b4d487a merge: Increase character hard limits (resolves #686 and #696) (!647)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/647

Closes #686 and #696

Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-10-07 23:20:14 +00:00
Marie ba5eec2129 merge: Prevent deletion or suspension of system accounts (resolves #625) (!666)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/666

Closes #625

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-07 19:34:26 +00:00
Marie f7e9ffb99a merge: Display instance follow/following relationships in instance view (partial implementation of 648) (!665)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/665

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
2024-10-07 19:30:48 +00:00
Hazel K cd9bce3072 prevent login and password reset for system accounts 2024-10-07 14:58:39 -04:00
Hazel K 126a2fcf15 Merge branch 'develop' into hazelnoot/625-protect-system-accounts 2024-10-07 14:10:45 -04:00
Hazel K 39214431f4 check for host 2024-10-07 11:45:58 -04:00
PrivateGER 46e53e294e
Parameterize followee as well 2024-10-07 16:47:15 +02:00
Hazel K 0da7f9b3f6 Merge branch 'develop' into hazelnoot/following-timeline 2024-10-07 10:45:16 -04:00
Hazel K 844dfaaf5d model missing "approved" property in show-user response 2024-10-07 10:40:44 -04:00
PrivateGER 1c3495ef59
Make including followers in response a parameter 2024-10-07 16:23:24 +02:00
Hazel K a790fef261 prevent deletion or suspension of system accounts 2024-10-07 10:02:55 -04:00
PrivateGER a292e46f84 Pack other side of relation into response as well 2024-10-07 11:56:18 +02:00
PrivateGER fadae347ff Merge branch 'develop' of https://activitypub.software/TransFem-org/Sharkey into feat/instance-admin-ui 2024-10-06 23:13:10 +02:00
Marie 28bfd87537 merge: Add option to reject reports from an instance (Resolves #579, #715, #716) (!662)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/662

Closes #579, #715, and #716

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-06 19:39:38 +00:00
Hazelnoot 42dbe999e1 merge: Change the recent external url warning popup to the one from Cherrypick/MisskeyIO (!648)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/648

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
2024-10-06 17:56:36 +00:00
Hazel K 047563bdde Merge branch 'develop' into hazelnoot/579-reject-reports
# Conflicts:
#	packages/frontend/src/pages/instance-info.vue
2024-10-06 12:26:25 -04:00