Commit graph

7017 commits

Author SHA1 Message Date
dakkar
14e21d00b9 honour prefers-reduced-motion in embeds 2024-10-12 19:45:35 +01:00
dakkar
bf6ca8efdc also ignore stale *failed* responses - #741
since `misskeyApi` doesn't pass us the request, we close over a copy
of the username we requested, to make sure it still matches the
current username value
2024-10-12 18:23:20 +01:00
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
Hazel K
c77e90d98a update autogen types 2024-10-07 10:41:18 -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
bfd812720e Move styling to MkA elements 2024-10-07 12:46:28 +02:00
PrivateGER
80cbf00eac Add following and follower relationship view 2024-10-07 12:30:49 +02:00
PrivateGER
a292e46f84 Pack other side of relation into response as well 2024-10-07 11:56:18 +02:00
codingneko
347dc25bb8 Add show bots toggle 2024-10-07 03:12:29 +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
PrivateGER
f028795483 Move text into translation files 2024-10-06 20:31:41 +02: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
PrivateGER
941a200f35 Move button into button group 2024-10-06 19:53:10 +02:00
Marie
939f07fa55
upd: fix returns 2024-10-06 19:08:32 +02: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
Hazel K
60d0e3df7b preserve refresh button on mobile UI 2024-10-06 12:20:06 -04:00
Hazel K
01fb606fee fix weird left-alignment 2024-10-06 12:18:15 -04:00
Hazel K
d016ef7675 fix display size reactivity 2024-10-06 12:02:56 -04:00
Marie
6d7c7357ab merge: Warn when a domain is implicitly blocked because a base domain is blocked (resolves #564) (!661)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/661

Closes #564

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-06 15:54:46 +00:00
Hazelnoot
702bb9e5e0 merge: Set visitor dashboard's menu button z-index to 50 (!656)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/656

Approved-by: Marie <github@yuugi.dev>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-10-06 15:44:57 +00:00
Hazel K
4ca27692ac Merge branch 'develop' into hazelnoot/following-timeline 2024-10-06 11:16:43 -04:00
Hazel K
eec4a5082d fix OpenAPI definition for admin/meta.silencedHosts 2024-10-06 11:03:28 -04:00
Hazel K
605c22b55e add lockout for isMediaSilenced 2024-10-06 10:58:27 -04:00
Hazel K
008ac89672 fix translation string 2024-10-06 10:58:06 -04:00
Hazel K
9b11aead5a Merge branch 'develop' into hazelnoot/564-warn-when-base-domain-is-blocked 2024-10-06 10:48:20 -04:00
Hazel K
2bc9ce93b8 add missing import 2024-10-06 10:47:55 -04:00
Hazelnoot
ad4054f4e4 merge: Dont mark backfetched notes as silent (!655)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/655

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-10-06 13:56:44 +00:00
Marie
5f7730bd5c merge: Show yes/no options instead of ok/cancel when pasting long text (resolves #584) (!658)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/658

Closes #584

Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-10-06 10:51:22 +00:00
Marie
88f3f0c7eb merge: Indicate that a user is blocked / muted (resolves #557) (!659)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/659

Closes #557

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-06 10:48:48 +00:00
Marie
17617b6355 merge: Include Mastodon's "indexable" property on federated user profiles (resolves #713) (!660)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/660

Closes #713

Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-10-06 10:47:14 +00:00
Marie
f77eb34225 merge: Check if time-based achievements are unlocked before initializing them in main-boot (!657)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/657

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
2024-10-06 10:38:51 +00:00
Hazel K
7dd296017b fix modlog and translations for "Mark as NSFW" 2024-10-05 22:43:34 -04:00
Hazel K
61124699da fix lint errors 2024-10-05 22:21:00 -04:00
Hazel K
4da0d4be71 add option to reject reports from an instance 2024-10-05 22:01:55 -04:00
Hazel K
b23d650a15 warn when a domain is hard-blocked by a base domain 2024-10-05 20:42:31 -04:00
Hazel K
c315f9ccf5 include Mastodon's "indexable" property on federated user profiles 2024-10-05 19:48:35 -04:00
Hazel K
e622ab7cc7 indicate if a user is blocked / muted by the current user 2024-10-05 19:13:09 -04:00
Hazel K
c635992616 restore primary highlighting 2024-10-05 18:47:50 -04:00
Hazel K
ca98107eee respect following privacy settings 2024-10-05 18:25:13 -04:00
Evan Paterakis
c0702fd92f
Check if time-based achievements are unlocked before initializing them in main-boot 2024-10-05 22:58:43 +03:00
Evan Paterakis
5cd44433a0
Set visitor dashboard's menu button z-index to 50 2024-10-05 21:10:33 +03:00
PrivateGER
996d079476 Make remove-all-following remove follows in both directions 2024-10-05 19:59:50 +02:00
PrivateGER
1410f8d501 Experimental: dont mark backfetched notes as silent 2024-10-05 19:17:49 +02:00
PrivateGER
b3f925c426 Fix breaking follow relationships + add warning counts to dialogue 2024-10-05 19:06:05 +02:00
PrivateGER
99a0f756ff Expose instance-moderation endpoints in UI 2024-10-05 19:06:05 +02:00
Evan Paterakis
d633fe41bc
Don't depend on launcher.moe for status assets 2024-10-05 14:49:29 +03:00
Hazel K
95a0e814bc remove numeric separators 2024-10-04 09:15:12 -04:00
Hazel K
8da3b064b7 fix lint errors 2024-10-04 09:14:17 -04:00
Hazel K
fb7bc2ff01 preserve scroll positions when navigating 2024-10-04 08:58:32 -04:00
Hazel K
4273640530 fix extra scroll bar on mobile 2024-10-04 08:31:25 -04:00
Marie
4b31004c2b
upd: apply suggestions 2024-10-04 08:41:23 +02:00
Marie
323c075483
fix: add props before url 2024-10-04 02:34:34 +02:00
Marie
67d739cf71
upd: add script and check to MkUrl 2024-10-04 02:34:01 +02:00
Marie
d5b372f7a9
upd&merge: Merge Cherrypick/MisskeyIO's external url popup, delete old popup warning and modify script to handle undefined domains 2024-10-04 02:31:22 +02:00
Hazel K
3842a1ee8c fix length validation 2024-10-03 20:05:15 -04:00
Hazel K
063b2ff266 increase character limits and share between text and CW 2024-10-03 19:53:57 -04:00
Marie
ac1e5a0fb5 merge: Feat: Implement "Show Below Avatar" for Avatar Decorations (!645)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/645

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-03 20:40:34 +00:00
CenTdemeern1
9b130b3390 Update automatically generated API type definitions 2024-10-03 22:27:14 +02:00
Marie
aedc5fba81 merge: Disabling cat speak on the client (!609)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/609

Closes #604

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
2024-10-03 19:51:35 +00:00
Hazel K
bdd8e54be9 add missing copyright header 2024-10-03 15:19:05 -04:00
Hazel K
fddf078b52 improve per-user view on mobile 2024-10-03 15:16:07 -04:00
Marie
4d011e7fe0
chore: change typing, remove unusued imports 2024-10-03 20:02:55 +02:00
Hazel K
97a16c2ebc Merge branch 'develop' into hazelnoot/following-timeline 2024-10-03 14:00:06 -04:00
dakkar
ef002e00b6 cover case of author speaking as cat while not being cat
as @Marie pointed out, if you disable "is cat" without first disabling
"speak as cat", you don't want to speak as a cat!
2024-10-03 18:51:05 +01:00
dakkar
c2cc718f03 extract SponsorsService, use RedisKVCache
Please someone add types…
2024-10-03 18:48:11 +01:00
Marie
f6e0a04053 merge: maybe fix #510 - try to not edit visibility (!631)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/631

Closes #510

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
2024-10-03 17:45:26 +00:00
Marie
0f71dc6a07 merge: fix #332 - classic view navbar now respects "side (icon only)" (!630)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/630

Closes #332

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
2024-10-03 17:39:32 +00:00
Marie
66ddf965b5 merge: alert when searching notes from widget, and search is disabled - fixes #275 (!629)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/629

Closes #275

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
2024-10-03 17:32:20 +00:00
CenTdemeern1
cb264dae75 Use negative z-index to position decorations behind the avatar
Co-authored-by: dakkar <dakkar@thenautilus.net>
2024-10-03 19:12:10 +02:00
Hazel K
d82c0ddba9 fix "fetch user info during animation sync" 2024-10-03 12:03:21 -04:00
dakkar
fa71e54812 backup/restore disableCatSpeak 2024-10-03 16:59:08 +01:00
dakkar
491a499c58 store disableCatSpeak per account 2024-10-03 16:59:08 +01:00
Leah
49eb673c40 fix nyaize line 2024-10-03 16:59:08 +01:00
Leah
d55c86548d You can now disable cat speak in settings (client side) 2024-10-03 16:58:49 +01:00
dakkar
bc8c6592ea merge: make MkAbuseReport more friendly for smaller screen sizes (!646)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/646

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: fEmber <acomputerdog@gmail.com>
2024-10-03 15:57:19 +00:00
fEmber
e2beec33f8 merge: Minor issue fixes on the frontend (!625)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/625

Closes #659, #656, #651, #661, #632, and #710

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: fEmber <acomputerdog@gmail.com>
2024-10-03 15:52:00 +00:00
dakkar
8b7482f9c0 fix linting 2024-10-03 16:49:20 +01:00
blueb
04c729e504 fix: lint error in MkAbuseReport 2024-10-03 11:43:04 -04:00
Hazel K
21b935aa78 add toggle for "only with files" 2024-10-03 11:33:03 -04:00
Hazel K
2fbb697bf9 fetch user info during animation sync 2024-10-03 11:32:51 -04:00
Hazel K
9b572be0df use standard mute logic 2024-10-03 11:32:23 -04:00
CenTdemeern1
e43c58a955 Simplify the getDecorationZIndex function 2024-10-03 16:55:24 +02:00
blueb
5ef58c90ae replace brs with margin in MkAbuseReport 2024-10-03 09:12:25 -04:00
Hazel K
7ad36d33e9 add comments for mute logic 2024-10-03 00:49:47 -04:00
Hazel K
72d59b459a respect word mutes 2024-10-03 00:45:49 -04:00
Hazel K
fcb1218bbc add missing import 2024-10-03 00:43:45 -04:00
blueb
cbecaad5ae don't make MkAbuseReport harder to see if resolved 2024-10-03 00:06:20 -04:00
blueb
a32a8e0404 improvement: make MkAbuseReport more friendly for smaller screen sizes 2024-10-03 00:02:04 -04:00
Hazel K
64c737036f more lint fixes 2024-10-02 23:35:40 -04:00
Hazel K
40179a5591 lint fixes 2024-10-02 22:00:32 -04:00
Hazel K
5c87ed8488 add missing import 2024-10-02 20:32:54 -04:00
Hazel K
444b02ecdd reload user info when switching tabs 2024-10-02 20:26:22 -04:00
Hazel K
508e76b672 scroll both columns separately 2024-10-02 20:20:51 -04:00
CenTdemeern1
28aa99b273 Implement "Show Below Avatar" for Avatar Decorations 2024-10-02 23:49:30 +02:00
Hazel K
9ddab63a6a hide actions in mobile layout 2024-10-02 17:08:12 -04:00
Hazel K
484a39c658 Merge branch 'develop' into hazelnoot/following-timeline 2024-10-02 15:02:29 -04:00
Hazel K
19d7d44d0e use QueryService for blocks and mutes 2024-10-02 15:02:22 -04:00
Marie
007384c536
upd: fix random bg on post button in classic view
This does basically nothing in classic view besides breaking the custom wallpapers function
2024-10-02 20:40:58 +02:00
Marie
da7a5add33
upd: use @click.prevent instead of @click 2024-10-02 20:11:41 +02:00
dakkar
a357e9bca2 merge: fix exception when logging IP addresses (!644)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/644

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-02 17:59:03 +00:00
Marie
f08ef28d54
upd: fix broken returns and change if statement 2024-10-02 19:39:06 +02:00
Marie
9dd51bc9eb
upd: fix donationUrl check position 2024-10-02 19:31:46 +02:00
Marie
6b459be117
upd: move totalSponsors and donationUrl check 2024-10-02 19:27:26 +02:00
Hazel K
49e00c39cf Merge branch 'develop' into hazelnoot/following-timeline 2024-10-02 13:23:04 -04:00
Hazel K
d7f1e3f823 respect blocks and mutes for replies and renotes 2024-10-02 13:23:01 -04:00
Marie
34cbf55239
upd: apply suggestion 2024-10-02 19:16:54 +02:00
Marie
e2010caaff
Merge branch 'develop' into upd/instancesponsor 2024-10-02 18:57:49 +02:00
Marie
a87ced64ca
chore: lint 2024-10-02 18:51:07 +02:00
Hazel K
3defed6a19 fix exception when logging IP addresses 2024-10-02 12:47:01 -04:00
Hazel K
f43cb514b0 add menu to toggle user replies / boosts 2024-10-02 12:41:08 -04:00
Marie
0897458c72
Merge branch 'develop' into upd/instancesponsor 2024-10-02 18:39:45 +02:00
Hazel K
7603ecddac respect domain mutes 2024-10-02 12:28:41 -04:00
Marie
dcd6eee627
upd: cache instance sponsors 2024-10-02 18:27:11 +02:00
Marie
cc1017b2af
upd: add sponsors to instance information 2024-10-02 18:25:23 +02:00
Marie
3529042cb1
fix: api returns all backers on users so check if tier exists 2024-10-02 18:25:06 +02:00
Hazel K
7b2bc12ff9 Merge branch 'develop' into hazelnoot/following-timeline 2024-10-02 12:18:29 -04:00
Marie
2e036d14c5
fix: sidebarLogoUrl type 2024-10-02 17:53:44 +02:00
Hazel K
705ae79eb1 Merge branch 'develop' into hazelnoot/following-timeline 2024-10-02 11:45:09 -04:00
Hazel K
ef7cde6bc6 fixes from peer review 2024-10-02 11:38:21 -04:00
Marie
321e7daab5
chore: add comments 2024-10-02 17:26:23 +02:00
Marie
1e0d372eb5
upd(backend): add support for instance oc urls 2024-10-02 17:20:30 +02:00
dakkar
0bd6d48c7e merge: Customize Sidebar/Visitor/About separately from app icon. (!632)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/632

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-02 14:55:20 +00:00
dakkar
bf85d22a66 merge: Enhance: Add back buttons to Antenna and List Timelines, Tag Search, and Role Detail page. (!637)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/637

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-02 14:43:37 +00:00
dakkar
7bc0d4efff merge: Respect CWs in note previews (resolves #690) (!639)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/639

Closes #690

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2024-10-02 14:43:07 +00:00
Hazel K
c0583e5d5c don't leak boost / quote / reply contents when CW is in effect 2024-10-02 00:54:35 -04:00
Hazel K
19204851a0 Revert "respect CWs in note summaries"
This reverts commit cf49701c2a.
2024-10-02 00:49:26 -04:00
Hazel K
5a36c91bf1 Revert "avoid TS errors in get-note-summary"
This reverts commit 6785996960.
2024-10-02 00:49:25 -04:00
Hazel K
2cad08001a Revert "preserve non-text details in note summaries"
This reverts commit 23659ab013.
2024-10-02 00:49:25 -04:00
Hazel K
fa176ab543 Revert "expose prop to force-collapse MkNote / SkNote"
This reverts commit c5117552ca.
2024-10-02 00:48:23 -04:00
Hazel K
93a4008d42 disable the per-user feed on mobile 2024-10-02 00:45:41 -04:00
Hazel K
09b0de13bf fix comment typo 2024-10-02 00:44:26 -04:00
Hazel K
e031877a9e rename some CSS and JS names 2024-10-02 00:20:39 -04:00
Hazel K
eb2c2e261b remove extraneous "user preview" from feed entries 2024-10-02 00:15:52 -04:00
Hazel K
21277eab8f auto-select the first user in the following feed 2024-10-02 00:11:57 -04:00
Hazel K
2a11c1ecf6 emit "init" event from MkPagination 2024-10-02 00:09:32 -04:00
Hazel K
8f14fec45b fix error handling for following-feed 2024-10-02 00:09:10 -04:00
Hazel K
ce5c156e42 translate alt text for "no notes found" image 2024-10-02 00:08:52 -04:00
Hazel K
c8abbcaa33 fix link to post 2024-10-01 22:40:19 -04:00
Hazel K
779b5ef257 show two lines of text for feed entries 2024-10-01 22:27:08 -04:00
Hazel K
d2cf675569 show user info over user feed 2024-10-01 22:21:08 -04:00
Hazel K
cb10fe91bb preserve non-text details in note summaries 2024-10-01 18:28:25 -04:00
Hazel K
204e734192 include user feed 2024-10-01 18:28:04 -04:00
Hazel K
23659ab013 preserve non-text details in note summaries 2024-10-01 18:26:59 -04:00
Hazel K
94ce7272a7 avoid TS errors in get-note-summary 2024-10-01 14:47:06 -04:00
Hazel K
34aeeb0862 respect CWs in note summaries 2024-10-01 14:47:06 -04:00
Hazel K
6785996960 avoid TS errors in get-note-summary 2024-10-01 14:44:34 -04:00
Hazel K
cf49701c2a respect CWs in note summaries 2024-10-01 14:44:16 -04:00
Hazel K
ae3863bed0 use compact rendering for following feed 2024-10-01 14:37:09 -04:00