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.

Sign up for GitHub

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

通知APIがページ境界で重複する問題の修正 #509

Merged
merged 6 commits into from
Oct 18, 2024
Merged

通知APIがページ境界で重複する問題の修正 #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b1305e1
通知APIがページ境界で重複する問題の修正
kozakura913 Oct 18, 2024
a9e4c47
Update CHANGELOG_YOJO.md
kozakura913 Oct 18, 2024
d34a7a0
mv
kozakura913 Oct 18, 2024
c8e281f
fix
kozakura913 Oct 18, 2024
f4e7c7b
Merge branch 'fix_notifications_page' of [email protected]:kozakura913/y…
kozakura913 Oct 18, 2024
38a9e2d
Merge branch 'develop' into fix_notifications_page
kozakura913 Oct 18, 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: 2 additions & 1 deletion CHANGELOG_YOJO.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ Cherrypick 4.11.1
- Change: `notes/advanced-search`で`query`が必須ではなくなりました
- Fix: (Opensearch利用時)高度な検索でリプライ除外にするとエラーがでる
- Fix: ノート編集時に3001文字以上の場合編集できない問題を修正

- Fix: 通知APIがページ境界で重複する問題の修正

### Misc

## 1.0.1
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/server/api/endpoints/i/notifications-grouped.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
return [];
}

let notifications = notificationsRes.map(x => JSON.parse(x[1][1])).filter(x => x.id !== ps.untilId && x !== ps.sinceId) as MiNotification[];
let notifications = notificationsRes.map(x => JSON.parse(x[1][1])).filter(x => x.id !== ps.untilId && x.id !== ps.sinceId) as MiNotification[];

if (includeTypes && includeTypes.length > 0) {
notifications = notifications.filter(notification => includeTypes.includes(notification.type));
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/server/api/endpoints/i/notifications.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
return [];
}

notifications = notificationsRes.map(x => JSON.parse(x[1][1])) as MiNotification[];
notifications = notificationsRes.map(x => JSON.parse(x[1][1])).filter(x => x.id !== ps.untilId && x.id !== ps.sinceId) as MiNotification[];

if (includeTypes && includeTypes.length > 0) {
notifications = notifications.filter(notification => includeTypes.includes(notification.type));
Expand Down
Loading