bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'edit-notifications' into 'develop'

Browse source 
Status edits notifications

See merge request soapbox-pub/soapbox-fe!1689
This commit is contained in:
marcin mikołajczak 2022-07-28 13:39:43 +00:00
commit f05ca46138
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/soapbox/features/notifications/components/filter_bar.tsx
View file

@ -15,7 +15,6 @@ const messages = defineMessages({
boosts: { id: 'notifications.filter.boosts', defaultMessage: 'Reposts' }, boosts: { id: 'notifications.filter.boosts', defaultMessage: 'Reposts' },
polls: { id: 'notifications.filter.polls', defaultMessage: 'Poll results' }, polls: { id: 'notifications.filter.polls', defaultMessage: 'Poll results' },
follows: { id: 'notifications.filter.follows', defaultMessage: 'Follows' }, follows: { id: 'notifications.filter.follows', defaultMessage: 'Follows' },
moves: { id: 'notifications.filter.moves', defaultMessage: 'Moves' },
emoji_reacts: { id: 'notifications.filter.emoji_reacts', defaultMessage: 'Emoji reacts' }, emoji_reacts: { id: 'notifications.filter.emoji_reacts', defaultMessage: 'Emoji reacts' },
statuses: { id: 'notifications.filter.statuses', defaultMessage: 'Updates from people you follow' }, statuses: { id: 'notifications.filter.statuses', defaultMessage: 'Updates from people you follow' },
}); });
@ -88,12 +87,6 @@ const NotificationFilterBar = () => {
action: onClick('follow'), action: onClick('follow'),
name: 'follow', name: 'follow',
}); });
items.push({
text: <Icon src={require('feather-icons/dist/icons/briefcase.svg')} />,
title: intl.formatMessage(messages.moves),
action: onClick('move'),
name: 'move',
});
} }
return <Tabs items={items} activeItem={selectedFilter} />; return <Tabs items={items} activeItem={selectedFilter} />;

6
app/soapbox/features/notifications/components/notification.tsx
View file

@ -54,6 +54,7 @@ const icons: Record<NotificationType, string> = {
'pleroma:chat_mention': require('@tabler/icons/messages.svg'), 'pleroma:chat_mention': require('@tabler/icons/messages.svg'),
'pleroma:emoji_reaction': require('@tabler/icons/mood-happy.svg'), 'pleroma:emoji_reaction': require('@tabler/icons/mood-happy.svg'),
user_approved: require('@tabler/icons/user-plus.svg'), user_approved: require('@tabler/icons/user-plus.svg'),
update: require('@tabler/icons/pencil.svg'),
}; };
const messages: Record<NotificationType, MessageDescriptor> = defineMessages({ const messages: Record<NotificationType, MessageDescriptor> = defineMessages({
@ -101,6 +102,10 @@ const messages: Record<NotificationType, MessageDescriptor> = defineMessages({
id: 'notification.user_approved', id: 'notification.user_approved',
defaultMessage: 'Welcome to {instance}!', defaultMessage: 'Welcome to {instance}!',
}, },
update: {
id: 'notification.update',
defaultMessage: '{name} edited a post',
},
}); });
const buildMessage = ( const buildMessage = (
@ -287,6 +292,7 @@ const Notification: React.FC<INotificaton> = (props) => {
case 'reblog': case 'reblog':
case 'status': case 'status':
case 'poll': case 'poll':
case 'update':
case 'pleroma:emoji_reaction': case 'pleroma:emoji_reaction':
return status && typeof status === 'object' ? ( return status && typeof status === 'object' ? (
// @ts-ignore // @ts-ignore

1
app/soapbox/utils/notification.ts
View file

@ -11,6 +11,7 @@ const NOTIFICATION_TYPES = [
'pleroma:chat_mention', 'pleroma:chat_mention',
'pleroma:emoji_reaction', 'pleroma:emoji_reaction',
'user_approved', 'user_approved',
'update',
] as const; ] as const;
type NotificationType = typeof NOTIFICATION_TYPES[number]; type NotificationType = typeof NOTIFICATION_TYPES[number];