Commit graph

5532 commits

Author SHA1 Message Date
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
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
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
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
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
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
dakkar
c42d61f69b put back button to delete all files for a user - fixes #535 2024-05-24 20:47:10 +00:00
dakkar
dbe1c5d055 merge: allow custom oneko image via themes - fixes #472 (!478)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/478

Closes #472

Approved-by: Luna <her@mint.lgbt>
Approved-by: Leah <kevinlukej@gmail.com>
2024-05-24 09:50:42 +00:00
Amelia Yukii
a9b1affdf0 merge: more timeline filters - #228 (!455)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/455

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-05-23 21:56:28 +00:00
dakkar
d27ce442ea more timeline filters - #228 2024-05-23 21:56:28 +00:00
Leah
f9a7cd0daa Ported firefish crop and fade mfm 2024-05-23 21:40:25 +00:00
Leah
4c4b431248 Ported cutiekeys followmouse mfm 2024-05-23 18:08:31 +00:00
dakkar
453a023cb9 correcty load/save withBots - fixes #528
there is no `tlWithBots` setting, it's inside `tl.filter` and we need
more complicated code to set it
2024-05-18 17:19:17 +01:00
dakkar
c05cc63e24 look inside url when checking activity origin - #512
The previous assertion that:

> if it's a complicated thing and the `activity.id` doesn't match, I
> think we're fine rejecting the activity

was wrong: at least peertube sends activities that have `url` as an
array of objects.

Notice that this does *not*, in fact, fix #512: the peertube activity
does not contain its short URL (`https://example.com/w/someid`), so
there's no way to confirm that it is the activity we requested.
2024-05-18 16:48:10 +01:00
dakkar
aa7271469e fix types in config.ts
my recent changes to allow overrides from the environment had bad types
2024-05-18 15:56:21 +01:00
dakkar
95ec40d3c8 merge: allow overriding all string config values via env - fixes #465 (!476)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/476

Closes #465

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Luna <her@mint.lgbt>
2024-05-17 16:46:02 +00:00
Sugar
194d8a5527 feat: send edit events to servers that interacted
a server replied to, renoted or reacted to a note knows about a note,
and as such it should get notified about it being edited.

this matches similar logic in mastodon.
2024-05-11 09:44:03 +02:00
dakkar
a676b0ee61 paginate in offset mode when querying emoji - fixes #490
since the backend sorts emojis by name length when a query is present,
the normal pagination with `sinceId` / `untilId` would not work
reliably

`offsetMode` is better in this case, although it will produce
non-stable results if custom emojis that match the query are added or
removed while we paginate
2024-05-09 21:02:37 +01:00
dakkar
9d91196344 allow offset in admin/emoji/list - #490
also, use `skip` + `take` instead of `limit` (the TypeORM docs say so
https://github.com/typeorm/typeorm/blob/master/docs/select-query-builder.md#adding-limit-expression )
2024-05-09 21:02:34 +01:00
dakkar
3f73251df5 allow computed offsetMode in MkPagination - #490 2024-05-09 21:01:33 +01:00
dakkar
f1d96b8ae8 merge: fix: incorrect type for quote property (!480)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/480

Closes #401

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Tess K <me@thvxl.se>
2024-05-09 09:05:16 +00:00
dakkar
f38e55d9de merge: rework pagination - probably fixes #491 (!495)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/495

Closes #491

Approved-by: Ember <acomputerdog@gmail.com>
Approved-by: Marie <marie@kaifa.ch>
2024-05-09 08:15:16 +00:00
dakkar
d40500d399 merge: fix: update reaction icons in tutorial to match sharkey icons (!499)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/499

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Tess K <me@thvxl.se>
Approved-by: Marie <marie@kaifa.ch>
2024-05-09 08:02:59 +00:00
dakkar
01256af028 merge: Rework cache clearing to be fault tolerant (!497)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/497

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
2024-05-09 08:01:18 +00:00
dakkar
84a98e41b6 merge: make eslint happy (!496)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/496

Approved-by: Tess K <me@thvxl.se>
Approved-by: Marie <marie@kaifa.ch>
2024-05-09 08:00:54 +00:00
dakkar
89f412c696 merge: Send default reactions as Like activities to Iceshrimp.NET instances (!505)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/505

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
2024-05-09 07:59:46 +00:00
dakkar
3ab7f3bd8a merge: fix #507: retain custom emoji aspect ratio in admin panel (!510)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/510

Closes #507

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
2024-05-09 07:59:35 +00:00
dakkar
37989ec0e9 merge: fix: #505 and #516 inconsistent event propagation causes issues in notes and emoji picker when clicking on emojis (!511)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/511

Closes #505 and #516

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
2024-05-09 07:59:23 +00:00
tess
ab074db0c1 fix: retain custom emoji aspect ratio in admin panel for remote emojis 2024-05-08 08:23:32 +02:00
Ember
ac9e4733fd merge: laxer HTML sanitisation for admin-controlled text - fixes #447 (!454)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/454

Closes #447

Approved-by: Ember <acomputerdog@gmail.com>
Approved-by: Marie <marie@kaifa.ch>
2024-05-07 20:19:53 +00:00
dakkar
2c40dd31f3 laxer HTML sanitisation for admin-controlled text - fixes #447 2024-05-07 20:19:52 +00:00
Ember
ed91663672 merge: don't count "system" local accounts in user chart - fixes #451 (!500)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/500

Closes #451

Approved-by: Ember <acomputerdog@gmail.com>
Approved-by: Marie <marie@kaifa.ch>
2024-05-07 20:17:54 +00:00
dakkar
89f4f0e5f4 don't count "system" local accounts in user chart - fixes #451 2024-05-07 20:17:53 +00:00
Ember
58ff225c4e merge: really edit notes in more cases - fixes #424 (!504)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/504

Closes #424

Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Ember <acomputerdog@gmail.com>
2024-05-07 20:16:39 +00:00
dakkar
eab690a5e3 really edit notes in more cases - fixes #424 2024-05-07 20:16:38 +00:00
tess
19cba1a12a fix: only stop event propagation in MkEmoji and MkCustomEmoji when menu prop is passed 2024-05-06 23:59:42 +02:00