Commit graph

26803 commits

Author SHA1 Message Date
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
19bc4025ea merge: lint our MRs (!506)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/506

Approved-by: Tess K <me@thvxl.se>
Approved-by: Marie <marie@kaifa.ch>
2024-05-31 10:39:45 +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
dakkar
aed5f18319 merge: fix: fix typo in readme (!530)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/530

Approved-by: Marie <marie@kaifa.ch>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-05-31 10:19:00 +00:00
Max Walters
9f885ca567 fix typo in readme 2024-05-31 00:38:02 +00: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
Marie
f115c21494 merge: fix(i18n): adjust grammar in about_misskey (!523)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/523

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
Approved-by: Leah <kevinlukej@gmail.com>
2024-05-30 19:09:52 +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
Amelia Yukii
0bdfe63a02 merge: fix incorrect variable name (!528)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/528

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-05-30 13:03:55 +00:00
Marie
d7bd112b37 fix incorrect variable name 2024-05-30 13:03:54 +00:00
Amelia Yukii
5f4c7af4d1 merge: Fix Visiblity issue (!527)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/527

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-05-30 12:08:30 +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
Amelia Yukii
4893efae0f merge: put back button to delete all files for a user - fixes #535 (!526)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/526

Closes #535

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-05-24 20:47:10 +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
Amelia Yukii
47963f323b merge: Ported firefish crop and fade mfm (!525)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/525

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-05-23 21:40:27 +00:00
Leah
f9a7cd0daa Ported firefish crop and fade mfm 2024-05-23 21:40:25 +00:00
Amelia Yukii
3d0bf928a7 merge: Ported cutiekeys followmouse mfm (!524)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/524

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Luna <her@mint.lgbt>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-05-23 18:08:31 +00:00
Leah
4c4b431248 Ported cutiekeys followmouse mfm 2024-05-23 18:08:31 +00:00
Sebastian Di Luzio
eac9f38942 fix(i18n): adjust grammar in about_misskey 2024-05-20 11:10:45 +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
a9e4630cc4 merge: bump develop after 2024.3.3 (!512)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/512

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Tess K <me@thvxl.se>
2024-05-10 09:17:28 +00:00
dakkar
e47b5a8679 bump version for next devel 2024-05-09 21:33:55 +01:00
dakkar
95959b0d2b Merge remote-tracking branch 'sharkey/stable' into feature/next-release 2024-05-09 21:33:36 +01:00
dakkar
3d6eb18e2a merge: Release 2024.3.3 (!501)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/501

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
2024-05-09 20:28:58 +00:00
dakkar
c3cbde68d6 pin to node 20
node-gyp / re2 seems to fail on node 22
2024-05-09 19:20:49 +01:00
dakkar
23cbcbaa24 bump version to 2024.3.3 2024-05-09 14:14:15 +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
16c545aa1f merge: fix: update pl-PL translation for note from verb to noun (!498)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/498

Closes #503

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Tess K <me@thvxl.se>
2024-05-09 08:02:01 +00:00