Hazelnoot
3eeb53ff63
Merge branch 'misskey-develop' into merge/2025-03-24
...
# Conflicts:
# package.json
# packages/backend/src/core/AccountMoveService.ts
# packages/frontend/src/components/MkDateSeparatedList.vue
# packages/misskey-js/etc/misskey-js.api.md
# pnpm-lock.yaml
2025-04-03 22:06:37 -04:00
anatawa12
cab82452ec
Copy role on move ( #15745 )
...
* feat(backend): copyOnMoveAccount
* feat(endpoints): copyOnMoveAccount
* feat(frontend): copyOnMoveAccount
* docs(changelog): アカウントのマイグレーション時に古いアカウントからロールをコピーできるようになりました。
* fix: spdx header for migration
* Update locales/ja-JP.yml
* copyOnMoveAccount -> preserveAssignmentOnMoveAccount
* fix: check for preserveAssignmentOnMoveAccount
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2025-04-03 19:22:49 +09:00
かっこかり
e07bb1dcbc
fix: チャット周りの修正 ( #15741 )
...
* fix(misskey-js): チャットのChannel型定義を追加
* fix(backend); canChatで塞いでいない書き込み系のAPIを塞ぐ
* fix(frontend): チャット周りのフロントエンド型修正
* lint fix
* fix broken lockfile
* fix
* refactor
* wip
* wip
* wip
* clean up
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2025-04-03 15:28:10 +09:00
Hazelnoot
dab9b518e4
merge from misskey-develop
2025-04-02 22:29:14 -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
zyoshoka
0bf49818c4
enhance: implement sentryForFrontend ( #15433 )
...
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2025-04-02 15:44:04 +09:00
anatawa12
55d835ad51
Fix: 通知のページネーションで2つ以上読み込めなくなることがある問題 ( #15277 )
...
* fix: notifications-groupedのinclude/exclude typesに:groupedを指定できてしまう問題
* refactor: 通知の取得処理を Notification Service に移動
* feat: add function to parse additional part of id
* fix: 通知のページネーションが正しく動かない問題
Redisにのページネーションで使用する時間及びidとRedis上のものが混同されていたので、Misskeyが生成するものに寄せました。
* pnpm run build-misskey-js-with-types
* chore: XADDをretryするように
* fix: notifications-groupedでxrevrangeしているのを消し忘れていた
2025-04-02 10:37:16 +09:00
Hazelnoot
59ce4d6c28
regenerate misskey-js
2025-03-31 14:30:29 -04:00
Hazelnoot
4ae26e6e18
Merge branch 'misskey-develop' into merge/2025-03-24
2025-03-30 01:58:17 -04:00
syuilo
dec3e86e5e
enhance(backend): アカウントでチャットが有効になっているかどうかをユーザーのレスポンスに含めるように
2025-03-28 10:48:03 +09:00
Hazelnoot
949baa9b8b
Revert "feat: google analytics ( #15451 )"
...
This reverts commit 2b6638e1
2025-03-25 17:30:28 -04:00
Hazelnoot
40975719ec
Merge branch 'misskey-develop' into merge/2025-03-24
...
# Conflicts:
# package.json
# packages/backend/src/core/entities/NotificationEntityService.ts
# packages/backend/src/types.ts
# packages/frontend/src/pages/admin/modlog.ModLog.vue
# packages/misskey-js/src/consts.ts
# packages/misskey-js/src/entities.ts
2025-03-25 16:17:34 -04:00
Hazelnoot
d8908ef2d8
merge upstream
2025-03-25 16:14:53 -04:00
syuilo
98554579ea
enhance: チャットのリアクションを削除できるように
2025-03-25 16:09:19 +09:00
syuilo
a01ae38a07
enhance: モデレーターがチャットルームの内容を確認・削除できるように
2025-03-25 15:51:45 +09:00
syuilo
304d0eb83b
enhance: チャットルームに招待されたときの通知を追加
2025-03-25 15:25:43 +09:00
syuilo
c51e862b7d
enhance: 送信したチャットルームへの招待を確認できるように
2025-03-25 13:41:12 +09: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
a35c2f214b
convert Authorized Fetch to a setting and add support for hybrid mode (essential metadata only)
2025-03-16 10:07:57 -04:00
Marie
40599190f7
add: libretranslate
2025-03-06 01:03:02 +01:00
Hazelnoot
9fdb68d568
remove fileId from importCustomEmojis log
2025-03-02 13:47:02 -05:00
Hazelnoot
86a7d33f3f
fix rebase error
2025-03-02 13:46:28 -05:00
Hazelnoot
e030facaa9
don't record deleted note, flash, page, or gallery post in modlog
2025-03-02 13:38:35 -05:00
Hazelnoot
c44c59e9ae
remove embedded Note from "createPromo" mod logs
2025-03-02 13:38:32 -05:00
Hazelnoot
27d43879a2
add moderation logs for many endpoints
...
- `/admin/delete-all-files-of-a-user`
- `/admin/nsfw-user`
- `/admin/unnsfw-user`
- `/admin/silence-user`
- `/admin/unsilence-user`
- `/admin/accounts/create`
- `/admin/drive/clean-remote-files`
- `/admin/drive/cleanup`
- `/admin/emoji/set-category-bulk`
- `/admin/emoji/set-license-bulk`
- `/admin/emoji/set-aliases-bulk`
- `/admin/emoji/add-aliases-bulk`
- `/admin/emoji/remove-aliases-bulk`
- `/admin/emoji/import-zip`
- `/admin/federation/delete-all-files`
- `/admin/federation/remove-all-following`
- `/admin/promo/create`
- `/admin/relay/add`
- `/admin/relay/remove`
2025-03-02 13:38:02 -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
syuilo
2b6638e160
feat: google analytics ( #15451 )
...
* wip backend
* wip frontend
* build misskey-js
* implement control panel
* fix
* introduce analytics wrapper
* spdx
* Update analytics.ts
* Update common.ts
* wip
* wip
* wip
* wip
* wip
* Update CHANGELOG.md
---------
Co-authored-by: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
2025-02-25 11:51:23 +00:00
Hazelnoot
3642ea022b
disable inline note previews from users with quotes disabled
2025-02-20 21:34:09 -05:00
Hazelnoot
f39f47aade
include rejectQuotes on all packed User entities
2025-02-20 21:12:12 -05:00
Hazelnoot
b9b339fd48
add admin/reject-quotes to new endpoints list
2025-02-20 09:58:19 -05:00
Hazelnoot
292d3b9229
add "reject quotes" toggle at user and instance level
...
+ improve, cleanup, and de-duplicate quote resolution
+ add warning message when quote cannot be loaded
+ add "process error" framework to display warnings when a note cannot be correctly loaded from another instance
2025-02-20 09:57:48 -05:00
Hazelnoot
ec0b2933e6
add admin/cw-user to new endpoints list
2025-02-16 19:22:55 -05:00
Hazelnoot
c5933f369e
move mandatoryCW from admin-user to PackedUserLite (public field)
2025-02-16 19:20:41 -05:00
Hazelnoot
568d82a974
record ModLog entry when setting a user's content warning
2025-02-16 19:20:41 -05:00
Hazelnoot
4f79f85703
fix TypeScript errors in modlog.MogLog.vue
2025-02-16 19:20:41 -05:00
Hazelnoot
ea89348b62
add user-level "force content warning" moderation feature
2025-02-16 19:20:37 -05:00
Hazelnoot
c67d985254
Merge branch 'develop' into merge/2024-02-03
...
# Conflicts:
# packages/backend/src/core/SearchService.ts
# packages/misskey-js/src/autogen/types.ts
2025-02-14 23:48:36 -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
c8bb7b9816
fix error when searching without a specified host
2025-02-13 17:40:32 -05:00
Hazelnoot
667262dcfb
Merge branch 'develop' into merge/2024-02-03
...
# Conflicts:
# locales/index.d.ts
# packages/backend/src/core/SearchService.ts
# packages/frontend/src/pages/search.note.vue
# packages/misskey-js/src/autogen/types.ts
# sharkey-locales/en-US.yml
2025-02-13 17:04:50 -05:00
Hazelnoot
ed981a6970
add new note search file types (module, flash) and optimize file type query
2025-02-13 09:28:46 -05:00
Hazelnoot
feb80ee992
Merge branch 'develop' into merge/2024-02-03
2025-02-11 10:52:52 -05:00
Hazelnoot
363111f5de
Merge branch 'develop' into merge/2024-02-03
...
# Conflicts:
# locales/index.d.ts
# packages/backend/src/server/api/EndpointsModule.ts
# packages/backend/src/server/api/endpoints.ts
# packages/misskey-js/src/autogen/endpoint.ts
# sharkey-locales/en-US.yml
2025-02-10 23:34:52 -05:00
lqvp
e339293673
feat: アクセストークン発行時に通知するように ( #15422 )
...
* feat: アクセストークン発行時に通知するように (misskey-dev/misskey#13353 )
* fix: 不要な翻訳を削除/インデントを揃えるように
* chore(backend): 不要なawaitを削除
* chore: changelogへ追加
2025-02-11 01:15:33 +00:00
Hazelnoot
5276d6024d
merge: Cleanup and bulk fixes to Mastodon API ( resolves #495 , #509 , #707 , #714 , #721 , #804 , #811 , #865 , and partially #492 ) ( !879 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/879
Closes #495 , #509 , #707 , #714 , #721 , #804 , #811 , #865 , and #492
Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
2025-02-10 16:28:32 +00:00
zyoshoka
dc608aada0
fix(backend): correct admin/meta response schema ( #15434 )
2025-02-09 07:17:48 +00:00
Hazelnoot
7a8abbba6a
regenerate misskey-js
2025-02-08 13:19:29 -05:00
Hazelnoot
f36029f795
Merge branch 'develop' into merge/2024-02-03
...
# Conflicts:
# locales/index.d.ts
# packages/backend/src/core/entities/UserEntityService.ts
# packages/frontend/src/_dev_boot_.ts
# packages/misskey-js/src/autogen/types.ts
# sharkey-locales/en-US.yml
2025-02-07 11:57:44 -05:00
Marie
c889948f95
feat: Add generation of keys to admin page
2025-02-07 06:00:49 +01:00
Hazelnoot
c8f8a61a00
add MiUserProfile.defaultCWPriority property and API
2025-02-05 14:22:50 -05:00