Commit Graph

273 Commits

Author SHA1 Message Date
mattyatea 833031ee60 Merge remote-tracking branch 'refs/remotes/misskey-original/develop' into develop
# Conflicts:
#	packages/backend/src/core/QueueModule.ts
#	packages/backend/src/core/QueueService.ts
#	packages/backend/src/core/chart/charts/federation.ts
#	packages/backend/src/models/RepositoryModule.ts
#	packages/backend/src/models/_.ts
#	packages/backend/src/queue/types.ts
#	packages/backend/src/server/api/EndpointsModule.ts
#	packages/backend/src/server/api/endpoints.ts
#	packages/backend/src/server/api/endpoints/admin/queue/stats.ts
#	packages/backend/src/server/api/endpoints/users/report-abuse.ts
#	packages/backend/src/server/web/ClientServerService.ts
#	packages/frontend/src/components/MkButton.vue
#	packages/frontend/src/components/MkChannelFollowButton.vue
#	packages/frontend/src/components/MkClickerGame.vue
#	packages/frontend/src/components/MkSwitch.vue
2024-06-12 14:14:45 +09:00
おさむのひと 61fae45390
feat: 通報を受けた際にメールまたはWebhookで通知を送出出来るようにする (#13758)
* feat: 通報を受けた際にメールまたはWebhookで通知を送出出来るようにする

* モデログに対応&エンドポイントを単一オブジェクトでのサポートに変更(API経由で大量に作るシチュエーションもないと思うので)

* fix spdx

* fix migration

* fix migration

* fix models

* add e2e webhook

* tweak

* fix modlog

* fix bugs

* add tests and fix bugs

* add tests and fix bugs

* add tests

* fix path

* regenerate locale

* 混入除去

* 混入除去

* add abuseReportResolved

* fix pnpm-lock.yaml

* add abuseReportResolved test

* fix bugs

* fix ui

* add tests

* fix CHANGELOG.md

* add tests

* add RoleService.getModeratorIds tests

* WebhookServiceをUserとSystemに分割

* fix CHANGELOG.md

* fix test

* insertOneを使う用に

* fix

* regenerate locales

* revert version

* separate webhook job queue

* fix

* 🎨

* Update QueueProcessorService.ts

---------

Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-06-08 15:34:19 +09:00
mattyatea 176e1f9032 Merge remote-tracking branch 'refs/remotes/misskey-original/develop' into develop
# Conflicts:
#	package.json
2024-05-31 21:25:25 +09:00
github-actions[bot] 6078081c33 [skip ci] Release: 2024.5.0 2024-05-31 12:24:53 +00:00
mattyatea 249ac30fd1 Merge remote-tracking branch 'refs/remotes/misskey-original/release/2024.5.0' into develop
# Conflicts:
#	package.json
2024-05-31 21:20:28 +09:00
github-actions[bot] a59aa20be8 Bump version to 2024.5.0-rc.13 2024-05-31 12:18:52 +00:00
mattyatea e86e8f6aa6 Merge remote-tracking branch 'refs/remotes/misskey-original/develop' into develop
# Conflicts:
#	README.md
#	packages/backend/src/core/entities/AbuseUserReportEntityService.ts
#	packages/frontend/src/pages/admin/moderation.vue
2024-05-31 21:18:45 +09:00
syuilo 61eec93f4e Revert "2024.5.0"
This reverts commit 27d1b7e615.
2024-05-31 21:16:35 +09:00
syuilo 27d1b7e615 2024.5.0 2024-05-31 21:09:19 +09:00
github-actions[bot] 316d192bc0 Bump version to 2024.5.0-rc.12 2024-05-31 12:05:47 +00:00
github-actions[bot] 46164f879b Bump version to 2024.5.0-rc.11 2024-05-31 11:20:13 +00:00
github-actions[bot] 374c8791d7 Bump version to 2024.5.0-rc.10 2024-05-31 11:13:42 +00:00
github-actions[bot] dc55adbaf7 Bump version to 2024.5.0-rc.9 2024-05-31 07:06:41 +00:00
github-actions[bot] 1e007b63aa Bump version to 2024.5.0-rc.8 2024-05-31 04:38:45 +00:00
syuilo a0c596b030
Merge branch 'develop' into release/2024.5.0 2024-05-31 13:28:25 +09:00
syuilo eaa85f5aa3 fix test 2024-05-31 13:28:11 +09:00
syuilo dfeaa1145b
Merge branch 'develop' into release/2024.5.0 2024-05-31 13:19:49 +09:00
syuilo be11fd7508 enhance: サーバーのお問い合わせ先URLを設定できるように 2024-05-31 10:12:23 +09:00
zyoshoka eaadd643eb
chore(misskey-js): fix `repository` and add `license` in `package.json` (#13902) 2024-05-29 20:57:48 +09:00
mattyatea 07b4338eff Merge remote-tracking branch 'refs/remotes/misskey-original/develop' into develop
# Conflicts:
#	packages/frontend/src/cache.ts
#	packages/frontend/src/pages/admin/index.vue
#	packages/frontend/src/pages/settings/general.vue
#	packages/frontend/src/pages/timeline.vue
2024-05-29 01:21:44 +09:00
github-actions[bot] f75e46752e Bump version to 2024.5.0-rc.7 2024-05-28 09:18:21 +00:00
github-actions[bot] 244adef70e Bump version to 2024.5.0-rc.6 2024-05-28 09:18:05 +00:00
github-actions[bot] 4704dfe061 Bump version to 2024.5.0-beta.5 2024-05-27 12:00:25 +00:00
syuilo d3b969306c
Merge branch 'develop' into release/2024.5.0 2024-05-27 20:55:49 +09:00
anatawa12 4579be0f54
新着ノートをサウンドで通知する機能をdeck UIに追加 (#13867)
* feat(deck-ui): implement note notification

* chore: remove notify in antenna

* docs(changelog): 新着ノートをサウンドで通知する機能をdeck UIに追加

* fix: type error in test

* lint: key order

* fix: remove notify column

* test: remove test for notify

* chore: make sound selectable

* fix: add license header

* fix: add license header again

* Unnecessary await

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

* ファイルを選択してください -> ファイルが選択されていません

* fix: i18n忘れ

* fix: i18n忘れ

* pleaseSelectFile > fileNotSelected

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
2024-05-27 20:54:53 +09:00
github-actions[bot] e50107792c Bump version to 2024.5.0-beta.4 2024-05-27 08:37:07 +00:00
syuilo 579b88adc7
Merge branch 'develop' into release/2024.5.0 2024-05-27 17:28:08 +09:00
github-actions[bot] 140df4b5e0 Bump version to 2024.5.0-beta.3 2024-05-27 08:27:39 +00:00
かっこかり 3ffbf6296f
feat: 個別のお知らせにリンクで飛べるように (#13885)
* feat(announcement): 個別のお知らせにリンクで飛べるように (MisskeyIO#639)

(cherry picked from commit f6bf7f992a78e54d86a4701dbd1e4fda7ef4eb27)

* fix

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

* fix

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

* 一覧ページではお知らせpanel全体を押せるように

* お知らせバーは個別ページに飛ばすように

* Update Changelog

* spdx

* attempt to fox test

* remove unnecessary thong

* `announcement` → `announcements/show`

* リンクを押せる場所をタイトルと日付部分のみに変更

---------

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
2024-05-27 17:15:11 +09:00
mattyatea 6445591350 Merge remote-tracking branch 'refs/remotes/github-prismisskey/develop' into develop
# Conflicts:
#	locales/index.d.ts
#	packages/frontend/src/components/MkPostForm.vue
#	pnpm-lock.yaml
2024-05-25 01:18:55 +09:00
かっこかり e0b47999fa
fix(backend): `read:admin:show-user` と `read:admin:show-users` を統合 (#13798)
* fix(frontend): 同じdisplayNameの権限があるのを修正

* read:admin:show-user と read:admin:show-users を統合

* Update Changelog
2024-05-23 17:29:59 +09:00
anatawa12 83a9aa4533
feat: suspend instance improvements (#13861)
* feat(backend): dead instance detection

* feat(backend): suspend type detection

* feat(frontend): show suspend reason on frontend

* feat(backend): resume federation automatically if the server is automatically suspended

* docs(changelog): 配信停止まわりの改善

* lint: fix lint errors

* Update packages/frontend/src/pages/instance-info.vue

* lint: fix lint error

* chore: suspendedState => suspensionState

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-05-23 15:55:47 +09:00
github-actions[bot] 8489d39372 Bump version to 2024.5.0-beta.2 2024-05-23 05:25:01 +00:00
syuilo 4a3c01d198
Merge branch 'develop' into release/2024.5.0 2024-05-21 17:37:35 +09:00
anatawa12 f6df94070b
Exclude channel notes from featured polls (#13838)
* feat(backend): add `channelId` to `MiPoll` as a Denormalized field

* feat(backend): option to exclude polls in channels

* chore: exclude channel notes from featured polls

* docs(changelog): みつけるのアンケート欄にてチャンネルのアンケートが含まれてしまう問題を修正

* fix: missing license header
2024-05-20 18:08:20 +09:00
tamaina 0fd06e3f0d fix 2024-05-07 11:07:16 +09:00
github-actions[bot] 313515c681 Bump version to 2024.5.0-beta.1 2024-05-07 01:45:00 +00:00
tamaina 455543b36e change package.json 2024-05-06 21:36:05 +09:00
mattyatea 07070305c0 Merge remote-tracking branch 'refs/remotes/misskey-original/develop' into develop
# Conflicts:
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/components/MkPostFormDialog.vue
#	pnpm-lock.yaml
2024-05-04 23:23:16 +09:00
syuilo 2b21c19362
update deps (#13624)
* update deps

* Update package.json

* update deps

* build: pass --strip-leading-paths to restore 0.2.x behavior (#13684)

* ✌️

* ✌️

* pureimageの代わりに@napi-rs/canvasを使う (#13748)

* pureimageの代わりに@napi-rs/canvasを使う

* remove writestream

* remove createtemp

* wip

* Update ClientServerService.ts

* update pnpm to 9.x

* update deps

* re: update pnpm to 9.x

* update node

* ✌️

---------

Co-authored-by: anatawa12 <anatawa12@icloud.com>
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
2024-05-04 20:56:14 +09:00
mattyatea 1a8d91355d Merge remote-tracking branch 'refs/remotes/misskey-original/develop' into develop
# Conflicts:
#	packages/frontend/src/components/MkAbuseReport.vue
#	packages/frontend/src/components/MkMention.vue
#	packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
2024-05-01 04:11:08 +09:00
zyoshoka 2ff90a80d4
fix(backend): add detailed schema to `fetch-rss` endpoint (#13764) 2024-04-29 15:36:01 +09:00
mattyatea 41e735906a Merge remote-tracking branch 'refs/remotes/misskey-original/develop' into develop
# Conflicts:
#	packages/frontend/src/components/MkFollowButton.vue
2024-04-24 03:50:09 +09:00
おさむのひと cd7f7271ca
enhance: 新しいコンディショナルロール条件の実装 (#13732)
* enhance: 新しいコンディショナルロールの実装

* fix: CHANGELOG.md
2024-04-19 15:22:23 +09:00
mattyatea 88122a3d9d Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	packages/frontend/src/components/MkPostForm.vue
2024-04-14 21:54:44 +09:00
かっこかり bba3097765
enhance: クリップのノート数を表示するように (#13686)
* enhance: クリップのノート数を表示できるように

* Update Changelog
2024-04-14 21:30:24 +09:00
mattyatea 04fae906c9 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	packages/backend/src/models/Meta.ts
#	packages/backend/src/server/api/endpoints/admin/meta.ts
#	packages/backend/src/server/api/endpoints/admin/update-meta.ts
#	packages/frontend/src/components/MkButton.vue
#	packages/frontend/src/components/MkMenu.vue
#	packages/frontend/src/components/MkNote.vue
#	packages/frontend/src/components/MkNoteDetailed.vue
#	packages/frontend/src/components/MkSwitch.button.vue
#	packages/frontend/src/pages/settings/general.vue
2024-04-01 15:32:52 +09: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
かっこかり 8f415d69cd
fix(generator): APIクライアントのパスにoperationIdが使われる問題を修正 (#13622) 2024-03-25 12:11:10 +09:00