mattyatea
d2a02da432
Merge remote-tracking branch 'misskey-original/develop' into develop
2024-03-18 15:10:24 +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
mattyatea
ad0265dcd0
Merge remote-tracking branch 'misskey-original/develop' into develop
2024-03-12 23:21:16 +09:00
yupix
6b676a928d
enhance(backend): antennas/updateの必須項目をantennaIdのみに ( #13542 )
...
* refactor: antennas/updateの必須項目を最小限に
* fix: userListIdがnullにできない
2024-03-10 17:31:39 +09:00
mattyatea
c2aba3886a
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/frontend/src/components/MkNote.vue
2024-03-09 20:49:56 +09:00
かっこかり
7ead98cbe5
enhance(frontend): リアクションの総数を表示するように ( #13532 )
...
* enhance(frontend): リアクションの総数を表示するように
* Update Changelog
* リアクション選択済の色をaccentに
2024-03-06 21:08:42 +09:00
mattyatea
1947a53af6
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# README.md
# locales/en-US.yml
# locales/index.d.ts
# locales/ja-JP.yml
# package.json
# packages/backend/src/core/CustomEmojiService.ts
# packages/backend/src/core/NoteCreateService.ts
# packages/backend/src/core/RoleService.ts
# packages/backend/src/core/activitypub/models/ApNoteService.ts
# packages/backend/src/core/activitypub/models/ApPersonService.ts
# packages/backend/src/server/api/endpoints/admin/emoji/update.ts
# packages/frontend/src/components/MkDialog.vue
# packages/frontend/src/components/MkEmojiPicker.section.vue
# packages/frontend/src/components/MkEmojiPicker.vue
# packages/frontend/src/components/global/MkCustomEmoji.vue
# packages/frontend/src/const.ts
# packages/frontend/src/os.ts
# packages/frontend/src/pages/admin/roles.editor.vue
# packages/frontend/src/pages/admin/roles.vue
# packages/frontend/src/pages/admin/security.vue
# pnpm-lock.yaml
2024-03-05 16:38:19 +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
かっこかり
39d6af135f
enhance: 通知の履歴をリセットできるように ( #13335 )
...
* enhance: 通知の履歴をリセットできるように
* Update Changelog
* 通知欄も連動して更新するように
* revert some changes
* Update CHANGELOG.md
* Remove unused part
* fix
2024-02-29 20:03:30 +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 421f8d49e5d7a8dc3a798cc54716c767df8be3cb)
* Update Changelog
* Update CHANGELOG.md
* enhance: 通知がミュートを考慮するようにする
* enhance: 通知が凍結も考慮するようにする
* fix: notifierIdがない通知が消えてしまう問題
* Add tests (通知がミュートを考慮しているかどうか)
* fix: notifierIdがない通知が消えてしまう問題 (grouped)
* Remove unused import
* Fix: typo
* Revert "enhance: 通知が凍結も考慮するようにする"
This reverts commit b1e57e571d
.
* 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 239a6952f7
.
* 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 22e2324f96
.
* 🎨
* 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
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
かっこかり
d20542c495
enhance: meta
をSSR HTMLに埋め込む ( #13436 )
...
* enhance: `meta`をSSR HTMLに埋め込む
* HTML Metaの有効時間を指定
* 1時間
* MetaEntityService
* JSONをPackするように
* ✌️
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-02-23 10:47:17 +09: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
syuilo
26c8b53f70
enhance: サーバーごとにモデレーションノートを残せるように
2024-02-22 20:59:52 +09:00
mattyatea
69c16f036c
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# locales/index.d.ts
# locales/ja-JP.yml
# package.json
# packages/frontend/src/pages/about.vue
# packages/frontend/src/scripts/get-note-menu.ts
2024-02-17 13:45:01 +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
mattyatea
2b52a215e5
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/backend/src/core/QueueService.ts
# packages/frontend/src/components/global/MkPageHeader.vue
# packages/frontend/src/pages/admin/index.vue
# packages/frontend/src/pages/clicker.vue
# packages/frontend/src/pages/my-lists/index.vue
# packages/frontend/src/pages/notifications.vue
# packages/frontend/src/pages/settings/emoji-picker.vue
# packages/frontend/src/pages/settings/mute-block.vue
# packages/frontend/src/pages/timeline.vue
# packages/frontend/src/ui/universal.vue
# pnpm-lock.yaml
2024-02-16 19:40:51 +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
mattyatea
5812b15cbd
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/backend/src/core/QueueService.ts
# packages/frontend/src/components/global/MkFooterSpacer.vue
2024-02-13 05:48:07 +09:00
Kisaragi
b95e25004f
refactor(msjs): avoid any (part 1) ( #13247 )
...
* refactor(msjs): avoid any
* run api extractor
---------
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Co-authored-by: kakkokari-gtyih <daisho7308+f@gmail.com>
2024-02-12 11:38:16 +09:00
mattyatea
dfd491ff85
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/backend/src/server/api/endpoints/notes/create.ts
# packages/frontend/src/components/MkEmojiPicker.vue
# packages/frontend/src/components/MkTimeline.vue
# packages/frontend/src/pages/settings/theme.vue
2024-02-09 10:14:24 +09:00
おさむのひと
614c9a0fc6
fix: 特定文字列を含むノートを投稿できないようにする管理画面用設定項目を追加 ( #13210 )
...
* fix: 特定文字列を含むノートを投稿できないようにする管理画面用設定項目を追加
* Serviceでチェックするように変更
2024-02-09 10:07:18 +09:00
おさむのひと
c81b61eb2e
fix(misskey-js): 自動生成物の冒頭からバージョンと日付を削除 ( #13185 )
2024-02-06 21:03:29 +09:00
1Step621
74245df382
Enhance(frontend): フロント側でもリアクション権限のチェックをするように ( #13134 )
...
* フロント側でもリアクション権限のチェックをするように
* update CHANGELOG.md
* lint fixes
* remove unrelated diffs
* deny -> reject
denyは「(信用しないことを理由に)拒否する」という意味らしい
* allow -> accept
* EmojiSimpleにlocalOnlyを含めるように
* リアクション権限のない絵文字は打てないように(ダイアログを出すのではなく)
* regenerate type definitions
* lint fix
* remove unused locales
* remove unnecessary async
2024-02-06 16:45:21 +09:00
mattyatea
e4fe534dc6
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/backend/src/core/activitypub/models/ApPersonService.ts
2024-02-05 13:55:26 +09:00
Gianni Ceccarelli
dabf1867fd
keep cached avatar&banner when refresh fails to get new values ( #13145 )
...
* keep cached avatar&banner when refresh fails to get new values
when the remote explicitly tells us a user image is gone, we remove
our cached value, but if we fail to get the image, we keep whatever
value we already have
this should minimise the problem of avatars randomly disappearing
* autogen bits
* pnpm run build-misskey-js-with-types
---------
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
2024-02-04 21:03:49 +09:00
Gianni Ceccarelli
bafef1f8b4
ignore instance.actor
when checking if there are local users ( #13146 )
...
* ignore `instance.actor` when checking if there are local users
We've seen this happen a few times:
* there was some AP software at $some_domain
* it gets replaced by Misskey
* before the first user can be created, an AP activity comes in
* Misskey resolves the activity
* to do this, it creates the `instance.actor` to sign its request
* now there *is* a local user, so the `meta` endpoint returns
`requireSetup:false`
* the admin is very confused
This commit factors out the check, and doesn't count the
`instance.actor` as a real user.
* autogen bits
2024-02-04 20:46:28 +09:00
mattyatea
942b7f1b3c
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/backend/src/server/api/endpoints.ts
# packages/frontend/src/components/MkButton.vue
# packages/frontend/src/components/MkDrive.vue
# packages/frontend/src/components/MkEmojiPicker.section.vue
# packages/frontend/src/components/MkEmojiPicker.vue
# packages/frontend/src/components/MkFoldableSection.vue
# packages/frontend/src/components/MkInput.vue
# packages/frontend/src/components/MkMenu.vue
# packages/frontend/src/components/MkNote.vue
# packages/frontend/src/components/MkPostForm.vue
# packages/frontend/src/components/MkSignupDialog.form.vue
# packages/frontend/src/components/MkSwitch.button.vue
# packages/frontend/src/components/MkTab.vue
# packages/frontend/src/components/MkTimeline.vue
# packages/frontend/src/components/MkUserSelectDialog.vue
# packages/frontend/src/components/global/MkCustomEmoji.vue
# packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
# packages/frontend/src/os.ts
# packages/frontend/src/pages/admin/index.vue
# packages/frontend/src/pages/user/home.vue
# packages/frontend/src/ui/universal.vue
2024-01-31 19:51:51 +09:00
zyoshoka
2db5b61616
refactor(backend): User関連のスキーマ/型の指定を強くする ( #12808 )
...
* refactor(backend): User関連のスキーマ/型の指定を強くする
* refactor(backend): `pack()`の引数にスキーマを指定するように
* chore: fix ci
* fix: 変更漏れ
* fix ci
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2024-01-31 15:45:35 +09:00
かっこかり
6a41afaaee
fix/refactor(reversi): 既存のバグを修正・型定義を強化 ( #13105 )
...
* 既存のバグを修正
* fix types
* fix misskey-js autogen
* Update index.d.ts
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2024-01-30 20:54:30 +09:00
yukineko
a6a91fec3a
refactor: frontendのcomponentsの型エラーを改善 ( #12926 )
...
* add: safeFloatParserを追加
* fix: 欠けていた型を追加
* refactor: pageBlockTypesをjson-schemaに移植
* refactor: components/global内の型エラーが出ている箇所を修正
* lint: fix null check style
* refactor: fix type error
* refactor: fix some type errors
* fix: 翻訳が抜けていた箇所を修正
* refactor: getJsonSchemaで正しいスキーマが返されるように修正
* fix: MkChartの型エラーとbytesオプションが機能していない問題を修正
* fix(misskey-js): `drive`->`folderUpdated`のpayloadの型が間違っていたのを修正
* refactor: fix some type errors
* change: Captcha読み込み中の文言をLoadingに変更
* refactor(backend/misskey-js): MainEventの型を改善
* refactor: chartjs-plugin-gradientが二重でpluginに登録されていたのを修正
* update: misskey-js.api.md
* refactor: fix some type errors
* fix: backendのtypecheckが落ちていたのを修正
* update: misskey-js.api.md
* add: json-schemaのnoteにpollの型定義を追加
* refactor: noteのjson-schemaの型を改善
* refactor: MkPoll
* refactor: fix some type errors
* change: UserLiteにisLockedを持たせるように
* fix: notificationスキーマにroleが含まれていないのを修正
* Revert "change: UserLiteにisLockedを持たせるように"
This reverts commit 1bb0c8e7a9
.
* fix: フォロー通知から鍵垢へのフォローを行うと処理中のまま止まってしまう問題を修正
* refactor: noteスキーマのvisibilityにenumを追加
* change: deepCloneのCloneableTypeにundefinedを追加
* refactor: fix some type errors
* refactor: `allowEmpty: false`を使用していた箇所を`minLength: 1`に置き換え
* enhance: API 'retension' のresponseの型を追加
* fix: Chart関連のtooltipが正しい位置に表示されない問題を修正
* refactor: fix some type errors
* fix: 型情報が不足していたのを修正
* enhance: announcementスキーマにenumを追加
* enhance: ロールポリシーの型定義をRoleServiceからjson-schemaに移植
* refactor: policiesを`ref: RolePolicies`に統一
* fix: API `meta` のレスポンスの型にpoliciesが含まれていないのを修正
* refactor: fix some type errors
* fix: backendのlintが落ちているのを修正
* fix: MkFoldableSectionの開閉時のanimationが適用されていない問題を修正
* fix: backendのtypecheckが落ちているのを修正
* update: run build-misskey-js-with-types
* fix: MkDialogのmount時に文字数制限の判定が行われない問題を修正
* update: CHANGELOG.md
* refactor: MkUserSelectDialogの型を改善
* fix: deepCloneでundefinedはcloneしないように (#9207 )
* change: frontendのcloneをbackend側にも反映
* update: CHANGELOG.md
* fix: RoleServiceからPackを通して型RolePoliciesに依存させないように
* Update packages/frontend/src/scripts/get-note-summary.ts
* revert RoleService.ts changes
* change: optional chaining -> non-null assertion
* remove: unused import
* fix: propsで渡されたuserがUserLiteの場合に意図しない動作になってしまうのを修正
* change: fix null check style
* refactor: fix type error
* change: fix null check style
* Update packages/frontend/src/components/MkDrive.vue
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
* refactor: css moduleでglobalを使わないように
* refactor: roleのiconUrlは必ず存在するものとして扱うように
* enhance: MenuButtonのactiveにcomputedを受け付けられるように
* Update packages/frontend/src/components/MkNotePreview.vue
* Update MkWindow.vue
* refactor: notification.noteは必ず存在するものとして扱うように
* Update packages/frontend/src/components/MkNotification.vue
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
* fix: MkSignupDialogでdoneのemit時にresを含んでいなかったのを修正
* Update packages/frontend/src/scripts/clone.ts
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
* refactor: 不要な返り値の型を削除
* refactor: 不要なnullチェックを削除
* update: misskey-js-autogen
* update: clone.ts
* refactor
* Update MkNotification.vue
* Update MkNotification.vue
* ✌️
* Update MkNotification.vue
* Update MkNotification.vue
* Update MkNotification.vue
* Update MkNotifications.vue
* Update MkUserSetupDialog.Profile.vue
* Update MkUserCardMini.vue
* ✌️
* Update MkMenu.vue
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2024-01-30 19:53:53 +09:00
mattyatea
79d2b6fe9e
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
2024-01-24 16:40:37 +09:00
syuilo
5719a929ad
enhance(reversi): 変則なしマッチングを可能に
2024-01-24 16:37:06 +09:00
syuilo
65557d5f27
enhance(reversi): more robust matching process
2024-01-24 10:16:05 +09:00
mattyatea
78a34d3de3
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/frontend/src/components/MkEmojiEditDialog.vue
# packages/frontend/src/components/MkMenu.vue
# packages/frontend/src/components/MkNote.vue
# packages/frontend/src/pages/timeline.vue
2024-01-23 12:38:56 +09:00
syuilo
e8ba0b3f54
enhance(reversi): improve desync handling
2024-01-23 10:51:59 +09:00
おさむのひと
850d38414e
fix: 2024-01-22 10:50時点のdevelopにてCIがコケている ( #13060 )
...
* fix: バブルゲームのビルド失敗修正
* fix: api.jsonの定義誤りを修正
* fix: lint.yml(typecheck)
* fix: fix eslint error
* fix: frontend vitest version
* fix: frontend vitest version
* fix:
* fix: cypress
* fix: misskey-js test
* fix: misskey-js tsd(tsdはpakcage.jsonのexportsをサポートしない?)
* fix: conflict
* fix: 間違えて上書きしたところを修正
* fix: 再
* fix: api.json
* fix: api.json
* fix: タイムアウト延長
* Update packages/misskey-js/jest.config.cjs
Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
2024-01-22 18:01:54 +09:00
syuilo
94e282b612
perf(reversi): improve performance of reversi backend
2024-01-22 15:41:29 +09:00
mattyatea
6390977653
Merge remote-tracking branch 'misskey-original/develop' into develop
2024-01-21 13:44:29 +09:00
syuilo
a17251d913
enhance(reversi): tweak reversi
2024-01-21 10:07:43 +09:00
mattyatea
f6d3fde92d
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# locales/index.d.ts
# packages/backend/src/models/RepositoryModule.ts
# packages/backend/src/models/_.ts
# packages/frontend/src/components/MkDrive.vue
# packages/frontend/src/components/MkEmojiEditDialog.vue
# packages/frontend/src/components/MkFollowButton.vue
# packages/frontend/src/components/MkSignupDialog.form.vue
# packages/frontend/src/components/MkUserSelectDialog.vue
# packages/frontend/src/components/index.ts
# packages/frontend/src/os.ts
# packages/frontend/src/pages/avatar-decorations.vue
# packages/frontend/src/pages/settings/mute-block.word-mute.vue
# packages/frontend/src/pages/user/home.vue
# packages/misskey-bubble-game/src/monos.ts
2024-01-20 14:54:06 +09:00
syuilo
cb74b61755
fix api-extractor
2024-01-20 14:01:27 +09:00
syuilo
1de29e5566
refactor: migrate to ESM
2024-01-20 13:57:03 +09:00
syuilo
b9a81edae5
enhance(reversi): tweak reversi
2024-01-20 13:14:46 +09:00
syuilo
a637b4e282
feat: reversi
...
Resolve #12962
2024-01-19 20:51:49 +09:00
mattyatea
8205e30311
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/backend/src/core/QueryService.ts
# packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts
# packages/backend/src/server/api/endpoints/hashtags/users.ts
# packages/backend/src/server/api/endpoints/notes/create.ts
# packages/frontend/src/pages/emojis.emoji.vue
2024-01-15 23:20:00 +09:00