amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,449 Commits 3 Branches 0 Tags 162 MiB
af3bb7346e
Commit Graph

6865 Commits

Author SHA1 Message Date
dakkar
5af38db74b ignore stale users/show responses - fixes #741 
* person starts typing "abcd"
* request for user "abcd" is sent to server
* person continues typing "ef"
* request for user "abcdef" is sent to server
* response for user "abcdef" arrives, icon for user "abcdef" is shown
* response for user "abcd" arrives, icon for user "abcd" was shown –
  with this commit, this response is ignored instead

This is not just "showing the wrong avatar", btw: `MkSignin` uses the
`user` variable to decide whether to use 2FA, so having the wrong data
in user can make a login attempt fail.
 2024-10-12 18:16:06 +01:00
Marie
464fb22710 fix: accidental double backslash in DEFAULT_INFO_IMAGE_URL 2024-10-12 11:41:20 +00:00
dakkar
06bd29f209 try to avoid insert races in FederatedInstanceService 
Despite the cache, different processes can race to insert a row for
the same remote host.

This is particularly apparent in our unit tests, with
`test/unit/activitypub.ts` randomly failing.

This is a (somewhat clumsy) attempt at working around that race: trap
the "duplicate key value" error, and fetch the record.

Tests pass, with or without values in the cache.
 2024-10-12 10:57:57 +01:00
dakkar
98f1f30e72 fix "federation allowed" check in our code 2024-10-12 09:35:45 +01:00
Hazelnoot
a1375c8ab7 prevent usernames from overflowing the reactions hover-list 2024-10-12 00:29:40 -04:00
Marie
f68c0ac05d fix: broken error images 2024-10-11 22:06:37 +00:00
Hazelnoot
adbea34c11 generate missing type for UserLite.isSilenced 2024-10-11 14:10:13 -04:00
Hazelnoot
b27b398717 fix calculation of instance-info.isSuspended when instance is null 2024-10-11 14:07:31 -04:00
Hazelnoot
148bf98f21 Merge branch 'develop' into feature/2024.9.0 
# Conflicts:
#	packages/frontend/src/pages/instance-info.vue
 2024-10-11 14:06:21 -04:00
Marie
f3e6b43ea4 merge: New logo (!681) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/681

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-11 18:04:32 +00:00
Ruben
69483bb55b
new logo 2024-10-11 11:32:35 -05:00
Hazelnoot
7837852149 copy iAmModerator check to other instance-info controls 2024-10-11 11:25:10 -04:00
Hazelnoot
66a88c89b5 fix TypeScript and ESLint errors in instance-info.vue 2024-10-11 11:24:39 -04:00
Hazelnoot
a39f5c92b4 add missing rejectReports field to show-instance response 2024-10-11 10:21:32 -04:00
Hazelnoot
f496d4b88b re-implement suspension toggle to match other controls 2024-10-11 10:16:57 -04:00
Hazelnoot
87a12c020f convert "suspend deliver" button into a toggle 2024-10-11 09:52:59 -04:00
Hazelnoot
eb2ea85d40 merge: Minor improvements to relation badges on user profiles (!674) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/674

Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-11 13:28:55 +00:00
dakkar
fb9b6b1208 thank you linters 2024-10-11 12:20:08 +01:00
dakkar
3cec5f927e fix some linting in frontends 2024-10-11 11:24:49 +01:00
dakkar
2ecaa57cd5 fix nyaize test 2024-10-11 10:25:07 +01:00
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
Marie
fefdd1c1e8 merge: Fix: Finding emoji that include capital letters (!676) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/676

Closes #522

Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-10 20:11:03 +00:00
CenTdemeern1
5cebb4da54 fix: Finding emoji that include capital letters 
Custom emoji names and aliases that include capital letters can now be found in the emoji picker.
I kind of hate copy-pasting `.toLowerCase()` like this but apparently I'm not allowed to refactor Misskey code.
 2024-10-10 21:48:53 +02: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
Hazelnoot
a7076ed3e0 show "blocking you" indicator to instance staff only 2024-10-10 14:01:40 -04:00
Hazelnoot
523ad3d60c add "following" and "mutuals" relation badges 2024-10-10 14:01:40 -04:00
Hazelnoot
1b106d92e0 fix HTML semantics of relational info-badges 2024-10-10 14:01:40 -04:00
Hazelnoot
2be802131f merge: On user profiles, move pinned notes down with the other note tabs (resolves #555) (!651) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/651

Closes #555

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-10 16:33:39 +00:00
Marie
8e85487f64 merge: Add show bots toggle to hamburger menu (!664) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/664

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-10 16:31:20 +00:00
codingneko
1b278f5630 Remove show bots from client settings 2024-10-10 16:15:59 +00:00
dakkar
2da85e1163 (not related to the merge) fix instance name in severAllFollowRelations 2024-10-10 14:09:36 +01:00
dakkar
9ea618c4a5 fix some DI mistakes after the merge 2024-10-10 13:55:52 +01:00
dakkar
a2d47f686f replace icons in embeds 2024-10-10 13:50:20 +01:00
dakkar
7628fe9c46 show image comment as title in embeds 2024-10-10 13:48:40 +01:00
dakkar
e87b1d2b11 set isBlock for mfm render in embeds 2024-10-10 13:48:39 +01:00
dakkar
abb93f1d79 use sfm for embeds 2024-10-10 13:48:39 +01:00
dakkar
faa7b26344 maybe update embed mfm to our changes 2024-10-10 13:48:39 +01:00
Marie
7bd971c036
upd: add option to disable external url warning 2024-10-10 02:00:41 +02: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
afbed7f605 check redisForReactions at startup 2024-10-09 16:49:49 +01:00
dakkar
11e3c95026 replace isBlockedHost with isFederationAllowedHost 2024-10-09 16:39:24 +01:00
dakkar
60c6267d7a replace new icons with ours 2024-10-09 16:24:10 +01:00
dakkar
0a7075044a fix deleteAndEdit danger class 2024-10-09 16:10:03 +01:00
dakkar
10aab285d1 fix import 2024-10-09 16:07:37 +01:00
dakkar
50120371f7 fix import 2024-10-09 16:07:30 +01:00
dakkar
5856858f49 try to fix icons 2024-10-09 15:52:42 +01:00
dakkar
73abf3204e fix following-feed imports 2024-10-09 15:52:42 +01:00
dakkar
c5ff081557 fix MkUrlWarningDialog imports 2024-10-09 15:52:42 +01:00
dakkar
7519f98462 copy changes from MkNoteDetailed to SkNoteDetailed 2024-10-09 15:52:42 +01:00
dakkar
3fca2ba2f6 copy changes from MkNote to SkNote 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
b4c53687b4 oops, missed a closing tag 2024-10-09 15:27:05 +01:00
dakkar
f00576bce6 Merge remote-tracking branch 'misskey/master' into feature/2024.9.0 2024-10-09 15:17:22 +01:00
dakkar
2d6f1ed464 Merge branch 'merge-requests/668' into feature/2024.9.0 2024-10-09 10:41: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
piuvas
672c4f746c
inform users about sharkey specific localization 2024-10-08 00:33:16 -03:00
Hazel K
eb5a2b023e count CW for character limit 2024-10-07 19:25:03 -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
Hazel K
5f435f7250 restore sorting of pinned notes 2024-10-07 16:26:30 -04:00
Hazel K
c783ccf8cb sort pinned notes by date 2024-10-07 16:20:40 -04:00
Hazel K
35114df6d4 always default to latest notes instead of pins 2024-10-07 16:20:40 -04:00
Hazel K
3003affe6a fix extra gap above user notes 2024-10-07 16:20:40 -04:00
Hazel K
60ec877d3c on user profiles, move pinned notes down with the other notes 2024-10-07 16:20:40 -04:00
codingneko
3defc831c3 Fix formatting issues 2024-10-07 21:51:55 +02: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
Hazel K
9137ae1eef update autogen types 2024-10-07 11:21:52 -04:00
Hazel K
6cfadb1f61 add prefix to components 2024-10-07 11:21:37 -04:00
Hazel K
12de9fcb18 fix error display 2024-10-07 11:18:08 -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
adc7b91e3b fix UI hiding on admin-user.vue 2024-10-07 10:41:41 -04:00