Mirrors/phanpy
1
0
Fork 0
mirror of https://github.com/cheeaun/phanpy.git synced 2025-02-02 06:06:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

Distinct both implementation of grouped notifications

Browse source
This commit is contained in:
Lim Chee Aun 2024-07-21 20:31:10 +08:00
parent b88376569e
commit a2b88f1cdd
4 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/notification.jsx
View file

@ -147,9 +147,11 @@ function Notification({
report,
event,
moderation_warning,
// Client-side grouped notification
_ids,
_accounts,
_statuses,
// Grouped notification
// Server-side grouped notification
sampleAccounts,
notificationsCount,
} = notification;
@ -266,7 +268,7 @@ function Notification({
return (
<div
class={`notification notification-${type}`}
data-notification-id={id}
data-notification-id={_ids || id}
tabIndex="0"
>
<div

2
src/pages/home.jsx
View file

@ -177,7 +177,7 @@ function NotificationsMenu({ anchorRef, state, onClose }) {
.slice(0, NOTIFICATIONS_DISPLAY_LIMIT)
.map((notification) => (
<Notification
key={notification.ids || notification.id}
key={notification._ids || notification.id}
instance={instance}
notification={notification}
disableContextMenu

4
src/pages/notifications.jsx
View file

@ -716,12 +716,12 @@ function Notifications({ columnMode }) {
hideTime: true,
});
return (
<Fragment key={notification.ids || notification.id}>
<Fragment key={notification._ids || notification.id}>
{differentDay && <h2 class="timeline-header">{heading}</h2>}
<Notification
instance={instance}
notification={notification}
key={notification.ids || notification.id}
key={notification._ids || notification.id}
/>
</Fragment>
);

14
src/utils/group-notifications.jsx
View file

@ -99,12 +99,12 @@ export function groupNotifications2(groupNotifications) {
const mappedNotification = notificationsMap2[key];
if (mappedNotification) {
mappedNotification._statuses.push(gn.status);
mappedNotification.ids += `-${gn.id}`;
mappedNotification._ids += `-${gn.id}`;
} else {
let n = (notificationsMap2[key] = {
ids: gn.id,
...gn,
type,
_ids: gn.id,
_statuses: [gn.status],
});
newGroupNotifications2.push(n);
@ -145,18 +145,18 @@ export default function groupNotifications(notifications) {
if (mappedAccount) {
mappedAccount._types.push(type);
mappedAccount._types.sort().reverse();
mappedNotification.ids += `-${id}`;
mappedNotification._ids += `-${id}`;
} else {
account._types = [type];
mappedNotification._accounts.push(account);
mappedNotification.ids += `-${id}`;
mappedNotification._ids += `-${id}`;
}
} else {
if (account) account._types = [type];
let n = (notificationsMap[key] = {
ids: id,
...notification,
type: virtualType,
_ids: id,
_accounts: account ? [account] : [],
});
cleanNotifications[j++] = n;
@ -179,12 +179,12 @@ export default function groupNotifications(notifications) {
const mappedNotification = notificationsMap2[key];
if (mappedNotification) {
mappedNotification._statuses.push(notification.status);
mappedNotification.ids += `-${id}`;
mappedNotification._ids += `-${id}`;
} else {
let n = (notificationsMap2[key] = {
ids: id,
...notification,
type,
_ids: id,
_statuses: [notification.status],
});
cleanNotifications2[j++] = n;