OpenSource/Sharkey
OpenSource/Sharkey
1
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey.git synced 2024-12-15 05:05:42 +01:00
Code Issues Projects Releases Packages Wiki Activity
27099 commits 56 branches 924 tags 271 MiB
Commit graph

2469 commits

Author SHA1 Message Date
かっこかり
7cf0c18f83
fix(backend): FileServerServiceでレンジリクエストの場合に適切なレスポンスコードが返らない問題を修正 (#13701) 
* return 206 for every ranged response - fixes #494

(cherry picked from commit 92eec2178f)

* detect size of remote files - fixes #494

without this, remote files are assumed to have size 0 (even if we just
downloaded them!) and the range-related code won't run

(cherry picked from commit 960f4fcff7)

---------

Co-authored-by: dakkar <dakkar@thenautilus.net>
 2024-04-14 10:22:03 +09:00
かっこかり
5c7c44c9eb
fix(backend): 登録にメール認証が必須になっている場合、登録されているメールアドレスを削除できないように (#13703) 
* fix(backend): 登録にメール認証が必須になっている場合、登録されているメールアドレスを削除できないように (MisskeyIO#606)

(cherry picked from commit 6b7df2bd10dc28b84f525a621b66fc49bf59cac6)

* Update Changelog

---------

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
 2024-04-13 20:38:25 +09:00
dakkar
e0afeff248 merge: hide images/videos in og cards, when under a CW - fixes #487 (!488) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/488

Closes #487

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-04-11 20:40:38 +00:00
Marie
cfc8081cec merge: bump tmp@0.2.3 - fixes #464 (!475) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/475

Closes #464

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Luna <her@mint.lgbt>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-04-11 18:00:40 +00:00
Marie
011ccd3a9a merge: bump devel version (!486) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/486

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-04-11 17:21:32 +00:00
dakkar
69697dd9f7 fix backend tests 2024-04-11 14:13:58 +01:00
dakkar
e4d7b2311f fix merge mistake 2024-04-11 14:03:56 +01:00
dakkar
a3b4ca782a Merge remote-tracking branch 'misskey/develop' into future-2024-04-10 2024-04-11 13:39:55 +01:00
dakkar
a58f4a6fed Merge branch 'develop' into future-2024-03-23-post 2024-04-11 13:22:57 +01:00
dakkar
960f4fcff7 detect size of remote files - fixes #494 
without this, remote files are assumed to have size 0 (even if we just
downloaded them!) and the range-related code won't run
 2024-04-09 16:21:30 +01:00
dakkar
92eec2178f return 206 for every ranged response - fixes #494 2024-04-09 15:42:29 +01:00
dakkar
56dca6dbf5 hide images/videos in og cards, when under a CW - fixes #487 2024-04-07 16:58:13 +01:00
Marie
d6c736f1a5 fix conflicts 2024-04-07 15:42:28 +00:00
dakkar
b6f41a28ed pull in sfm-js that supports non-ascii in emoji names 2024-04-07 16:37:31 +01:00
Marie
bb7b4a8ea4 merge: fix: send null for empty edited_at in mastodon api (!487) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/487

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
 2024-04-07 15:36:59 +00:00
dakkar
0690b9a429 merge: fix: load libopenmpt on demand (!469) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/469

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
 2024-04-07 14:56:16 +00:00
zyoshoka
959cc8ff37
refactor(general): use Date.now() instead of creating a new Date instance (#13671) 2024-04-07 21:14:13 +09:00
おさむのひと
efa42a1624
fix(backend): バックエンドのpnpm devによるビルド後にbuild-assetsを行うようにする (#13659) 
* moveto scripts

* add scripts/dev.mjs
 2024-04-04 22:25:28 +09:00
Sugar🍬🍭🏳️‍⚧
e779c1e667 fix: send null for empty edited_at in mastodon api 2024-04-04 10:43:28 +02:00
かっこかり
efafa02f68
enhance(backend): ビデオファイルにビデオトラックがあるかを確認するように (#13568) 
* enhance(backend): ビデオファイルにビデオトラックがあるかを確認するように

(cherry picked from commit 23d38a2d6492a2b24e9b2c031d66c3e8a5d382ef)

* Update Changelog

* Update Changelog

* Revert "Update Changelog"

This reverts commit 93fd996932b87ef550c38b48bd0678060f3ed1af.

* fix(test) ffmpegをインストールするように

* 入れる方間違えた

* fix test

* 拡張子変わらなかったのでそのまま行く

* ログを出力するように

* msg

* remove unused import

* add log

* attempt to fix test error

* Revert "attempt to fix test error"

This reverts commit d9d6524cadd655e6d8e9398b26fdfef332f30f4d.

* Update FileInfoService.ts

* oggも検査の対象にする
 2024-03-31 12:43:39 +09:00
dakkar
328546c4cd Merge branch 'develop' into release/2024-03-30 2024-03-30 11:08:26 +00:00
dakkar
074de82bf7 some validation fixes 2024-03-30 11:05:58 +00:00
おさむのひと
2a851437ff
fix: misskey-js、bubble-game、reversiのビルドをesbuildに統合する (#13600) 
* fix: ビルドが遅いパッケージのビルド速度を改善

* dependenciesの整理

* fix ci

* ビルド開始時に古いファイルを消す

* fix ci

* fix ci
 2024-03-30 15:28:19 +09:00
zyoshoka
b35ae97ba7
fix(backend): better notes/translate error response (#13631) 
* fix(backend): better `notes/translate` error response

* Update CHANGELOG.md

* test(backend): perform administrative operations as `root`

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-03-30 13:51:53 +09:00
Nila
f3500ffda9
fix: report progress out of 100% in CleanRemoteFilesProcessorService (#13633) 
* Report progress out of 100% in CleanRemoteFilesProcessorService

* Add changelog entry
 2024-03-30 10:28:47 +09:00
かっこかり
f90be427f5
fix(frontend): 「今日誕生日のフォロー中ユーザー」ウィジェットが正しく動作しない問題を修正 (#12835) 
* (fix) タイムゾーンによっては誕生日のフォロー中ユーザーが正しく読み込まれない

* 文言をわかりやすく

* Update Changelog

* (add) reload button

* Update CHANGELOG.md

* run misskey-js

* fix

* Revert "文言をわかりやすく"

This reverts commit c5ab6419563cc70ec8ba758e800c74d3469131e3.

* Update packages/frontend/src/widgets/WidgetBirthdayFollowings.vue

* Update packages/frontend/src/widgets/WidgetBirthdayFollowings.vue

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-03-25 18:31:30 +09:00
Marie
56b19ab6bb fix: incorrect type for quote property 2024-03-24 23:41:23 +00:00
dakkar
7374218a33 fix UserEntityService 
upstream has removed the Drive bits, but we're still using them, to
update avatar / banner / background URLs
 2024-03-24 12:14:05 +00:00
dakkar
bc531ac414 Merge remote-tracking branch 'misskey/develop' into future-2024-03-23 2024-03-24 11:53:52 +00:00
dakkar
beb00789df Merge branch 'develop' into future-2024-03-23 2024-03-24 11:26:36 +00:00
dakkar
4271402e0d recognise numbers and boolean values 2024-03-24 11:17:55 +00:00
dakkar
0e8cdb30b7 allow setting values not present in the config file 
replicas and arrays in general, are more complicated :/
 2024-03-24 11:12:17 +00:00
zyoshoka
a1bc8fa77b
test(backend): fix streaming test error when replying to followers-only note (#13618) 2024-03-24 16:46:52 +09:00
syuilo
3db26f2b94 fix(backend): fix openAPI operationId format 2024-03-23 20:43:29 +09:00
dakkar
435cab01c8 deal with (possible, future) non-alnum config keys 2024-03-21 10:00:16 +00:00
おさむのひと
831c74a25b
fix: URLプレビューの動作改善＋動作設定を可能にする (#13579) 
* wip

* support new version

* URLプレビュー無効化時、フロント側も非表示にしてリクエストをしないようにする

* fix lint

* fix lint

* tweak preview request error handles

* fix: CHANGELOG.md

* fix

* fix

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-03-21 18:46:42 +09:00
かっこかり
f4838e50b4
enhance(antenna): Botの投稿を除外できるように (#13603) 
* enhance(antenna): Botの投稿を除外できるように (MisskeyIO#545)

(cherry picked from commit a95ce067c6cf0a93647e358aabc984bdbe99e952)

* Update Changelog

* remove translations

* spdx

---------

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
 2024-03-21 07:51:01 +09:00
dakkar
25e6409cc9 allow overriding all string config values via env - fixes #465 
will need end-user documentation!
 2024-03-20 15:38:20 +00:00
dakkar
f4e89f2e6b bump tmp@0.2.3 - fixes #464 
see also https://github.com/raszi/node-tmp/issues/295
 2024-03-19 17:13:43 +00:00
かっこかり
0226a670dd
fix(backend): ユーザーやノートのOGPでローカルとリモートユーザーの見分けが付かない問題を修正 (#13586) 
* enhance(OGP): ユーザーやノートのOGPでローカルとリモートユーザーの見分けが付かない問題を修正 (MisskeyIO#528)

(cherry picked from commit 0c3de462d99c47297bebc162581bac6f78f21b49)

* Update Changelog

---------

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
 2024-03-18 18:34:31 +09:00
かっこかり
a38646bd0f
fix(backend): フォローリクエストを作成する際に既存のものは削除するように (#13588) 
* fix: delete old follow request (if exists) before creating new

(cherry picked from commit ea948ccadc)

* Update Changelog

* Update Changelog

---------

Co-authored-by: Kaity A <kaity@atikayda.au>
 2024-03-18 14:20:28 +09:00
syuilo
282cfae1b2 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2024-03-17 10:34:15 +09:00
syuilo
7e63ab0f56 refactor(backend): refactor chart engine 2024-03-17 10:34:13 +09:00
zyoshoka
4b1ca9ef61
fix(general): flash/createでPlayの公開範囲を指定できない問題の修正と編集画面の調整 (#13574) 
* fix(backend): param `visibility` wasn't included in `flash/create`

* fix(frontend): tweak flash editor ui

* Update CHANGELOG.md
 2024-03-15 22:02:57 +09:00
dakkar
9478fc0095 Merge remote-tracking branch 'misskey/develop' into future-2024-03-14 2024-03-14 16:28:56 +00:00
zyoshoka
29f6ba6310
chore: add missing SPDX ID and workflow check (#13570) 
* chore: add workflow which checks if SPDX ID exists

* chore: add missing SPDX ID in some files

* chore: change trigger condition

* chore: trigger on push

* lint
 2024-03-13 22:37:18 +09:00
おさむのひと
5c1d86b796
refactor(backend): UserEntityService.packMany()の高速化 (#13550) 
* refactor(backend): UserEntityService.packMany()の高速化

* 修正
 2024-03-12 14:31:34 +09:00
Alina Sireneva
0085305579 fix: load libopenmpt on demand 2024-03-11 15:32:59 +03:00
yupix
6b676a928d
enhance(backend): antennas/updateの必須項目をantennaIdのみに (#13542) 
* refactor: antennas/updateの必須項目を最小限に

* fix: userListIdがnullにできない
 2024-03-10 17:31:39 +09:00
dakkar
43544a6479 longer statement_timeout for migrations - fixes 450 2024-03-09 15:38:36 +00:00
dakkar
354cb2a675 handle non-ASCII emoji names 
* use the more inclusive regexp for validating emoji names
* always normalize emoji names, aliases, categories

the latter point is necessary to allow matching, for example, `ä`
against `a`+combining diaeresis

this will also need to bump the version of `sfm-js` once we merge
https://activitypub.software/TransFem-org/sfm-js/-/merge_requests/2
 2024-03-09 12:51:51 +00:00
tamaina
1b064d7e30 chore(backend): validateNoteの結果Errorはそのままthrowする 
理由がわからないため
 2024-03-09 04:10:17 +00:00
dakkar
dfff4d2073 Merge remote-tracking branch 'misskey/develop' into future 2024-03-07 16:09:36 +00:00
zyoshoka
412e9f284d
test(backend): enable typecheck by workflow (#13526) 2024-03-07 09:51:57 +09:00
かっこかり
7ead98cbe5
enhance(frontend): リアクションの総数を表示するように (#13532) 
* enhance(frontend): リアクションの総数を表示するように

* Update Changelog

* リアクション選択済の色をaccentに
 2024-03-06 21:08:42 +09:00
tamaina
62922352b3 Revert "perf: boot.jsの調整" 
This reverts commit 00c1e4eb55.
 2024-03-06 09:49:01 +00:00
tamaina
00c1e4eb55 perf: boot.jsの調整 2024-03-06 09:40:47 +00:00
tamaina
4457b02db2 fix(frontend)?: importAppScriptはimportをawaitするように 2024-03-06 08:08:32 +00:00
dakkar
ff0117a1a5 check prohibited words when creating notes 
some small differences (between Misskey and us) inside the `create`
method made `git` put all the changes inside the `import` method… I
thought I had copied them all, but I had missed one, and it's a pretty
important one: prohibited words were not being checked!
 2024-03-05 16:52:05 +00:00
かっこかり
08d618bb8b
enhance(frontend): 自分のノートの添付ファイルから直接ファイルの詳細ページに飛べるようにする (#13520) 
* enhance(frontend): 自分のノートの添付ファイルから直接ファイルの詳細ページに飛べるようにする

* 他のファイルタイプにも対応

* Update Changelog

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-03-05 18:06:57 +09:00
tamaina
9542cb8d62
fix(backend): リモートサーバーの情報が更新できなくなっていた問題を修正 (#13507) 
* fix(backend): fetchInstanceMetadataのLockが永遠に解除されない問題を修正

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>

* fix test

* fix

* comment

* comment

* improve test

---------

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
 2024-03-04 13:48:57 +09:00
zyoshoka
38837bd388
test(backend): refactor tests (#13499) 
* test(backend): refactor tests

* fix: failed test
 2024-03-03 20:15:35 +09:00
dakkar
7d00c4529b fix repo + feedback URLs for Firefish / IceShrimp 2024-03-03 11:12:58 +00:00
dakkar
6ecfe7c7c3 remove duplicate method 2024-03-02 17:34:31 +00:00
dakkar
23f476dbf3 Merge branch 'develop' into release/2024.3.1 2024-03-02 17:28:34 +00:00
dakkar
af548d05ca merge upstream for 2024.2.1 2024-03-02 16:36:49 +00:00
tamaina
eb60460d28
enhance: 禁止ワードチェック強化 (#27) 
* enhance: 禁止ワードチェック強化
* リモートの禁止ワードチェックを添付ファイルとユーザーを登録する前に行うなど
  Resolve https://github.com/misskey-dev/misskey/issues/13374
* 禁止ワートの対象の見直し

* performActivityで特定のエラーが出た際にDelayedに追加しないように

* use IdentifiableError

* NoteCreateService.checkProhibitedWords

* https://github.com/misskey-dev/misskey-private/pull/27/files#r1507416135

* remove comment
 2024-03-01 20:16:32 +09:00
syuilo
d1bf432e14 add missing license headers 2024-03-01 17:28:46 +09:00
syuilo
5904d98208
Update packages/backend/test/e2e/mute.ts 
Co-authored-by: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
 2024-03-01 17:26:27 +09:00
syuilo
ca6399437c format 2024-03-01 17:26:13 +09:00
syuilo
2f31606eff update deps 2024-03-01 14:16:44 +09:00
syuilo
033d71ee28 update deps 2024-03-01 13:52:39 +09:00
syuilo
a74406677c fix packedRoleCondFormulaValueAssignedRoleSchema 2024-03-01 12:03:33 +09:00
Yuriha
26d4c5fd94
メンションの最大数をロールごとに設定可能にする (#13343) 
* Add new role policy: maximum mentions per note

* fix

* Reviewを反映

* fix

* Add ChangeLog

* Update type definitions

* Add E2E test

* CHANGELOG に説明を追加

---------

Co-authored-by: taichan <40626578+tai-cha@users.noreply.github.com>
 2024-02-29 20:48:02 +09:00
zyoshoka
16f16e6b08
fix(backend): ダイレクトなノートに対してはダイレクトでしか返信できないように (#13477) 
* fix(backend): ダイレクトなノートに対してはダイレクトでしか返信できないように

* Update CHANGELOG.md

* test(backend): `notes/create`とWebSocket関連のテストを追加
 2024-02-29 20:42:02 +09:00
かっこかり
39d6af135f
enhance: 通知の履歴をリセットできるように (#13335) 
* enhance: 通知の履歴をリセットできるように

* Update Changelog

* 通知欄も連動して更新するように

* revert some changes

* Update CHANGELOG.md

* Remove unused part

* fix
 2024-02-29 20:03:30 +09:00
syuilo
98934b6738 fix type 2024-02-29 17:54:32 +09:00
syuilo
920c3be750 update deps 2024-02-29 11:10:03 +09:00
taichan
5f43c2faa2
enhance(backend): 通知がミュート・凍結を考慮するようにする (#13412) 
* Never return broken notifications #409

Since notifications are stored in Redis, we can't expect relational
integrity: deleting a user will *not* delete notifications that
mention it.

But if we return notifications with missing bits (a `follow` without a
`user`, for example), the frontend will get very confused and throw an
exception while trying to render them.

This change makes sure we never expose those broken notifications. For
uniformity, I've applied the same logic to notes and roles mentioned
in notifications, even if nobody reported breakage in those cases.

Tested by creating a few types of notifications with a `notifierId`,
then deleting their user.

(cherry picked from commit 421f8d49e5)

* Update Changelog

* Update CHANGELOG.md

* enhance: 通知がミュートを考慮するようにする

* enhance: 通知が凍結も考慮するようにする

* fix: notifierIdがない通知が消えてしまう問題

* Add tests (通知がミュートを考慮しているかどうか)

* fix: notifierIdがない通知が消えてしまう問題 (grouped)

* Remove unused import

* Fix: typo

* Revert "enhance: 通知が凍結も考慮するようにする"

This reverts commit b1e57e571dfd9a7d8b2430294473c2053cc3ea33.

* Revert API handling

* Remove unused imports

* enhance: Check if notifierId is valid in NotificationEntityService

* 通知作成時にpackしてnullになったらあとの処理をやめる

* Remove duplication of valid notifier check

* add filter notification is not null

* Revert "Remove duplication of valid notifier check"

This reverts commit 239a6952f717add53d52c3e701e7362eb1987645.

* Improve performance

* Fix packGrouped

* Refactor: 判定部分を共通化

* Fix condition

* use isNotNull

* Update CHANGELOG.md

* filterの改善

* Refactor: DONT REPEAT YOURSELF
Note: GroupedNotificationはNotificationの拡張なのでその例外だけ書けば基本的に共通の処理になり複雑な個別の処理は増えにくいと思われる

* Add groupedNotificationTypes

* Update misskey-js typedef

* Refactor: less sql calls

* refactor

* clean up

* filter notes to mark as read

* packed noteがmapなのでそちらを使う

* if (notesToRead.size > 0)

* if (notes.length === 0) return;

* fix

* Revert "if (notes.length === 0) return;"

This reverts commit 22e2324f9633bddba50769ef838bc5ddb4564c88.

* 🎨

* console.error

* err

* remove try-catch

* 不要なジェネリクスを除去

* Revert  (既読処理をpack内で行うものを元に戻す)

* Clean

* Update packages/backend/src/core/entities/NotificationEntityService.ts

* Update packages/backend/src/core/entities/NotificationEntityService.ts

* Update packages/backend/src/core/entities/NotificationEntityService.ts

* Update packages/backend/src/core/entities/NotificationEntityService.ts

* Update packages/backend/src/core/NotificationService.ts

* Clean

---------

Co-authored-by: dakkar <dakkar@thenautilus.net>
Co-authored-by: kakkokari-gtyih <daisho7308+f@gmail.com>
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-28 21:26:26 +09:00
zyoshoka
664aeb3ced
fix(backend): リノート時のHTLへのストリーミングの意図しない挙動を修正 (#13425) 
* fix(backend): リノート時のストリーミングの意図しない挙動を修正

* Update CHANGELOG.md

* fix: 不要な返り値

* fix: 不適切な条件分岐を修正

* test(backend): add htl tests

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-28 17:43:17 +09:00
okayurisotto
b7d9d16201
refactor(backend): ノートのエクスポート処理でStreams APIを使うように (#13465) 
* refactor(backend): ノートのエクスポート処理でStreams APIを使うように

* fixup! refactor(backend): ノートのエクスポート処理でStreams APIを使うように

`await`忘れにより、ジョブがすぐに完了したことになり削除されてしまっていた。
それによって、`NoteStream`内での`updateProgress`メソッドの呼び出しで、`Missing key for job`のエラーが発生することがあった。

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-28 15:34:58 +09:00
zyoshoka
0d47877db1
enhance(backend): フォロー・フォロワー関連の通知の受信設定の強化 (#13468) 
* enhance(backend): 通知の受信設定に「フォロー中またはフォロワー」を追加

* fix(backend): 通知の受信設定で「相互フォロー」が正しく動作しない問題を修正

* Update CHANGELOG.md
 2024-02-28 09:49:34 +09:00
zawa-ch
f906ad6ca7
Enhance: コンディショナルロールの条件に「マニュアルロールへのアサイン」を追加 (#13463) 
* コンディショナルロールの条件に「マニュアルロールへのアサイン」を追加

* コメント修正
 2024-02-27 18:45:46 +09:00
zyoshoka
0fb7b98f96
fix(backend): fix incorrect schemas (#13458) 2024-02-26 19:49:12 +09:00
FineArchs
dd48366ed8
admin/emoji/updateの必須項目を減らす　等 (#13449) 
* admin/emoji/update enhancement

* add CustomEmojiService.getEmojiByName

* update endpoint

* fix

* Update update.ts

* Update autogen files

* type assertion

* Update CHANGELOG.md
 2024-02-25 18:06:26 +09:00
tamaina
2c6f25b710
fix: 古いキャッシュを使うのを修正 (#13453) 2024-02-25 12:36:10 +09:00
Marie
1b65c06d60 merge: fix: delete old follow request (if exists) before creating new (!440) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/440

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
 2024-02-24 18:16:16 +00:00
Kaity A
def2e8dff0
Merge remote-tracking branch 'origin/develop' into fix/failed-follow 2024-02-24 05:05:25 +00:00
Kaity A
ea948ccadc
fix: delete old follow request (if exists) before creating new 2024-02-24 04:38:01 +00:00
syuilo
41747b6ee2 refactor 2024-02-24 11:50:10 +09:00
Marie
d1b787192a
fix: align note edit errors with note create errors 2024-02-23 17:01:35 +01:00
Marie
15d2319011
merge: upstream 2024-02-23 13:42:52 +01:00
tamaina
c0156b740b
enhance?: DeleteAccountServiceでユーザーを削除する際にuserChangeDeletedStateを発行する (#13382) 2024-02-23 18:15:39 +09:00
tamaina
600d91beda
enhance: リモートのフォロワーから再度Followが来た場合、acceptを返してあげる (#13388) 
* enhance: リモートのフォロワーから再度Followが来た場合、acceptを返してあげる

* nanka meccha kaeta

* ブロックチェックの後にフォロー関係の存在チェックをする
 2024-02-23 18:04:30 +09:00
okayurisotto
a861f913a7
fix(backend): より多くの人に使われているハッシュタグが検索結果上位に来るように (#11498) (#13340) 2024-02-23 18:02:12 +09:00
tamaina
b8d8b359bc
fix: プッシュ通知の変更が1時間ほど反映されない問題を修正 (#13407) 
* fix: プッシュ通知の変更が1時間ほど反映されない問題を修正

* 410 to refresh

* refreshCache
 2024-02-23 17:19:08 +09:00
okayurisotto
64953fadc9
refactor(backend): Array.prototype.filterでの非null確認ではisNotNull関数を使うように (#13442) 
* `Array.prototype.filter`での非null確認では`isNotNull`関数を使うように

* `{}` -> `NonNullable<unknown>`
 2024-02-23 14:12:57 +09:00
かっこかり
080a3c20bd
fix: SSR時のmetaをエスケープするように (#13440) 
* fix: SSR時のmetaをエスケープするように

* エスケープ方法を変更
 2024-02-23 14:10:13 +09:00
かっこかり
d20542c495
enhance: metaをSSR HTMLに埋め込む (#13436) 
* enhance: `meta`をSSR HTMLに埋め込む

* HTML Metaの有効時間を指定

* １時間

* MetaEntityService

* JSONをPackするように

* ✌️

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-23 10:47:17 +09:00
dakkar
4afbf3b91e some fixes for note edits 2024-02-22 18:23:46 +00:00
FineArchs
bf5952fd63
flash/update で部分的に変更できるようにする (#13396) 
* make flash/update params optional

* Update autogen files

pnpm run build-misskey-js-with-types

* Update update.ts

* Update CHANGELOG.md

* hasOwnProperty -> hasOwn

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-22 21:31:57 +09:00
tamaina
4d6fab06de
refactor: Refactor NoteReadService.read (#13429) 
* refactor: Refactor NoteReadService.read

* clean up

* Update packages/backend/src/core/NoteReadService.ts

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-22 21:10:28 +09:00
syuilo
2bd9f05a92 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2024-02-22 20:59:57 +09:00
syuilo
26c8b53f70 enhance: サーバーごとにモデレーションノートを残せるように 2024-02-22 20:59:52 +09:00
Marie
349f846f32 Add fail safe for sponsors endpoint in case of not being able to connect 2024-02-21 18:59:31 +00:00
anatawa12
b36e6b1a77
fix: 禁止キーワードを含むノートがDelayed Queueに追加されて再処理される問題 (#13428) 
* refactor: use IdentifiableError instead of NoteCreateService.ContainsProhibitedWordsError

* fix: notes with prohibited words are reprocessed with delay

* docs(changelog): 禁止キーワードを含むノートがDelayed Queueに追加されて再処理される問題

* lint: fix lint errors

* fix: rethrowするべきなのにrethrowし忘れていたのを修正
 2024-02-22 00:59:59 +09:00
tamaina
ae27085f69
fix: Bump sharp to 0.33.2 (#13391) 2024-02-21 14:42:37 +09:00
okayurisotto
750d262604
refactor(backend): ReactionService.prototype.convertLegacyReactions (#13375) 
* add unit tests

* cleanup unnecessary type assertions

* `convertedReaction`変数の定義と変換表に対する存在確認処理の整理

* `count`変数の定義とループ処理での`Object.entries()`の活用

* 条件式の整理

* `Array.prototype.reduce`を使うように

* `Array.prototype.reduce`を使うように

* 配列操作を1つのメソッドチェーンに整理

これまでの実装では、`decodeReaction`の返り値が同一になる異なる入力値が同時に複数個存在した場合、後ろのもので上書きされてしまっていたはず。
これからの実装では、後ろのものは前のものに加算される。
（実際にこの挙動の変更が問題になるシチュエーションはまずないはず。）

* add unit test

* ドキュメントコメントの追加と型定義の調整
 2024-02-21 14:31:50 +09:00
dakkar
c9940b7359 Switch source code bits 2024-02-20 20:01:31 +00:00
Marie
4a13508da0 Note Edited notification type 2024-02-20 15:10:41 +00:00
Marie
6931f50af5 merge: check prohibited words when editing note (!429) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/429

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-19 19:19:27 +00:00
Marie
3912436f4f merge: hide blocked&c instances when not logged in - fixes #422 (!430) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/430

Closes #422

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-19 19:09:11 +00:00
Marie
e248e41287 fix: merge conflict 2024-02-19 19:06:30 +00:00
Marie
d182402cfa
fix: icons and update urls 2024-02-19 18:46:42 +01:00
dakkar
bf82942245 hide blocked&c instances when not logged in - fixes 422 2024-02-19 14:53:24 +00:00
dakkar
9c1437bdf9 check prohibited words when editing note 2024-02-19 14:27:10 +00:00
dakkar
d1c174ea60 rename to get it applied after upstream changes 
upstream `1708266695091-repositoryUrl-from-syuilo-to-misskey-dev.js`
changes `repositoryUrl` to one of the values this patch recognise, so
let's do ours after theirs
 2024-02-19 11:41:35 +00:00
Marie
10bfc61670
merge: upstream 2024-02-19 10:47:42 +01:00
Marie
6ef2d471e9 merge: fix: keep alt text of file if present (!418) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/418

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-19 01:27:08 +00:00
anatawa12
1b1046bcdb
fix: syuilo/misskey時代から使用してるサーバーが改変したバージョンだと誤判定される問題 (DB migrationで修正) (#13389) 2024-02-19 08:34:31 +09:00
anatawa12
0b636d1bf9
fix: nodeinfoにenableMcaptchaとenableTurnstileが無い (#13387) 2024-02-19 08:33:36 +09:00
syuilo
7562d233c5 fix of 9a70ce8f5e 
Co-Authored-By: RyotaK <49341894+Ry0taK@users.noreply.github.com>
 2024-02-17 13:09:16 +00:00
tamaina
0a8ffd9cfa Merge pull request from GHSA-qqrm-9grj-6v32 
* maybe ok

* fix

* test wip

* ✌️

* fix

* if (res.ok)

* validateContentTypeSetAsJsonLD

* 条件を考慮し直す

* その他の+json接尾辞が付いているメディアタイプも受け容れる

* https://github.com/misskey-dev/misskey-ghsa-qqrm-9grj-6v32/pull/1#discussion_r1490999009

* add `; profile="https://www.w3.org/ns/activitystreams"`

* application/ld+json;
 2024-02-17 13:09:08 +00:00
syuilo
6132bc3b3e fix of 9a70ce8f5e 
Co-Authored-By: RyotaK <49341894+Ry0taK@users.noreply.github.com>
 2024-02-17 12:54:45 +00:00
tamaina
1948ca9aa8 Merge pull request from GHSA-qqrm-9grj-6v32 2024-02-17 12:36:44 +00:00
Cocoa Hoto
b0030d148d
fix: allow moderators see role assigned users; fix #13301 (#13315) 2024-02-17 14:41:18 +09:00
syuilo
01de1519dd fix of 9a70ce8f5e 
Co-Authored-By: RyotaK <49341894+Ry0taK@users.noreply.github.com>
 2024-02-17 14:26:48 +09:00
Acid Chicken (硫酸鶏)
acba96c1d3
feat: license violation protection (#13285) 
* spec(frontend): aboutページにリポジトリ・フィードバックのURLを表示させる

Cherry-picked from MisskeyIO#441
Cherry-picked from MisskeyIO#438

* feat: license violation protection

* build: fix typo

* build: fix typo

* fix: farewell to the static type land

* fix: key typo

* fix: import typo

* fix: properly interpret `prominently`

* docs: add disclaimer

* docs: update CHANGELOG

* chore: add gap

---------

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-17 13:34:50 +09:00
tamaina
9a70ce8f5e
Merge pull request from GHSA-qqrm-9grj-6v32 
* maybe ok

* fix

* test wip

* ✌️

* fix

* if (res.ok)

* validateContentTypeSetAsJsonLD

* 条件を考慮し直す

* その他の+json接尾辞が付いているメディアタイプも受け容れる

* https://github.com/misskey-dev/misskey-ghsa-qqrm-9grj-6v32/pull/1#discussion_r1490999009

* add `; profile="https://www.w3.org/ns/activitystreams"`

* application/ld+json;
 2024-02-17 12:41:19 +09:00
zyoshoka
37959bab1d
refactor(backend): remove/replace deprecated type deps (#13252) 2024-02-16 20:09:07 +09:00
dakkar
b5cfd92e2b point default repo/feedback URLs to our repos 
the migration will update instances that have the old defaults, too
 2024-02-16 10:54:33 +00:00
syuilo
f8ac072bc3 fix type 2024-02-16 15:19:55 +09:00
syuilo
7cfe7da73d fix 2024-02-16 15:09:05 +09:00
syuilo
f55e1ee138 refactor(backend): misc/cacheをシンプルな実装に戻した 2024-02-16 15:07:12 +09:00
MeiMei
cfa573a3a1
リモートユーザーが復活してもキャッシュにより該当ユーザーのActivityが受け入れられないのを修正 Fix #13273 (#13275) 
* リモートユーザーが復活してもキャッシュにより該当ユーザーのActivityが受け入れられないのを修正 Fix #13273

* CHAGELOG

* Use Redis event

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
 2024-02-16 14:30:53 +09:00
zyoshoka
40bbae3d6c
fix(backend): add missing schemas and fix incorrect schemas (#13295) 
* fix(backend): add missing schemas and fix incorrect schemas

* fix: ci

* fix: ci (本命)

* fix: run `pnpm build-misskey-js-with-types`

* fix: typos

* fix: role-condition-formula-value contains `id`

* fix: incorrect schema
 2024-02-16 14:27:33 +09:00
Kisaragi
147e8f1e3e
feat(backend): likeOnlyなどでハートにフォールバックする際異体字セレクタがない方に揃える (#13299) 
* feat(backend): likeOnlyなどでハートにフォールバックする際異体字セレクタがない方に揃える

close #13298

* Update ReactionService.ts

* chore(backend): prefer single quote for string literal
 2024-02-16 14:25:48 +09:00
Amelia Yukii
be36a793cd merge: Fix Note Edits being federated incorrectly (!417) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/417

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-15 22:18:58 +00:00
Marie
8f6dfa611e fix: keep alt text of file if present 2024-02-13 22:01:53 +00:00
Marie
8b90c6c045 merge: Never return broken notifications #409 (!415) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/415

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-13 18:23:37 +00:00
tamaina
c1514ce91d (re) update SPDX-FileCopyrightText 
Fix  #13290
 2024-02-13 15:59:27 +00:00
tamaina
311c2172d7 Revert "update SPDX-FileCopyrightText" 
This reverts commit 9b5aeb76d8.
 2024-02-13 15:50:11 +00:00
dakkar
1015901a9d avoid parsing undefined 
I don't understand why upstream wouldn't have this same problem ☹

We already have this same conditional in `ApRenderService.renderNote`
and `ApRenderService.renderUpNote`, and Misskey doesn't
 2024-02-13 14:04:07 +00:00
Marie
fef5dbb6e2 fix: note edits being federated incorrectly 2024-02-13 13:08:44 +00:00
Acid Chicken (硫酸鶏)
309a943528
perf: omit search for immutable static requests (#13265) 
* perf: omit search for immutable static requests

* perf: also applies to /files

* fix: exclude /proxy

* /files/:key/*を301 redirectに

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
 2024-02-13 10:43:06 +09:00
tamaina
32c5c43b6d
enhance: 禁止ワードはリモートノートも対象に (#13280) 
Resolve #13279
 2024-02-13 04:54:01 +09:00
syuilo
a1e12c0ec3 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2024-02-12 11:37:55 +09:00
syuilo
9b5aeb76d8 update SPDX-FileCopyrightText 2024-02-12 11:37:45 +09:00
Acid Chicken (硫酸鶏)
3dc095d1c9
feat: provide tarball (#13260) 
* feat: provide tarball

* build: pack on build-assets

* chore: use ignore-walk

* chore: debug

* build: dependencies
 2024-02-12 10:02:27 +09:00
dakkar
421f8d49e5 Never return broken notifications #409 
Since notifications are stored in Redis, we can't expect relational
integrity: deleting a user will *not* delete notifications that
mention it.

But if we return notifications with missing bits (a `follow` without a
`user`, for example), the frontend will get very confused and throw an
exception while trying to render them.

This change makes sure we never expose those broken notifications. For
uniformity, I've applied the same logic to notes and roles mentioned
in notifications, even if nobody reported breakage in those cases.

Tested by creating a few types of notifications with a `notifierId`,
then deleting their user.
 2024-02-11 12:25:50 +00:00