mattyatea
e90fda3386
Fix
2024-06-12 16:02:42 +09:00
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
Acid Chicken
2b8056a852
fix(backend): use insertOne insteadof insert/findOneOrFail combination ( #13908 )
...
* fix(backend): use insertOne insteadof insert/findOneOrFail combination
* fix: typo
* fix(backend): inherit mainAlias?
* refactor(backend): use extend
* fix(backend): invalid entityTarget
* fix(backend): fake where
* chore: debug
* chore: debug
* test: log
* fix(backend): column names
* fix(backend): remove dummy from
* revert: log
* fix(backend): position
* fix(backend): automatic aliasing
* chore(backend): alias
* chore(backend): remove from
* fix(backend): type
* fix(backend): avoid pure name
* test(backend): fix type
* chore(backend): use cte
* fix(backend): avoid useless alias
* fix(backend): fix typo
* fix(backend): __disambiguation__
* fix(backend): quote
* chore(backend): t
* chore(backend): accessible
* chore(backend): concrete returning
* fix(backend): quote
* chore: log more
* chore: log metadata
* chore(backend): use raw
* fix(backend): returning column name
* fix(backend): transform
* build(backend): wanna logging
* build(backend): transform empty
* build(backend): build alias
* build(backend): restore name
* chore: return entity
* fix: test case
* test(backend): 204
* chore(backend): log sql
* chore(backend): assert user joined
* fix(backend): typo
* chore(backend): log long sql
* chore(backend): log join
* chore(backend): log join depth null
* chore(backend): joinAttributes
* chore(backend): override createJoinExpression
* chore: join log
* fix(backend): escape
* test(backend): log log
* chore(backend): join gonna success?
* chore(backend): relations
* chore(backend): undefined
* chore(backend): target
* chore(backend): remove log
* chore(backend): log chart update
* chore(backend): log columns
* chore(backend): check hasMetadata
* chore(backend): unshift id when not included
* chore(backend): missing select
* chore(backend): remove debug code
2024-06-01 11:16:44 +09: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
5b8f8e7087
fix(backend): fix backward compatibility of antenna
2024-05-31 11:24:17 +09:00
syuilo
be11fd7508
enhance: サーバーのお問い合わせ先URLを設定できるように
2024-05-31 10:12:23 +09:00
mattyatea
653f5cfbc2
update
2024-05-29 01:22:30 +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
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
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
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
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
mattyatea
4a0138297e
update
2024-05-16 01:50:40 +09:00
mattyatea
509181a6d0
update
2024-05-16 01:08:01 +09:00
mattyatea
9f60e186b0
update
2024-05-06 07:41:47 +09:00
mattyatea
206d7c9a18
outsideprismisskey
2024-05-04 23:21:05 +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
おさむのひと
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 a95ce067c6
2024-03-21 07:51:01 +09:00
mattyatea
d2a02da432
Merge remote-tracking branch 'misskey-original/develop' into develop
2024-03-18 15:10:24 +09: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
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
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
かっこかり
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
syuilo
26c8b53f70
enhance: サーバーごとにモデレーションノートを残せるように
2024-02-22 20:59:52 +09:00
mattyatea
cc69717f0d
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/frontend/src/components/MkAbuseReport.vue
2024-02-19 22:05:40 +09:00
anatawa12
0b636d1bf9
fix: nodeinfoにenableMcaptchaとenableTurnstileが無い ( #13387 )
2024-02-19 08:33:36 +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
9c905f84e8
a
2024-02-16 20:36:23 +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
mattyatea
e074d975e1
update README.md
2024-02-16 19:07:52 +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
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
NoriDev
23508dc56e
fix
2024-02-13 13:29:10 +09:00
GrapeApple0
e1eee2872d
ノートの編集履歴を見れるように(新規ノートのみ)
...
(cherry picked from commit 25763ee679
2024-02-13 13:08:20 +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
syuilo
9b5aeb76d8
update SPDX-FileCopyrightText
2024-02-12 11:37:45 +09:00
