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

2745 Commits

Author SHA1 Message Date
dakkar
8b8ee72a81 align NoteCreateService create & import 2024-08-30 13:23:55 +01:00
dakkar
0bcc739551 remove duplicate line 2024-08-30 12:15:52 +01:00
dakkar
907bf133cd update NoteCreateService "import" side 2024-08-30 12:09:57 +01:00
dakkar
6151099f5b Merge remote-tracking branch 'misskey/master' into feature/misskey-2024.8 2024-08-30 12:08:31 +01:00
dakkar
9cf40ef452 merge: thunk the min/max promises (!603) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/603

Approved-by: Marie <github@yuugi.dev>
Approved-by: fEmber <acomputerdog@gmail.com>
 2024-08-24 20:53:08 +00:00
dakkar
06da059dbf log deletion of user files from admin -- fixes #631 2024-08-24 20:53:58 +01:00
dakkar
17b6c1b371 tell the linter to shut up, this time 2024-08-22 13:55:22 +01:00
dakkar
1b5bedc1d0 thunk the min/max promises 
this prevents generating promises we don't use, which would get logged
by the node vm and spam the logs
 2024-08-19 20:38:43 +01:00
dakkar
c4e0bea931 don't return early -- should fix #626 
I have no clue why I wrote that code 😭
 2024-08-19 18:19:38 +01:00
dakkar
f5560783ea merge: misskey 2024.7 (!583) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/583

Approved-by: Marie <github@yuugi.dev>
Approved-by: Julia Johannesen <julia@insertdomain.name>
 2024-08-18 18:32:27 +00:00
dakkar
77144b058c make the cap of activeRateLimitRequests match the rate limit 
It's trivial to have more than 128 requests in flight: open a busy
timeline, scroll a bit down, wait for many notes to arrive, scroll to
the top. The frontend will send "subscribe to note" messages for each
new note that it accumulated, all at once. We don't want to shut down
the connection in those common cases!
 2024-08-18 17:57:51 +01:00
dakkar
caa0fecdc9 relax websocket rate limits 
* the frontend opens 2 websockets at startup (I'm not completely clear
  why), and that `minInterval:1sec` was breaking the second connection
* as the comment says, "catching up" generates many noteSubscribe
  messages
 2024-08-18 15:23:45 +01:00
Marie
38430f8ef3 merge: fix lints (!594) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/594

Approved-by: Marie <2-Marie@users.noreply.activitypub.software>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-08-18 13:11:27 +00:00
dakkar
a58df8ac7c Merge branch 'develop' into feature/misskey-2024.07 2024-08-18 13:13:23 +01:00
dakkar
d92402554b merge: Rate limiting for websockets (!598) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/598

Approved-by: Marie <2-Marie@users.noreply.activitypub.software>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-08-18 12:09:25 +00:00
Hazel K
9ce44b24b8
fix(backend): memory leak in memory caches (#14363) 
* encapsulate `MemoryKVCache<T>`

* remove infinity caches

* encapsulate other caches

* add missing awaits to internally synchronize caches

* implement pull-through caching

* tune cache lifetimes

* optimize cache GC by stopping early

* summarize changes in CHANGELOG.md

* Fix timeout comments

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>

* add comments about awaiting the redis write

---------

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
 2024-08-18 13:34:01 +09:00
Julia Johannesen
3dd993a76a
Add IP and user ID to connection close message 2024-08-17 14:27:43 -04:00
Julia Johannesen
c5f7dcbb7e
Come up with better limits 2024-08-17 14:17:58 -04:00
Julia Johannesen
aff57333d5
Add @types/proxy-addr 2024-08-17 13:12:16 -04:00
Julia Johannesen
9c1c1e9f09
Fix logging stuff 2024-08-17 13:08:46 -04:00
syuilo
76bbc10aa1 fix(backend): 無制限にストリーミングのチャンネルに接続できる問題を修正 2024-08-17 17:54:04 +01:00
Hazel K
5e352033c8 fix error spam from ServerStatsService when running on Windows 2024-08-17 10:00:27 -04:00
taichan
bf8c42eecd
Fix(beckend): html content-type detection on signedGet (#14424) 
* fix(backend): contenttype detection of html in signedGet

* code style

* fix by review
 2024-08-17 19:51:56 +09:00
かっこかり
129af06198
Update packages/backend/src/core/activitypub/ApRequestService.ts 2024-08-17 18:25:46 +09:00
taichan
9fbc1b7f7b
enhance(backend): headタグ内にrel=alternateの指定のあるlinkタグがある場合、記述されたURLを参照して照会できるように (#14371) 
* signedGet時にhttpかつalternate属性のlinkがある場合に一回だけfollowして照会する

* Fix: validation position

* Fix import

* Fix tagname

* Update CHANGELOG

* Fix code style

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-08-17 15:12:23 +09:00
zyoshoka
fd744f44c1
enhance(backend): ページ、ギャラリー、Playのモデレーション強化 (#13523) 
* enhance(backend): Page、ギャラリー、Playのモデレーション強化

* Update CHANGELOG.md

* fix: update misskey-js

* refactor(frontend): use `MkA`

* Update CHANGELOG.md

* fix(i18n): Page -> ページ
 2024-08-17 15:01:08 +09:00
かっこかり
06684fe49b
fix(backend): ベースロールのポリシー変更時モデレーションログが残るように (#14418) 
* fix(policies): ベースロールのポリシー変更時モデレーションログが残るように (MisskeyIO#700)

(cherry picked from commit 80389a914049f6f26237fde8da7d4e1bd41452fc)

* Update Changelog

---------

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
 2024-08-17 12:07:00 +09:00
syuilo
ef950a345b
suspend周りの改修 (#14409) 
* enhance(backend): 凍結されたアカウントのフォローリクエストを表示しないように

* Update CHANGELOG.md

* wip

* Update gen-spec.ts

* Update packages/backend/src/server/api/endpoints/admin/suspend-user.ts

Co-authored-by: Kisaragi <48310258+KisaragiEffective@users.noreply.github.com>

* owa-

* revert misskey-js related changes (#14414)

---------

Co-authored-by: Kisaragi <48310258+KisaragiEffective@users.noreply.github.com>
Co-authored-by: anatawa12 <anatawa12@icloud.com>
 2024-08-17 09:57:28 +09:00
syuilo
d3cdc08802 fix(backend): 無制限にストリーミングのチャンネルに接続できる問題を修正 2024-08-17 09:30:03 +09:00
Julia Johannesen
6d3f9503ed
Limit number of rate limit requests 2024-08-16 17:13:20 -04:00
dakkar
4cd44130e0 use the correct remote address 
we're doing the same thing that Fastify does in the non-streaming
ServerService
 2024-08-16 18:00:50 +01:00
かっこかり
a8810af8d9
fix(backend): リバーシの設定変更が反映されないのを修正 (#14404) 
* fix(backend): リバーシの設定変更が反映されないのを修正

* Update Changelog

* add bindthis
 2024-08-16 21:02:12 +09:00
かっこかり
b9097d968c fix(backend): getApTypeでエラーを投げないように (misskey #14361) 2024-08-16 12:38:18 +01:00
dakkar
311a31da58 rough rate limiting for websockets 2024-08-15 11:35:51 +01:00
syuilo
86dd4abadc Revert "enhance(backend): 凍結されたアカウントのフォローリクエストを表示しないように" 
This reverts commit cd210001e6.
 2024-08-14 20:29:06 +09:00
dakkar
99a0765eaf Merge branch 'develop' into feature/misskey-2024.07 2024-08-14 11:53:57 +01:00
syuilo
cd210001e6 enhance(backend): 凍結されたアカウントのフォローリクエストを表示しないように 2024-08-14 18:08:51 +09:00
timesince
41936c16c4
chore: fix some comments (#14394) 
Signed-off-by: timesince <seekseat@icloud.com>
 2024-08-12 14:03:16 +09:00
かっこかり
ab7bbd4e57
fix(backend): ダイレクト投稿をユーザーごとのチャートから除外 (#14350) 
* fix(chart): ダイレクト投稿をユーザーごとのチャートから除外 (MisskeyIO#679)

(cherry picked from commit 3db41c2d829ac18daabbdf52fe6235a874735b31)

* Update Changelog

---------

Co-authored-by: Yuuki <yukikum57@gmail.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-08-11 16:27:08 +09:00
かっこかり
93fc06d18b
fix(backend): getApTypeでエラーを投げないように (#14361) 
* fix(backend): getApTypeでエラーを投げないように

* Update Changelog

* Update Changelog

* Update type.ts

* add comment
 2024-08-11 16:25:57 +09:00
かっこかり
0aaf74ee22
fix(backend): InstanceEntityService.packMany に me が渡っていないのを修正 (#14360) 
* fix: pass current user into `InstanceEntityService.packMany`

(cherry picked from commit 858ba18876)

* Update Changelog

* origin

* Update Changelog

---------

Co-authored-by: Hazel K <acomputerdog@gmail.com>
 2024-08-11 11:28:07 +09:00
syuilo
37c9d91ba0 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2024-08-10 21:07:37 +09:00
syuilo
93c569c2cd refactor 2024-08-10 21:07:33 +09:00
かっこかり
cb10156f01
fix(frontend): iOSでacctなどがリンクとして誤検知されるのを抑制 (#14354) 
* fix(frontend): iosでの自動リンク化を抑制

* Update Changelog

* typo

* typo

* Update CHANGELOG.md
 2024-08-10 20:46:26 +09:00
zyoshoka
01a815f8a7
fix(general): some fixes and improvements of Play visibility (#14384) 
* fix(backend): missing `visibility` param in packing flash

* fix(frontend): use `visibility` value got from API

* enhance(frontend): change preview appearance of private Play

* Update CHANGELOG.md
 2024-08-10 09:34:49 +09:00
anatawa12
f50941389d
fix: readAllNotifications message not working (#14374) 
* refactor: add and use isJsonObject

* fix: readNotification message without body is not working

* docs(changelog): WSの`readAllNotifications` メッセージが `body` を持たない場合に動作しない問題

* Update CHANGELOG.md

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

---------

Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
 2024-08-09 16:04:41 +09:00
Daiki Mizukami
0d508db8a7
fix(backend): check visibility of following/followers of remote users / feat: moderators can see following/followers of all users (#14375) 
* fix(backend): check visibility of following/followers of remote users

Resolves https://github.com/misskey-dev/misskey/issues/13362.

* test(backend): add tests for visibility of following/followers of remote users

* docs(changelog): update CHANGELOG.md

* feat: moderators can see following/followers of all users

* docs(changelog): update CHANGELOG.md

* refactor(backend): minor refactoring

`createPerson`と`if`の条件を統一するとともに、異常系の
処理をearly returnに追い出すための変更。

* feat(backend): moderators can see following/followers count of all users

As per https://github.com/misskey-dev/misskey/pull/14375#issuecomment-2275044908.
 2024-08-09 12:10:51 +09:00
syuilo
820becb4e4
fix import 2024-08-09 10:51:18 +09:00
dakkar
01958da57f merge: fix webfinger for instances without a /host-meta (!593) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/593

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
 2024-08-06 20:49:11 +00:00
dakkar
9672f0b48e fix comparison (thanks linter) 2024-08-06 21:21:38 +01:00
dakkar
03d9288f44 fix spacing (thanks linter) 2024-08-06 21:21:29 +01:00
dakkar
f33aedfc9f merge: fix env variable type (!592) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/592

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Tess K <me@thvxl.se>
 2024-08-06 19:41:26 +00: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
8d29df64fa fix webfinger for instances without a /host-meta 
we were inconsistent with the colons, thanks to usedbunny for
noticing!
 2024-08-06 19:07:01 +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
5565985f84 appease the linter 2024-08-06 11:35:03 +01:00
dakkar
8afe46122d fix type for env variable 2024-08-06 11:32:26 +01: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