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

26844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
dakkar
2d89b08a08 use the current resolver for quotes - #524 
this might solve the loop problem, if the protection already in place
for replies was enough
 2024-05-15 16:47:06 +01:00
dakkar
42d9da161b first basic protection - #524 2024-05-14 16:58:06 +01: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
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
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
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
KevinWh0
a058c855fc changed grabbing theme color for dot to match the other things in this project 2024-05-06 13:59:42 +02:00
KevinWh0
342eda431f fixing a buch of comments 2024-05-06 13:54:43 +02:00
Tess K
83df1c0128 merge: feat: check polls and media for muted keywords (!507) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/507

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Tess K <me@thvxl.se>
 2024-05-04 18:51:36 +00:00
Tess K
5e20de45d7 merge: Compact LD-signed activities against well-known context (!503) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/503

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Tess K <me@thvxl.se>
 2024-05-04 17:19:42 +00:00
tess
598ebdd44a fix: retain custom emoji aspect ratio in admin panel 2024-05-04 17:49:20 +02:00
Hazel Koehler
cf317da244 revert refactor and cleanup 2024-05-03 22:26:35 -04:00
Essem
2241c67486 merge: fix: Add unicode flag to custom emoji regexes (!509) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/509

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Tess K <me@thvxl.se>
 2024-05-03 21:22:50 +00:00
Essem
f843bf6c17
fix: Add unicode flag to custom emoji regexes 2024-05-03 11:48:00 -05:00
KevinWh0
0117f1896c potential firefox fix 2024-05-03 12:20:58 +02:00
KevinWh0
975b6b3dd0 fixed querySelector that would grab favicon 2024-05-03 12:15:47 +02:00
KevinWh0
47d1477ac4 did thread fixes 2024-05-03 11:27:41 +02:00
Hazel Koehler
26f8919432 feat: check polls and media for muted keywords 2024-05-02 20:31:34 -04:00
dakkar
d0a2708f91 merge: handle non-ASCII emoji names (!464) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/464

Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Ember <acomputerdog@gmail.com>
Approved-by: Marie <marie@kaifa.ch>
 2024-05-02 21:06:10 +00:00