heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity
27703 commits 2 branches 0 tags 162 MiB
Commit graph

27703 commits

This branch
This branch
All branches
Author SHA1 Message Date
dakkar
ee2bc0d370 move lines to same place as upstream 2024-08-14 11:30:43 +01:00
dakkar
652a8c5110 fix spacing 2024-08-06 20:33:25 +01:00
dakkar
ae12e216ab remove useless semicolon 2024-08-06 20:32:34 +01:00
dakkar
87deb87456 put back bits that were lost in the merge 2024-08-06 20:32:03 +01:00
dakkar
51b031d3fc avoid double spaces 2024-08-06 20:30:14 +01:00
dakkar
8a37ed668e fix variable name is MkMediaList 2024-08-06 20:28:50 +01:00
dakkar
4c409dd6c6 fix comparison (thanks linter) 2024-08-06 19:51:11 +01:00
dakkar
e9255d45f8 fix spacing (thanks linter) 2024-08-06 19:23:03 +01:00
dakkar
65ae788d90 update our icons to the new custom font 
mostly, `ph-bold` was replacing the font-family, so we're now using
`sk-icons-lg`
 2024-08-06 18:05:15 +01:00
dakkar
94dceb9e15 Merge branch 'develop' into feature/misskey-2024.07 2024-08-06 17:51:51 +01:00
dakkar
4e7df7a5f2 merge: Remove infinite caches to prevent memory leak (!587) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/587

Closes #600 and #601

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
 2024-08-06 16:51:18 +00:00
dakkar
790c75b1a3 merge: Add icon for moving files/folders - for !583 (!586) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/586

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: fEmber <acomputerdog@gmail.com>
 2024-08-06 16:33:17 +00:00
Hazel K
9930c64f2d Fix timeout comments 
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
 2024-08-06 12:13:17 -04:00
Marie
e82cc99528 chore: remove space 2024-08-06 15:59:24 +00:00
Marie
1033436349 chore: add note about updating css and font files 2024-08-06 15:58:56 +00:00
Marie
d798809875 upd: add back in timestamps on src 2024-08-06 15:54:18 +00:00
Marie
45611e504c chore: fix positioning in contributing 2024-08-06 15:43:15 +00:00
Marie
6d7cebb61c chore: add icon font to contributing 2024-08-06 15:39:19 +00:00
Marie
9d4d2a1fad upd: align font with new repo 2024-08-06 15:35:52 +00:00
dakkar
2f97b5976f merge: use XMLSerializer for toMastoApiHtml - fixes #556 (!591) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/591

Closes #556

Approved-by: Marie <marie@kaifa.ch>
Approved-by: fEmber <acomputerdog@gmail.com>
 2024-08-06 14:09:35 +00:00
dakkar
f85e8a4278 appease the linter 2024-08-06 11:42:03 +01:00
dakkar
9de422280f merge: feat: implement attachLdSignatureForRelays to control signing of Relayed activities (#599) (!579) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/579

Closes #599

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
 2024-08-06 10:40:14 +00:00
dakkar
d899eb30b1 merge: delete old emoji file when replaced - fixes #608 (!589) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/589

Closes #608

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <marie@kaifa.ch>
 2024-08-06 10:39:41 +00:00
dakkar
5c3a4925d6 merge: Improve the check_connect script (!588) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/588

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
 2024-08-06 10:39:27 +00:00
dakkar
cb5de3fbfc fix type for env variable 2024-08-06 11:24:43 +01:00
dakkar
151470d882 make "media silenced" work like "silenced" 
that is, silencing `foo.com` also silences `sub.foo.com`
 2024-08-06 11:14:24 +01:00
dakkar
02748edd17 remove spurious .then() 2024-08-06 11:03:09 +01:00
dakkar
6379deb5a7 fail AbuseReportService.resolve harder without remote users 
as @fEmber noticed, if `findOneByOrFail` throws, we would have marked
the report as resolved, without logging that

this way, the whole operation fails (the frontend should not send us
ids of users that can't be resolved!)
 2024-08-06 11:01:18 +01:00
dakkar
dadf6496d1 remove double spaces from translations 2024-08-06 10:39:43 +01:00
dakkar
34c1e9ea2b Merge branch 'develop' into feature/misskey-2024.07 
fixing conflicts in `package.json`
 2024-08-06 10:35:14 +01:00
dakkar
712af44de4 merge: don't send real-time updates of replies to blocked users #457 #573 (!566) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/566

Approved-by: Tess K <me@thvxl.se>
Approved-by: fEmber <acomputerdog@gmail.com>
 2024-08-06 09:26:40 +00:00
dakkar
f936db0599 merge: use correct user for preview/link of collapsed parent - fixes #575 (!581) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/581

Closes #575

Approved-by: Marie <marie@kaifa.ch>
Approved-by: fEmber <acomputerdog@gmail.com>
 2024-08-06 09:23:30 +00:00
dakkar
76a966041f merge: Fall back to port 3000 if none is specified (!584) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/584

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: fEmber <acomputerdog@gmail.com>
 2024-08-06 09:23:08 +00:00
dakkar
b93494d746 merge: make sure that sensitive is a boolean - fixes #596 (!590) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/590

Closes #596

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <marie@kaifa.ch>
 2024-08-06 09:20:53 +00:00
dakkar
61c13241ba use XMLSerializer for toMastoApiHtml - fixes #556 
the `inline` bit is not pretty, but does the job
 2024-08-06 10:13:53 +01:00
4censord
0386e52d6f
Impove the check_connect script 2024-08-06 00:35:35 +02:00
dakkar
58d329e3bd make sure that sensitive is a boolean - fixes #596 
Some remote instances may send garbage. If the `sensitive` value
passed to `driveService.uploadFromUrl` is not a boolean, eventually
we'll get an exception from the database complaining about that. This
change avoids that problem.
 2024-08-05 10:12:27 +01:00
dakkar
1e86cba7dc delete old emoji file when replaced - fixes #608 
it's the same code that 5f7fc54ee9 added
to `delete` and `deleteBulk`, with the extra check that we're not
deleting the same file we're setting
 2024-08-05 09:27:06 +01:00
dakkar
265afa9097 merge: allow overriding more config settings via env vars (!585) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/585

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <marie@kaifa.ch>
 2024-08-05 08:01:20 +00:00
Hazel K
ba09338268 optimize cache GC by stopping early 2024-08-04 09:58:01 -04:00
Marie
4ed4547f4a upd: add icon for moving files/folders 2024-08-03 22:45:49 +00:00
Hazel K
672f1ea684 tune cache lifetimes 2024-08-03 14:49:06 -04:00
Hazel K
3688f1dadf implement pull-through caching 2024-08-03 14:09:08 -04:00
Hazel K
613706f6b8 add missing awaits to internally synchronize caches 2024-08-03 14:02:18 -04:00
Hazel K
b1f1e3eb0e encapsulate other caches 2024-08-03 13:54:59 -04:00
Hazel K
bc236a4bd2 remove infinity caches 2024-08-03 13:42:23 -04:00
dakkar
f0dd0b8993 revert AiScript hack for plugins 
aiscript 0.19 should have fixed the problem, and no longer `abort`
when an error gets handled (or, in this case, logged)
 2024-08-03 18:04:06 +01:00
4censord
e1b0faa18f
Fall back to port 3000 if none is specified 
Originally, because `parseInt` can return `NaN`, sharkey would happily
try to listen on port `NaN`.
 2024-08-03 17:43:02 +02:00
4censord
12aeaa5f95
Complain if no config-files are loaded 2024-08-03 17:42:59 +02:00
dakkar
955fda6e1c also allow db.disableCache 2024-08-03 15:29:09 +01:00