amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,702 Commits 3 Branches 0 Tags 162 MiB
652a8c5110
Commit Graph

2640 Commits

Author SHA1 Message Date
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
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
d798809875 upd: add back in timestamps on src 2024-08-06 15:54:18 +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
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
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
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
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
dakkar
16601fa766 allow overriding more config settings via env vars 
`id` in particular is necessary if one wants to do a working basic
configuration without a config file at all, thanks to @4censord for
making me notice
 2024-08-03 14:56:29 +01:00
Hazel K
114b698034 encapsulate MemoryKVCache<T> 2024-08-03 09:18:44 -04:00
dakkar
5496aa27db merge: error out when we can't start workers - fixes #586 (!578) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/578

Closes #586

Approved-by: Tess K <me@thvxl.se>
Approved-by: Marie <marie@kaifa.ch>
 2024-08-02 18:41:57 +00:00
dakkar
41e32e792a merge: pass redis config as-is to postgres cache (!577) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/577

Approved-by: Tess K <me@thvxl.se>
Approved-by: Marie <marie@kaifa.ch>
 2024-08-02 18:41:29 +00:00
dakkar
d9c23e92fd merge: fix: pass current user into InstanceEntityService.packMany (!582) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/582

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
 2024-08-02 18:40:53 +00:00
dakkar
72758a2dbf fix mfm→sfm 2024-08-02 13:47:49 +01:00
dakkar
ef99b1ca07 put back dependency I had deleted by accident 2024-08-02 13:47:40 +01:00
dakkar
98c7b95ecc copy from global-timeline to bubble-timeline 2024-08-02 13:05:53 +01:00
dakkar
b678580453 copy changes from NoteCreateService to NoteEditService 2024-08-02 12:32:28 +01:00
dakkar
cfa9b852df Merge remote-tracking branch 'misskey/master' into feature/misskey-2024.07 2024-08-02 12:25:58 +01:00
Hazel K
858ba18876 fix: pass current user into InstanceEntityService.packMany 2024-08-01 08:24:50 -04:00
anatawa12
3137c104f2
test: フォローしていないユーザーからの自分への返信が含まれることを確認するテストを追加 (#14333) 2024-07-31 07:23:38 +09:00
anatawa12
5c42a0e439
feat: media silence (#13842) 
* feat: media silence

* fix: lint

* feat: deny creating custom emoji reaction and using custom emoji from media silenced hosts

* chore: メディアサイレンスの説明にカスタム絵文字の話を追加

* Update locales/ja-JP.yml

Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>

* chore: update index.d.ts

* docs(changelog): update changelog

---------

Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
 2024-07-30 19:47:45 +09:00
anatawa12
8f40f932e4
自分のフォロワー限定投稿に対するリプライがホームタイムラインで見えないことが有る問題を修正 (#13835) 
* fix: reply to my follower notes are not shown on the home timeline

* fix: reply to follower note by non-following is on social timeline

* docs: changelog

* test: add endpoint test for changes

* test(e2e): 自分のfollowers投稿に対するリプライが流れる

* test(e2e/streaming): 自分のfollowers投稿に対するリプライが流れる

* test(e2e/streaming): フォローしていないユーザによるフォロワー限定投稿に対するリプライがソーシャルタイムラインで表示されることがある問題

* test(e2e/timelines): try fixing typecheck error

---------

Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
 2024-07-30 19:44:08 +09:00
Sayamame-beans
d0b7c74fd1
検索からハッシュタグのページが開けるように、users/searchに@から始まる文字列が与えられた際の処理を修正 等 (#13858) 
* enhance(frontend): 検索からハッシュタグのページを開けるように

* fix(frontend): 照会で入力が`#`のみの場合は`/tags/`に遷移しないように

* docs(changelog): update changelog

* enhance(frontend): ユーザー検索からもハッシュタグのページを開けるように

* docs(changelog): update changelog

* enhance(frontend): 検索範囲等が指定されている時は照会/ハッシュタグページを開かないように

* enhance(frontend): 検索内容に空白が含まれている場合は照会/ハッシュタグページを開かないように

* docs(changelog): update changelog

* Revert "enhance(frontend): 検索範囲等が指定されている時は照会/ハッシュタグページを開かないように"

This reverts commit f84eecea964b90e9b115eac19ed6f19a603a6bbc.

* enhance(frontend): 検索から照会/ハッシュタグページを開くかどうか確認するように

* docs(changelog): update changelog

* chore: fix lint

* docs(changelog): update changelog insertion position

* enhance(frontend): 検索から`@user@host`の形式で照会出来るように

* fix(frontend): 照会で入力が`@`のみの場合に`/@`に遷移しないように

* fix(backend): `users/search`において`@`から始まるqueryに対する処理が正しくなかった問題を修正

* docs(changelog): update changelog

* chore(backend): fix lint error

* fix(backend): more improvements for users/search when query startswith `@`

* chore: unify common conditions

* docs(changelog): refine changelog

* chore(backend): fix lint error

* MkInputをpreventに対応させ、enterの意図せぬ伝搬を防ぐ

* chore(frontend/search.user): use .prevent to prevent the propagation of enter instead of setTimeout

---------

Co-authored-by: samunohito <46447427+samunohito@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Co-authored-by: taichanne30 <dev@taichan.site>
 2024-07-30 19:18:43 +09:00