LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Cleaned up notification constants

Browse source 
- Organized under an object.
- Removed old unused ones.
This commit is contained in:
infinite-persistence 2021-07-08 10:50:51 +08:00
parent 06e454e9dc
commit 52cba611b3
No known key found for this signature in database
GPG key ID: B9C3252EDC3D0AA0
3 changed files with 37 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
ui/component/notification/view.jsx
View file

@ -1,8 +1,7 @@
// @flow
import * as NOTIFICATIONS from 'constants/notifications';
import * as PAGES from 'constants/pages';
import * as ICONS from 'constants/icons';
import { RULE } from 'constants/notifications';
import React from 'react';
import classnames from 'classnames';
import Icon from 'component/common/icon';
@ -31,21 +30,21 @@ export default function Notification(props: Props) {
const { push } = useHistory();
const { notification_rule, notification_parameters, is_read, id } = notification;
const isCommentNotification =
notification_rule === NOTIFICATIONS.NOTIFICATION_COMMENT ||
notification_rule === NOTIFICATIONS.NOTIFICATION_REPLY ||
notification_rule === NOTIFICATIONS.CREATOR_COMMENT;
notification_rule === RULE.COMMENT ||
notification_rule === RULE.COMMENT_REPLY ||
notification_rule === RULE.CREATOR_COMMENT;
const commentText = isCommentNotification && notification_parameters.dynamic.comment;
const channelUrl =
(notification_rule === NOTIFICATIONS.NEW_CONTENT && notification.notification_parameters.dynamic.channel_url) || '';
(notification_rule === RULE.NEW_CONTENT && notification.notification_parameters.dynamic.channel_url) || '';
let notificationTarget;
switch (notification_rule) {
case NOTIFICATIONS.DAILY_WATCH_AVAILABLE:
case NOTIFICATIONS.DAILY_WATCH_REMIND:
case RULE.DAILY_WATCH_AVAILABLE:
case RULE.DAILY_WATCH_REMIND:
notificationTarget = `/$/${PAGES.CHANNELS_FOLLOWING}`;
break;
case NOTIFICATIONS.MISSED_OUT:
case NOTIFICATIONS.REWARDS_APPROVAL_PROMPT:
case RULE.MISSED_OUT:
case RULE.REWARDS_APPROVAL_PROMPT:
notificationTarget = `/$/${PAGES.REWARDS_VERIFY}?redirect=/$/${PAGES.REWARDS}`;
break;
default:
@ -69,26 +68,26 @@ export default function Notification(props: Props) {
let icon;
switch (notification_rule) {
case NOTIFICATIONS.NOTIFICATION_CREATOR_SUBSCRIBER:
case RULE.CREATOR_SUBSCRIBER:
icon = <Icon icon={ICONS.SUBSCRIBE} sectionIcon />;
break;
case NOTIFICATIONS.NOTIFICATION_COMMENT:
case NOTIFICATIONS.CREATOR_COMMENT:
case RULE.COMMENT:
case RULE.CREATOR_COMMENT:
icon = <ChannelThumbnail small uri={notification_parameters.dynamic.comment_author} />;
break;
case NOTIFICATIONS.NOTIFICATION_REPLY:
case RULE.COMMENT_REPLY:
icon = <ChannelThumbnail small uri={notification_parameters.dynamic.reply_author} />;
break;
case NOTIFICATIONS.NEW_CONTENT:
case RULE.NEW_CONTENT:
icon = <ChannelThumbnail small uri={notification_parameters.dynamic.channel_url} />;
break;
case NOTIFICATIONS.NEW_LIVESTREAM:
case RULE.NEW_LIVESTREAM:
icon = <ChannelThumbnail small uri={notification_parameters.dynamic.channel_url} />;
break;
case NOTIFICATIONS.DAILY_WATCH_AVAILABLE:
case NOTIFICATIONS.DAILY_WATCH_REMIND:
case NOTIFICATIONS.MISSED_OUT:
case NOTIFICATIONS.REWARDS_APPROVAL_PROMPT:
case RULE.DAILY_WATCH_AVAILABLE:
case RULE.DAILY_WATCH_REMIND:
case RULE.MISSED_OUT:
case RULE.REWARDS_APPROVAL_PROMPT:
icon = <Icon icon={ICONS.LBC} sectionIcon />;
break;
default:
@ -170,10 +169,10 @@ export default function Notification(props: Props) {
)}
</div>
{notification_rule === NOTIFICATIONS.NEW_CONTENT && (
{notification_rule === RULE.NEW_CONTENT && (
<FileThumbnail uri={notification_parameters.device.target} className="notification__content-thumbnail" />
)}
{notification_rule === NOTIFICATIONS.NEW_LIVESTREAM && (
{notification_rule === RULE.NEW_LIVESTREAM && (
<FileThumbnail
thumbnail={notification_parameters.device.image_url}
className="notification__content-thumbnail"
@ -199,7 +198,7 @@ export default function Notification(props: Props) {
<Icon aria-hidden icon={ICONS.DELETE} />
{__('Delete')}
</MenuItem>
{notification_rule === NOTIFICATIONS.NEW_CONTENT && channelUrl ? (
{notification_rule === RULE.NEW_CONTENT && channelUrl ? (
<NotificationContentChannelMenu uri={channelUrl} />
) : null}
</MenuList>

27
ui/constants/notifications.js
View file

@ -1,17 +1,14 @@
export const NOTIFICATION_CREATOR_SUBSCRIBER = 'creator_subscriber';
export const NOTIFICATION_COMMENT = 'comment';
export const NOTIFICATION_REPLY = 'comment-reply';
export const MISSED_OUT = 'missed_out';
export const REWARDS_APPROVAL_PROMPT = 'rewards_approval_prompt';
export const DAILY_WATCH_AVAILABLE = 'daily_watch_available';
export const DAILY_WATCH_REMIND = 'daily_watch_remind';
export const NEW_CONTENT = 'new_content';
export const NEW_LIVESTREAM = 'new_livestream';
export const CREATOR_COMMENT = 'creator_comment';
export const RULE = {
COMMENT: 'comment',
COMMENT_REPLY: 'comment-reply',
CREATOR_COMMENT: 'creator_comment',
NEW_CONTENT: 'new_content',
NEW_LIVESTREAM: 'new_livestream',
DAILY_WATCH_AVAILABLE: 'daily_watch_available',
DAILY_WATCH_REMIND: 'daily_watch_remind',
MISSED_OUT: 'missed_out',
REWARDS_APPROVAL_PROMPT: 'rewards_approval_prompt',
CREATOR_SUBSCRIBER: 'creator_subscriber',
};
export const NOTIFICATION_NAME_ALL = 'All';
export const NOTIFICATION_RULE_COMMENTS = 'comments';
export const NOTIFICATION_RULE_REPLIES = 'comment_replies';
export const NOTIFICATION_RULE_FOLLOWERS = 'followers';
export const NOTIFICATION_RULE_NEW_CONTENT = 'new_content';
export const NOTIFICATION_RULE_OTHERS = 'default';

6
ui/redux/actions/notifications.js
View file

@ -1,6 +1,6 @@
// @flow
import * as ACTIONS from 'constants/action_types';
import * as NOTIFICATIONS from 'constants/notifications';
import { RULE } from 'constants/notifications';
import { Lbryio } from 'lbryinc';
import { v4 as uuid } from 'uuid';
import {
@ -77,7 +77,7 @@ export function doNotificationList(types?: Array<string>) {
if (
(notification.notification_parameters.dynamic &&
notification.notification_parameters.dynamic.comment_author) ||
notification.notification_rule === NOTIFICATIONS.NEW_CONTENT
notification.notification_rule === RULE.NEW_CONTENT
) {
return true;
} else {
@ -85,7 +85,7 @@ export function doNotificationList(types?: Array<string>) {
}
})
.map((notification) => {
if (notification.notification_rule === NOTIFICATIONS.NEW_CONTENT) {
if (notification.notification_rule === RULE.NEW_CONTENT) {
return notification.notification_parameters.device.target;
} else {
return notification.notification_parameters.dynamic.comment_author;