matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pl-fe: fix duplicated notifications

Browse Source 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak
2024-09-09 11:33:02 +02:00
parent 95be38fde3
commit 374bef6141
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/pl-fe/src/actions/notifications.ts
View File

@ -208,12 +208,6 @@ const expandNotifications = ({ maxId }: Record<string, any> = {}, done: () => an
}
}
if (maxId?.includes('+')) {
const ids = maxId.split('+');
maxId = ids[ids.length - 1];
}
const params: Record<string, any> = {
max_id: maxId,
};
@ -263,7 +257,7 @@ const expandNotifications = ({ maxId }: Record<string, any> = {}, done: () => an
dispatch(importFetchedAccounts(Object.values(entries.accounts)));
dispatch(importFetchedStatuses(Object.values(entries.statuses)));
const deduplicatedNotifications = normalizeNotifications(response.items);
const deduplicatedNotifications = normalizeNotifications(response.items, state.notifications.items);
dispatch(expandNotificationsSuccess(deduplicatedNotifications, response.next));
fetchRelatedRelationships(dispatch, response.items);
@ -314,13 +308,9 @@ const markReadNotifications = () =>
if (!isLoggedIn(getState)) return;
const state = getState();
let topNotificationId = state.notifications.items.first()?.id;
const topNotificationId = state.notifications.items.first()?.id;
const lastReadId = state.notifications.lastRead;
if (typeof topNotificationId === 'string' && topNotificationId?.includes('+')) {
topNotificationId = topNotificationId.split('+')[0];
}
if (topNotificationId && (lastReadId === -1 || compareId(topNotificationId, lastReadId) > 0)) {
const marker = {
notifications: {

2
packages/pl-fe/src/features/notifications/index.tsx
View File

@ -30,7 +30,7 @@ const messages = defineMessages({
const getNotifications = createSelector([
(state: RootState) => state.notifications.items.toList(),
], (notifications) => notifications.filter(item => item !== null));
], (notifications) => notifications.filter(item => item !== null && !item.duplicate));
const Notifications = () => {
const dispatch = useAppDispatch();

12
packages/pl-fe/src/normalizers/notification.ts
View File

@ -2,7 +2,9 @@ import { getNotificationStatus } from 'pl-fe/features/notifications/components/n
import { normalizeAccount } from './account';
import type { OrderedMap as ImmutableOrderedMap } from 'immutable';
import type { Notification as BaseNotification } from 'pl-api';
import type { MinifiedNotification } from 'pl-fe/reducers/notifications';
const STATUS_NOTIFICATION_TYPES = [
'favourite',
@ -15,16 +17,22 @@ const STATUS_NOTIFICATION_TYPES = [
const normalizeNotification = (notification: BaseNotification) => ({
...notification,
duplicate: false,
account: normalizeAccount(notification.account),
account_id: notification.account.id,
accounts: [normalizeAccount(notification.account)],
account_ids: [notification.account.id],
});
const normalizeNotifications = (notifications: Array<BaseNotification>) => {
const normalizeNotifications = (notifications: Array<BaseNotification>, stateNotifications?: ImmutableOrderedMap<string, MinifiedNotification>) => {
const deduplicatedNotifications: Notification[] = [];
for (const notification of notifications) {
const existingNotification = stateNotifications?.get(notification.id);
// Do not update grouped notifications
if (existingNotification && (existingNotification.duplicate || existingNotification.account_ids.length)) continue;
if (STATUS_NOTIFICATION_TYPES.includes(notification.type)) {
const existingNotification = deduplicatedNotifications
.find(deduplicated =>
@ -36,7 +44,7 @@ const normalizeNotifications = (notifications: Array<BaseNotification>) => {
if (existingNotification) {
existingNotification.accounts.push(normalizeAccount(notification.account));
existingNotification.account_ids.push(notification.account.id);
existingNotification.id += '+' + notification.id;
deduplicatedNotifications.push({ ...normalizeNotification(notification), duplicate: true });
} else {
deduplicatedNotifications.push(normalizeNotification(notification));
}

3
packages/pl-fe/src/reducers/notifications.ts
View File

@ -64,6 +64,7 @@ const comparator = (a: Pick<Notification, 'id'>, b: Pick<Notification, 'id'>) =>
const minifyNotification = (notification: Notification) => {
// @ts-ignore
const minifiedNotification: {
duplicate: boolean;
account_id: string;
account_ids: string[];
created_at: string;
@ -127,7 +128,7 @@ type MinifiedNotification = ReturnType<typeof minifyNotification>;
// Count how many notifications appear after the given ID (for unread count)
const countFuture = (notifications: ImmutableOrderedMap<string, MinifiedNotification>, lastId: string | number) =>
notifications.reduce((acc, notification) => {
if (parseId(notification.id.split('+')[0]) > parseId(lastId)) {
if (parseId(notification.id) > parseId(lastId)) {
return acc + 1;
} else {
return acc;