Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enhance(backend): 通知がミュート・凍結を考慮するようにする #13412

Merged
merged 62 commits into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
417bb2d
Never return broken notifications #409
dakkar Feb 11, 2024
fae7cb2
Update Changelog
kakkokari-gtyih Feb 13, 2024
9ce9c6e
Merge branch 'develop' into fix-10650
kakkokari-gtyih Feb 16, 2024
7db0971
Merge branch 'develop' into fix-10650
kakkokari-gtyih Feb 16, 2024
56bbb52
Merge branch 'develop' into fix-10650
kakkokari-gtyih Feb 19, 2024
8d68c50
Update CHANGELOG.md
kakkokari-gtyih Feb 19, 2024
35609b4
enhance: 通知がミュートを考慮するようにする
tai-cha Feb 19, 2024
b1e57e5
enhance: 通知が凍結も考慮するようにする
tai-cha Feb 19, 2024
09a9484
fix: notifierIdがない通知が消えてしまう問題
tai-cha Feb 19, 2024
094e10a
Add tests (通知がミュートを考慮しているかどうか)
tai-cha Feb 19, 2024
c21b6d9
fix: notifierIdがない通知が消えてしまう問題 (grouped)
tai-cha Feb 19, 2024
c70c2e7
Remove unused import
tai-cha Feb 19, 2024
19296a0
Fix: typo
tai-cha Feb 20, 2024
2096caf
Merge branch 'develop' into notification-hide-muting-user
tai-cha Feb 20, 2024
f0c1c08
Revert "enhance: 通知が凍結も考慮するようにする"
tai-cha Feb 20, 2024
1304a9f
Revert API handling
tai-cha Feb 20, 2024
45a0677
Remove unused imports
tai-cha Feb 20, 2024
b09abb8
enhance: Check if notifierId is valid in NotificationEntityService
tai-cha Feb 20, 2024
ef65252
通知作成時にpackしてnullになったらあとの処理をやめる
tai-cha Feb 20, 2024
239a695
Remove duplication of valid notifier check
tai-cha Feb 20, 2024
d53b837
add filter notification is not null
tai-cha Feb 20, 2024
7e1d5f0
Merge branch 'develop' into notification-hide-muting-user
tai-cha Feb 20, 2024
ffb853b
Revert "Remove duplication of valid notifier check"
tai-cha Feb 20, 2024
3693ce9
Improve performance
tai-cha Feb 20, 2024
ff7f7c8
Fix packGrouped
tai-cha Feb 20, 2024
f5ae663
Refactor: 判定部分を共通化
tai-cha Feb 20, 2024
823b7c3
Fix condition
tai-cha Feb 20, 2024
7c9bacb
use isNotNull
tai-cha Feb 20, 2024
659f8d9
Update CHANGELOG.md
tai-cha Feb 20, 2024
286c7eb
Merge branch 'develop' into notification-hide-muting-user
tai-cha Feb 20, 2024
a4ad66b
Merge branch 'fix-10650' of https://github.com/kakkokari-gtyih/misske…
tai-cha Feb 20, 2024
0cf8946
filterの改善
tai-cha Feb 20, 2024
5dae5ba
Refactor: DONT REPEAT YOURSELF
tai-cha Feb 20, 2024
f985636
Add groupedNotificationTypes
tai-cha Feb 20, 2024
6c69a43
Update misskey-js typedef
tai-cha Feb 20, 2024
e59be54
Merge branch 'develop' of https://github.com/misskey-dev/misskey into…
tai-cha Feb 21, 2024
ed33ac7
Refactor: less sql calls
tai-cha Feb 21, 2024
e2443d8
refactor
tamaina Feb 21, 2024
60109cc
clean up
tamaina Feb 21, 2024
7753124
filter notes to mark as read
tamaina Feb 21, 2024
6b45b81
packed noteがmapなのでそちらを使う
tamaina Feb 21, 2024
6be1d98
if (notesToRead.size > 0)
tamaina Feb 21, 2024
22e2324
if (notes.length === 0) return;
tamaina Feb 21, 2024
9f2b402
fix
tamaina Feb 21, 2024
665cf24
Revert "if (notes.length === 0) return;"
tamaina Feb 21, 2024
ba6cb93
:art:
tamaina Feb 21, 2024
45fe974
console.error
tamaina Feb 21, 2024
8106569
err
tamaina Feb 21, 2024
25f441d
remove try-catch
tamaina Feb 21, 2024
47264af
不要なジェネリクスを除去
tamaina Feb 21, 2024
07b135b
Merge branch 'develop' of https://github.com/misskey-dev/misskey into…
tai-cha Feb 23, 2024
9729f73
Revert (既読処理をpack内で行うものを元に戻す)
tai-cha Feb 23, 2024
665a3c1
Merge branch 'develop' of https://github.com/misskey-dev/misskey into…
tai-cha Feb 23, 2024
8df636e
Clean
tai-cha Feb 23, 2024
03c9e64
Merge branch 'develop' into notification-hide-muting-user
tai-cha Feb 25, 2024
66d0b71
Merge branch 'develop' into notification-hide-muting-user
tai-cha Feb 28, 2024
9f1a9e8
Update packages/backend/src/core/entities/NotificationEntityService.ts
syuilo Feb 28, 2024
eead5ff
Update packages/backend/src/core/entities/NotificationEntityService.ts
syuilo Feb 28, 2024
23408ad
Update packages/backend/src/core/entities/NotificationEntityService.ts
syuilo Feb 28, 2024
bfecc0e
Update packages/backend/src/core/entities/NotificationEntityService.ts
syuilo Feb 28, 2024
01d67e8
Update packages/backend/src/core/NotificationService.ts
syuilo Feb 28, 2024
ff9df0d
Clean
tai-cha Feb 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
## 202x.x.x (unreleased)

### General
- 通知がミュート、凍結を考慮するようになりました

### Client
- Enhance: ノート作成画面のファイル添付メニューの区切り線の位置を調整
Expand All @@ -24,6 +25,8 @@

### Server
- Fix: nodeinfoにenableMcaptchaとenableTurnstileが無いのを修正
- Fix: 破損した通知をクライアントに送信しないように
* 通知欄が無限にリロードされる問題が改善する可能性があります
- Fix: 禁止キーワードを含むノートがDelayed Queueに追加されて再処理される問題を修正

## 2024.2.0
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/core/NotificationService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,8 @@ export class NotificationService implements OnApplicationShutdown {

const packed = await this.notificationEntityService.pack(notification, notifieeId, {});

if (packed === null) return null;

// Publish notification event
this.globalEventService.publishMainStream(notifieeId, 'notification', packed);

Expand Down
Loading
Loading