Commit Graph

5900 Commits

Author SHA1 Message Date
Sugar
460e7f05ab correct collapsed in reply to line alignment with small screen sizes 2024-06-11 17:24:45 +02:00
Sugar
9ce2c8c081 include usernames in collapsed notes replied to 2024-06-11 17:19:24 +02:00
dakkar
fe0d95b277 remove duplicate settings switch 2024-06-11 15:48:25 +01:00
Sugar
c808147292 replace reply with inReplyTo in in-reply-to collapse code 2024-06-11 16:28:09 +02:00
Sugar
c9d0b81555 feat: add an option to collapse replies 2024-06-11 15:25:43 +02:00
Marie
8f3549b494 merge: fix #520, render usernames containing custom emoji in welcome toast properly (!541)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/541

Closes #520

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
2024-06-09 21:02:58 +00:00
dakkar
6060fdcae7 merge: celebrate our testers - fixes #552 (!543)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/543

Closes #552

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Tess K <me@thvxl.se>
2024-06-09 15:23:32 +00:00
tess
e7b87c0269 Pass renderMfm as true to wrap welcome back toast in Mfm 2024-06-09 16:21:12 +02:00
tess
ce197bc2e6 add ability to conditionally wrap toast message in Mfm tag 2024-06-09 16:19:56 +02:00
Tess K
df333d1855 merge: Add tess to contributor list (!542)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/542

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
2024-06-09 12:55:42 +00:00
dakkar
2768245bc7 fix link to "all contributors" graphs 2024-06-09 10:11:54 +01:00
dakkar
450b2abdae add section for testers in about page 2024-06-09 10:11:40 +01:00
dakkar
0b39869bdc merge: better block display for <bdi> elements - fixes #550 (!538)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/538

Closes #550

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Tess K <me@thvxl.se>
2024-06-09 08:50:22 +00:00
tess
5bbdd07c95 Add tess to contributor list 2024-06-09 03:46:08 +02:00
tess
c8535b5d26 MkToast Mfm plain prop should be static 2024-06-09 03:34:11 +02:00
tess
3bfff3509c fix custom emoji in welcome message 2024-06-09 03:20:32 +02:00
Marie
4a9260a432 upd: seperate H2/H3 into own case 2024-06-08 18:53:42 +00:00
Marie
0c3690a8ba upd: bold some Header tags 2024-06-08 18:00:29 +00:00
dakkar
e7fcdd47e5 another semicolon 2024-06-08 17:34:48 +01:00
dakkar
cc6b9f4cb0 spaces 2024-06-08 17:34:14 +01:00
dakkar
f64e6e8646 semicolons 2024-06-08 17:33:15 +01:00
dakkar
c0f9e44712 fix accesses to canRenote 2024-06-08 17:30:56 +01:00
dakkar
11af7e6587 fix indents 2024-06-08 16:57:17 +01:00
dakkar
5dc8c2827c Merge branch 'develop' into future-2024-05-31 2024-06-08 16:45:53 +01:00
Porlam Nicla
c39de769ca 配信停止したインスタンス一覧が見れなくなる問題を修正 (#13945)
* 配信停止したインスタンス一覧が見れなくなる問題を修正

* Update CHANGELOG.md
2024-06-07 22:11:13 +01:00
dakkar
079abfd713 rate limit note/reply/boost creation more tightly
5/minute is the same as 300/hour on average, and still high enough
that it shouldn't be a problem for most people
2024-06-07 15:10:16 +01:00
dakkar
388926775e I meant finally, not then, thanks fEmber 2024-06-07 14:47:16 +01:00
dakkar
cb43994841 only allow a single boost via hotkey - fixes #467 #468
As usual, have to write the same thing four times ☹

The parentheses around `q` tell the hotkey/keymap code to ignore
auto-repeat events (which works fine in Chrome but not in Firefox, I
reported the bug https://bugzilla.mozilla.org/show_bug.cgi?id=1900397
)

In addition, I've added a guard variable that is true while calling
the backend to boost/renote, and false otherwise. This way, even in
Firefox we don't spam-boost. Unboosting is still *only with the
mouse*, I have not added that functionality.
2024-06-07 11:40:44 +01:00
dakkar
43c0ffe7f8 better block display for <bdi> elements
We use MfM in all sorts of places, and only some of them are actual
blocks. We can now tell the `Mfm` component to make the top-level
`<bdi>` a block when we need to (mostly note bodies, user
descriptions, announcements) and leave it inline in all other places.

This should still rendener inline rtl content embedded in ltr text in
a sensible way, while providing right-alignment for fully rtl blocks.
2024-06-07 11:18:25 +01:00
Marie
b2088e60b7 merge: use the current resolver for quotes - #524 (!536)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/536

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
2024-06-03 16:54:51 +00:00
Amelia Yukii
23b1c29a0b merge: allow setting separate timeout / max size for imports - fixes #479 (!519)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/519

Closes #479

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-06-03 16:29:19 +00:00
dakkar
082e1d1afb allow setting separate timeout / max size for imports - fixes #479 2024-06-03 16:29:19 +00:00
Amelia Yukii
9520a14cb9 merge: avoid await at top-level in setup - fixes frontend tests (!534)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/534

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-06-03 16:28:25 +00:00
dakkar
92cd771e0f avoid await at top-level in setup - fixes frontend tests 2024-06-03 16:28:25 +00:00
Marie
81ed739380 fix: button saying Misskey instead of Sharkey 2024-05-31 21:18:35 +00:00
dakkar
e818c56faa merge: Feature/favicon notification dot (!474)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/474

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Luna <her@mint.lgbt>
Approved-by: Marie <marie@kaifa.ch>
2024-05-31 19:03:32 +00:00
dakkar
928f65be72 merge: style: automatically detect RTL on all MFM content (!482)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/482

Closes #356

Approved-by: Tess K <me@thvxl.se>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-05-31 18:42:38 +00:00
Marie
886948769e merge: fix custom emoji pagination when searching - fixes #490 (!489)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/489

Closes #490

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <marie@kaifa.ch>
2024-05-31 18:39:01 +00:00
Marie
11bd8e9571 merge: escape \ character in sqlLikeEscape (!529)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/529

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
2024-05-31 18:38:04 +00:00
dakkar
3f76cfe9a6 Merge tag '2024.5.0' into future-2024-05-31 2024-05-31 19:34:56 +01:00
Marie
86ccbd9487 merge: Fix/fixing mastodon api search mfm (!532)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/532

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
2024-05-31 18:32:51 +00:00
dakkar
349856bbac fix more linting 2024-05-31 15:56:22 +01:00
dakkar
38ff7fa3e5 *probably* fix FederationChart re: suspended instances
this is a misskey bug, they'll probably fix it soon, hopefully the
same way
2024-05-31 13:31:49 +01:00
github-actions[bot]
6078081c33 [skip ci] Release: 2024.5.0 2024-05-31 12:24:53 +00:00
dakkar
8c301de790 lint frontend 2024-05-31 13:24:00 +01:00
github-actions[bot]
a59aa20be8 Bump version to 2024.5.0-rc.13 2024-05-31 12:18:52 +00:00
syuilo
61eec93f4e Revert "2024.5.0"
This reverts commit 27d1b7e615.
2024-05-31 21:16:35 +09:00
dakkar
43d15506aa add sentry options to env overrides 2024-05-31 13:10:02 +01:00
syuilo
27d1b7e615 2024.5.0 2024-05-31 21:09:19 +09:00
github-actions[bot]
316d192bc0 Bump version to 2024.5.0-rc.12 2024-05-31 12:05:47 +00:00
dakkar
e045652c80 lint config.ts 2024-05-31 13:00:59 +01:00
dakkar
1c2bb90ac5 fix types in my test 2024-05-31 12:59:32 +01:00
dakkar
bf710428eb various fixes after the merge 2024-05-31 12:55:53 +01:00
dakkar
f8c95ea86a rebuild misskey-js 2024-05-31 12:42:40 +01:00
dakkar
43bd8ace96 replace icons 2024-05-31 12:41:41 +01:00
dakkar
326b2c254a copy upstream NoteCreateService changes to NoteEditService 2024-05-31 12:32:31 +01:00
dakkar
3372e0ffe1 Merge remote-tracking branch 'misskey/release/2024.5.0' into future 2024-05-31 12:26:07 +01:00
github-actions[bot]
46164f879b Bump version to 2024.5.0-rc.11 2024-05-31 11:20:13 +00:00
github-actions[bot]
374c8791d7 Bump version to 2024.5.0-rc.10 2024-05-31 11:13:42 +00:00
syuilo
e8f523f00a
Merge branch 'develop' into release/2024.5.0 2024-05-31 20:11:55 +09:00
dakkar
7b630b48b5 Merge branch 'develop' into future 2024-05-31 11:43:09 +01:00
dakkar
0a9697b405 merge: correcty load/save withBots - fixes #528 (!522)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/522

Closes #528

Approved-by: Marie <marie@kaifa.ch>
Approved-by: fEmber <acomputerdog@gmail.com>
2024-05-31 10:38:27 +00:00
dakkar
11aac8253d merge: look inside url when checking activity origin - #512 (!521)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/521

Closes #512

Approved-by: Marie <marie@kaifa.ch>
Approved-by: fEmber <acomputerdog@gmail.com>
2024-05-31 10:37:54 +00:00
dakkar
ad8d916775 minimal fixes, thanks tests 2024-05-31 11:36:47 +01:00
dakkar
4f346ebe0c merge: fix types in config.ts (!520)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/520

Approved-by: Marie <marie@kaifa.ch>
Approved-by: fEmber <acomputerdog@gmail.com>
2024-05-31 10:36:20 +00:00
syuilo
030082f756 🎨 2024-05-31 19:35:27 +09:00
dakkar
f412a074ff misskey-js update after our changes 2024-05-31 11:25:58 +01:00
dakkar
4ddee7b01e Merge branch 'develop' into future 2024-05-31 11:24:00 +01:00
KevinWh0
1656c02536 renamed toMastoHtml to toMastoApiHtml to clear up what it does 2024-05-31 12:21:25 +02:00
KevinWh0
145c4ba132 fixed the search url 2024-05-31 12:19:18 +02:00
github-actions[bot]
dc55adbaf7 Bump version to 2024.5.0-rc.9 2024-05-31 07:06:41 +00:00
syuilo
90ba1ca1f9
Merge branch 'develop' into release/2024.5.0 2024-05-31 16:06:00 +09:00
zyoshoka
514a65e453
perf(backend): avoid N+1 selects from user table when packing many entities (#13911)
* perf(backend): avoid N+1 selects from `user` table when packing many entities

* perf(backend): use `packMany` instead of mapping to `pack`
2024-05-31 15:32:42 +09:00
syuilo
a3468fd05b
Merge branch 'develop' into release/2024.5.0 2024-05-31 14:59:32 +09:00
syuilo
97be1a53ad Update 1717117195275-inquiryUrl.js 2024-05-31 14:59:02 +09:00
github-actions[bot]
1e007b63aa Bump version to 2024.5.0-rc.8 2024-05-31 04:38:45 +00:00
syuilo
a0c596b030
Merge branch 'develop' into release/2024.5.0 2024-05-31 13:28:25 +09:00
syuilo
eaa85f5aa3 fix test 2024-05-31 13:28:11 +09:00
syuilo
dfeaa1145b
Merge branch 'develop' into release/2024.5.0 2024-05-31 13:19:49 +09:00
syuilo
5b8f8e7087 fix(backend): fix backward compatibility of antenna 2024-05-31 11:24:17 +09:00
syuilo
be11fd7508 enhance: サーバーのお問い合わせ先URLを設定できるように 2024-05-31 10:12:23 +09:00
syuilo
ac4a001e9f fix code style 2024-05-31 10:11:11 +09:00
Marie
9bde071f42 merge: feat: send edit events to servers that interacted (!515)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/515

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-05-30 19:16:10 +00:00
Amelia Yukii
55fc2879f3 merge: set the correct "marked an NSFW" when loading admin-user (!483)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/483

Approved-by: Marie <marie@kaifa.ch>
Approved-by: fEmber <acomputerdog@gmail.com>
2024-05-30 14:22:00 +00:00
dakkar
3050dcbef7 set the correct "marked an NSFW" when loading admin-user 2024-05-30 14:22:00 +00:00
Sugar
189c26aa25 escape \ character in sqlLikeEscape 2024-05-30 16:01:29 +02:00
fEmber
da764d3541 merge: fix: start only one instance of ChartManagementService scheduled job (!514)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/514

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
2024-05-30 13:18:44 +00:00
fEmber
2532fea702 fix: start only one instance of ChartManagementService scheduled job 2024-05-30 13:18:44 +00:00
fEmber
d0be6ca332 merge: fix: don't create duplicate workers when clustering is disabled (!508)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/508

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
2024-05-30 13:17:52 +00:00
fEmber
cebad801e2 fix: don't create duplicate workers when clustering is disabled 2024-05-30 13:17:51 +00:00
Marie
d7bd112b37 fix incorrect variable name 2024-05-30 13:03:54 +00:00
Marie
981975404d Fix Visiblity issue 2024-05-30 12:08:30 +00:00
dakkar
38d98e5048 nicer type for alwaysStrings, thanks Marie 2024-05-30 11:29:31 +01:00
dakkar
dc0bd3c2ee merge: feat: allow using wildcards in antenna (!114)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/114

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Leah <kevinlukej@gmail.com>
2024-05-30 09:14:21 +00:00
KanariKanaru
24d4124ffc
fix(frontend): ノートにテキストがなくてもファイルが5つ以上あるときは折りたたむように (#13907)
* fix: ノートにテキストがなくてもファイルが5つ以上あるときは折りたたむように

* 冗長な記述を修正

* Update CHANGELOG.md
2024-05-30 17:36:58 +09:00
zyoshoka
eaadd643eb
chore(misskey-js): fix repository and add license in package.json (#13902) 2024-05-29 20:57:48 +09:00
Kisaragi
cf670e8a3d
refactor(backend): avoid as any on CustomEmojiService.ts (#13903) 2024-05-29 07:12:50 +09:00
Kisaragi
e57ce4fa0f
chore(backend): rename local variable (#13904)
much -> matched
2024-05-29 07:12:20 +09:00
Kisaragi
44cafbb9f2
refactor: avoid as any[] on FetchInstanceMetadataService.ts (#13905)
* refactor: avoid `as any[]` on FetchInstanceMetadataService.ts

* apply suggestion

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-05-29 07:11:29 +09:00
github-actions[bot]
f75e46752e Bump version to 2024.5.0-rc.7 2024-05-28 09:18:21 +00:00