Hazelnoot
a4dd19fdd4
merge upstream again
2025-04-24 14:23:45 -04:00
Hazelnoot
7132696285
Merge tag '2025.4.0' into merge/2025-03-24
...
# Conflicts:
# .github/workflows/storybook.yml
# locales/index.d.ts
# package.json
# packages/backend/src/models/json-schema/role.ts
# packages/frontend/src/components/MkPageWindow.vue
# packages/frontend/src/pages/admin/roles.editor.vue
# packages/frontend/src/pages/admin/roles.vue
# packages/frontend/src/pages/settings/preferences.vue
# packages/frontend/src/pages/settings/privacy.vue
# packages/frontend/src/pages/timeline.vue
# packages/frontend/src/pref-migrate.ts
# packages/frontend/src/ui/_common_/common.vue
# packages/frontend/src/ui/deck.vue
# packages/frontend/src/ui/universal.vue
# packages/misskey-js/src/autogen/types.ts
2025-04-13 13:07:09 -04:00
おさむのひと
0d4feed6d3
enhance(backend): フォローしているユーザーならフォロワー限定投稿のノートでもアンテナで検知できるように ( #15264 )
...
* フォローしているユーザーなら鍵ノートでもアンテナにひっかかるように
Co-authored-by: kozakura913 <98575220+kozakura913@users.noreply.github.com>
Co-authored-by: mai <74494945+chan-mai@users.noreply.github.com>
* Eliminate build errors by resolving conflicts
* 低コストな判定文を前にもってきて重い判定文に入る可能性を少しでも下げる
* fix CHANGELOG.md
* fix CHANGELOG.md
* fix diff
* removed comment
* fix CHANGELOG.md
---------
Co-authored-by: kozakura913 <98575220+kozakura913@users.noreply.github.com>
Co-authored-by: mai <74494945+chan-mai@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2025-04-13 20:48:18 +09:00
anatawa12
4c473eb76d
fix: resolve with non-lowercased acct is broken ( #15813 )
...
* fix: resolve with non-lowercased acct is broken
* docs(changelog): Fix: 大文字を含むユーザの URL で紹介された場合に 404 エラーを返す問題
2025-04-13 18:34:33 +09:00
syuilo
c500e4392a
hideNotesInSensitiveChannel -> excludeNotesInSensitiveChannel
2025-04-08 20:50:38 +09:00
Hazelnoot
5ee7049fad
fix lint error in e2e/antennas.ts
2025-04-02 22:38:37 -04:00
Hazelnoot
dab9b518e4
merge from misskey-develop
2025-04-02 22:29:14 -04:00
Hazelnoot
f9c1535147
fix backend lint errors
2025-04-02 10:35:11 -04:00
Hazelnoot
9dffb13be7
fix test errors in MfmService.ts
2025-04-02 09:47:49 -04:00
Nanashi.
98eadd7093
feat: アンテナでセンシティブなチャンネルからのノートを除外できるように ( #15346 )
...
* feat(db): マイグレーションを追加
* feat(backend): カラムの定義を追加
* wip
* feat: フラグを設定出来るように
* feat: /notesエンドポイントを対応
* feat: websocketを対応
* test: テストを追加
* docs: CHANGELOGを更新
* docs: CHANGELOGの追加場所を修正
* chore: api.jsonを更新
* docs(CHANGELOG): General欄に移動
* docs: フォーマットを揃える
* chore: クエリを削除
* revert: 英訳を消す
* chore: note.channelを追加するところを変える
* docs: CHANGELOGを更新する
* docs(CHANGELOG): 2025.3.2に移動
* chore: changelogを下に移動
* ci: CI再実行用の空コミット
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2025-04-02 16:01:24 +09:00
Hazelnoot
a2062c6469
Revert "revert 7bfada9792
: enhance: remove bull-board support"
...
This reverts commit d41d77fcd7
.
2025-03-30 02:14:03 -04:00
Hazelnoot
4ae26e6e18
Merge branch 'misskey-develop' into merge/2025-03-24
2025-03-30 01:58:17 -04:00
syuilo
7fd3adedee
fix tests
2025-03-29 17:00:01 +09:00
syuilo
e40846c46b
fix e2e test
2025-03-27 19:50:03 +09:00
syuilo
f7e901deb2
test fixes
2025-03-27 17:30:04 +09:00
Hazelnoot
d41d77fcd7
revert 7bfada9792
: enhance: remove bull-board support
2025-03-25 17:25:30 -04:00
Hazelnoot
7ea710b314
remerge: remove FetchAllowSoftFailMask in favor of our same-authority checks
2025-03-25 17:19:38 -04:00
Hazelnoot
d8908ef2d8
merge upstream
2025-03-25 16:14:53 -04:00
syuilo
f1f24e39d2
Feat: Chat ( #15686 )
...
* wip
* wip
* wip
* wip
* wip
* wip
* Update types.ts
* Create 1742203321812-chat.js
* wip
* wip
* Update room.vue
* Update home.vue
* Update home.vue
* Update ja-JP.yml
* Update index.d.ts
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* Update CHANGELOG.md
* wip
* Update home.vue
* clean up
* Update misskey-js.api.md
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* lint fixes
* lint
* Update UserEntityService.ts
* search
* wip
* 🎨
* wip
* Update home.ownedRooms.vue
* wip
* Update CHANGELOG.md
* Update style.scss
* wip
* improve performance
* improve performance
* Update timeline.test.ts
2025-03-24 21:32:46 +09:00
Hazelnoot
73e70f7449
fix unit tests in activitypub.ts
2025-03-21 12:37:06 -04:00
Hazelnoot
27e8289126
fix lint errors in mock-resolver.ts and activitypub.ts
2025-03-21 12:37:06 -04:00
zyoshoka
9dd13f364b
fix(backend): mismatch in emojis
param of test WebHook payload ( #15675 )
...
* fix(backend): mismatch in `emojis` param of test WebHook payload
* fix: test
* fix: type
2025-03-20 09:00:58 +09:00
Hazelnoot
5182f17d32
implement replies collection for posts
2025-03-19 09:52:55 -04:00
Hazelnoot
97da78b46c
fix lint errors in activitypub.ts
2025-03-16 10:07:57 -04:00
Hazelnoot
a35c2f214b
convert Authorized Fetch to a setting and add support for hybrid mode (essential metadata only)
2025-03-16 10:07:57 -04:00
syuilo
7bfada9792
enhance: remove bull-board support
2025-03-16 13:03:02 +09:00
饺子w (Yumechi)
e5d117dc98
fix(backend): tighten an overly relaxed criteria and remove capability of matching multiple final URLs in URL authority checking ( #15655 )
...
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2025-03-12 12:39:24 +00:00
かっこかり
22228b6756
enhance: OAuth2 (IndieAuth) でロゴが提供されている場合は表示するように ( #15578 )
...
* enhance: OAuthでロゴが提供されている場合は表示するように
* Update Changelog
* refactor
* fix
* fix test
2025-03-06 08:05:14 +00:00
Hazelnoot
910b83c531
filter url
properties by mediaType
2025-03-02 11:06:32 -05:00
Hazelnoot
a568333ecd
remove assertActivityMatchesUrls in favor of three-way same-authority checks
2025-03-02 11:06:29 -05:00
syuilo
616cccf251
enhance(backend): refine system account ( #15530 )
...
* wip
* wip
* wip
* Update SystemAccountService.ts
* Update 1740121393164-system-accounts.js
* Update DeleteAccountService.ts
* wip
* wip
* wip
* wip
* Update 1740121393164-system-accounts.js
* Update RepositoryModule.ts
* wip
* wip
* wip
* Update ApRendererService.ts
* wip
* wip
* Update SystemAccountService.ts
* fix tests
* fix tests
* fix tests
* fix tests
* fix tests
* fix tests
* add print logs
* ログが長すぎて出てないかもしれない
* fix migration
* refactor
* fix fed-tests
* Update RelayService.ts
* merge
* Update user.test.ts
* chore: emit log
* fix: tweak sleep duration
* fix: exit 1
* fix: wait for misskey processes to become healthy
* fix: longer sleep for user deletion
* fix: make sleep longer again
* デッドロック解消の試み
https://github.com/misskey-dev/misskey/issues/15005
* Revert "デッドロック解消の試み"
This reverts commit 266141f66fb584371bbb56ef7eba04e14bcff94d.
* wip
* Update SystemAccountService.ts
---------
Co-authored-by: おさむのひと <46447427+samunohito@users.noreply.github.com>
Co-authored-by: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
2025-03-02 20:06:20 +09:00
Hazelnoot
14a81b4f85
merge: Add "reject quotes" settings ( !901 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/901
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2025-03-01 03:33:06 +00:00
鴇峰 朔華
39c487e1d1
fix(backend): ローカル判定でisUriLocalを使用していない箇所を修正 ( #15069 )
...
* fix(backend): ローカル判定でisUriLocalを使用していない箇所を修正
* fix(test backend): RelayServiceでUtilityServiceを使う
2025-02-26 01:28:53 +00:00
かっこかり
b5799351d0
fix(backend): clips/updateのdescriptionで空文字を許容するように ( #15429 )
...
* fix(backend): clips/updateのdescriptionで空文字を許容するように
* Update Changelog
* fix: createの際も空文字を許容するように
* fix test
* fix test
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2025-02-26 01:27:38 +00:00
Hazelnoot
f039a7a37b
use padEnd to shorten long line in activitypub.ts
2025-02-25 11:44:16 -05:00
Hazelnoot
6cb04dbaac
trim padded Actor keys to avoid value too long
error
2025-02-25 11:41:44 -05:00
おさむのひと
426940bea7
2025.2.1-beta.0のlintがコケているのを修正 ( #15546 )
2025-02-23 21:21:58 +09:00
饺子w (Yumechi)
25052164c0
Merge commit from fork
...
* fix(backend): Fix an issue where the origin of ActivityPub lookup response was not validated correctly.
[GHSA-6w2c-vf6f-xf26](https://github.com/misskey-dev/misskey/security/advisories/GHSA-6w2c-vf6f-xf26 )
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
* Enhance: Add configuration option to disable all external redirects when responding to an ActivityPub lookup (config.disallowExternalApRedirect)
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
* fixup! fix(backend): Fix an issue where the origin of ActivityPub lookup response was not validated correctly.
* docs & one edge case
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
* apply suggestions
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
* remove stale frontend reference to _responseInvalidIdHostNotMatch
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
* apply suggestions
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
---------
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2025-02-23 19:21:34 +09:00
Hazelnoot
bb0bc68927
cover more retryable errors for quote resolution
2025-02-20 09:58:22 -05:00
Hazelnoot
784290186f
fix type errors in is-renote unit tests
2025-02-20 09:58:06 -05:00
Hazelnoot
b100249a34
fix type errors in NoteCreateService unit tests
2025-02-20 09:58:06 -05:00
dakkar
534c35cca2
merge: Add "force content warning" setting for user moderation ( resolves #905 ) ( !876 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/876
Closes #905
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2025-02-20 10:20:49 +00:00
dakkar
029f67b7e5
fix time zone for CustomEmojiService test
...
otherwise, the timestamps that the test uses for queries are
interpreted as UTC (because they have a TZ in the string), but the
truncated date is interpreted in the session timezone, which defaults
to the server timezone, which can be anything
thanks to @fEmber for noticing
2025-02-18 20:57:55 +00:00
Hazelnoot
dbaeb7f2ac
fix unit tests using mock-resolver
2025-02-16 19:25:25 -05:00
Hazelnoot
e60fe879d6
document "special character" as zero-width space in activitypub unit tests
2025-02-16 19:20:42 -05:00
Hazelnoot
c54b6bf55d
append mandatory CW in Update(Note)
activities
2025-02-16 19:20:41 -05:00
Hazelnoot
6c2034a373
append default CW when rendering AP Note
objects
2025-02-16 19:20:41 -05:00
Hazelnoot
563e32316f
factor out common append-content-warning routine for use in both frontend and backend
2025-02-16 19:20:41 -05:00
syuilo
ffd8cf07e6
update deps ( #15311 )
...
* wip
* bump misskey-dev/eslint-plugin
* lint fixes (backend)
* lint fixes (frontend)
* lint fixes (frontend-embed)
* rollback nsfwjs to 4.2.0
ref: infinitered/nsfwjs#904
* rollback openapi-typescript to v6
v7でOpenAPIのバリデーションが入るようになった関係でスコープ外での変更が避けられないため一時的に戻した
* lint fixes (misskey-js)
* temporarily disable errored lint rule (frontend-shared)
* fix lint
* temporarily ignore errored file for lint (frontend-shared)
* rollback simplewebauthn/server to 12.0.0
v13 contains breaking changes that require some decision making
* lint fixes (frontend-shared)
* build misskey-js with types
* fix(backend): migrate simplewebauthn/server to v12
* fix(misskey-js/autogen): ignore indent rules to generate consistent output
* attempt to fix test
changes due to capricorn86/happy-dom#1617 (XMLSerializer now produces valid XML)
* attempt to fix test
changes due to capricorn86/happy-dom#1617 (XMLSerializer now produces valid XML)
* fix test
* fix test
* fix test
* Apply suggestions from code review
Co-authored-by: anatawa12 <anatawa12@icloud.com>
* bump summaly to v5.2.0
* update tabler-icons to v3.30.0-based
---------
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Co-authored-by: anatawa12 <anatawa12@icloud.com>
2025-02-15 10:24:22 +09:00
Hazelnoot
7e1b4b259a
Merge branch 'develop' into merge/2024-02-03
...
# Conflicts:
# packages/backend/src/server/ActivityPubServerService.ts
# pnpm-lock.yaml
2025-02-08 13:16:37 -05:00