Page MenuHomePhabricator
Differential D6244

Revert "[keyserver/lib] introuce localID field to sendReactionMessage action and reactionMessageCreationResponder"
ClosedPublic
Actions

Authored by ginsu on Jan 11 2023, 3:39 PM.
Tags
None
Referenced Files
F5073805: D6244.id.diff
Fri, Mar 28, 7:55 AM
Unknown Object (File)
Mon, Mar 17, 5:42 AM
Unknown Object (File)
Mon, Mar 17, 5:42 AM
Unknown Object (File)
Mon, Mar 17, 5:42 AM
Unknown Object (File)
Mon, Mar 17, 5:36 AM
Unknown Object (File)
Fri, Mar 7, 1:39 AM
Unknown Object (File)
Feb 16 2025, 1:00 AM
Unknown Object (File)
Feb 16 2025, 1:00 AM
View All Files
Subscribers
ashoat
atul
tomek

Details

Reviewers
atul
tomek
ashoat
Commits
rCOMM24b904db30f8: Revert "[keyserver/lib] introuce localID field to sendReactionMessage action…
Summary

This reverts commit 6e4bd6322ea469a741d206ef147f8bb547d36723. Will create a follow up diff to make localID optional in the input validator

Test Plan

Reverted commit and was able to send message likes on web and native

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
keyserver/
src/
responders/
4 lines
lib/
actions/
1 line

Diff 20835

View Options

keyserver/src/responders/message-responders.js

Show All 20 Lines
import Button from '../../../components/button.react'; import Button from '../../../components/button.react';
import EnumSettingsOption from '../../../components/enum-settings-option.react'; import EnumSettingsOption from '../../../components/enum-settings-option.react';
import { useSelector } from '../../../redux/redux-utils'; import { useSelector } from '../../../redux/redux-utils';
import Modal from '../../modal.react'; import Modal from '../../modal.react';
import css from './notifications-modal.css'; import css from './notifications-modal.css';
type NotificationSettings = 'focused' | 'badge-only' | 'background'; type NotificationSettings = 'focused' | 'badge-only' | 'background';
const BANNER_NOTIFS = 'Banner notifs';
const BADGE_COUNT = 'Badge count';
const IN_FOCUSED_TAB = 'Lives in Focused tab';
const IN_BACKGROUND_TAB = 'Lives in Background tab';
const focusedStatements = [
{ statement: BANNER_NOTIFS, isStatementValid: true },
{ statement: BADGE_COUNT, isStatementValid: true },
{ statement: IN_FOCUSED_TAB, isStatementValid: true },
];
const badgeOnlyStatements = [
{ statement: BANNER_NOTIFS, isStatementValid: false },
{ statement: BADGE_COUNT, isStatementValid: true },
{ statement: IN_FOCUSED_TAB, isStatementValid: true },
];
const backgroundStatements = [
{ statement: BANNER_NOTIFS, isStatementValid: false },
{ statement: BADGE_COUNT, isStatementValid: false },
{ statement: IN_BACKGROUND_TAB, isStatementValid: true },
];
type Props = { type Props = {
+threadID: string, +threadID: string,
+onClose: () => void, +onClose: () => void,
}; };
function NotificationsModal(props: Props): React.Node { function NotificationsModal(props: Props): React.Node {
const { onClose, threadID } = props; const { onClose, threadID } = props;
const threadInfo = useSelector(state => threadInfoSelector(state)[threadID]); const threadInfo = useSelector(state => threadInfoSelector(state)[threadID]);
const { subscription } = threadInfo.currentUser; const { subscription } = threadInfo.currentUser;
const initialThreadSetting = React.useMemo<NotificationSettings>(() => { const initialThreadSetting = React.useMemo<NotificationSettings>(() => {
if (!subscription.home) { if (!subscription.home) {
return 'background'; return 'background';
Show All 19 Linesfunction NotificationsModal(props: Props): React.Node {
); );
const onBackgroundSelected = React.useCallback( const onBackgroundSelected = React.useCallback(
() => setNotificationSettings('background'), () => setNotificationSettings('background'),
[], [],
); );
const isFocusedSelected = notificationSettings === 'focused'; const isFocusedSelected = notificationSettings === 'focused';
const focusedItem = React.useMemo(() => { const focusedItem = React.useMemo(() => {
const statements = [
{ statement: 'Banner notifs', isStatementValid: true },
{ statement: 'Badge count', isStatementValid: true },
{ statement: 'Lives in Focused tab', isStatementValid: true },
];
const icon = ( const icon = (
<img <img
src={`${assetCacheURLPrefix}/${focusedNotificationsIllustrationAsset.fileName}`} src={`${assetCacheURLPrefix}/${focusedNotificationsIllustrationAsset.fileName}`}
height={focusedNotificationsIllustrationAsset.height} height={focusedNotificationsIllustrationAsset.height}
width={focusedNotificationsIllustrationAsset.width} width={focusedNotificationsIllustrationAsset.width}
/> />
); );
return ( return (
<EnumSettingsOption <EnumSettingsOption
selected={isFocusedSelected} selected={isFocusedSelected}
title="Focused (enabled)" title="Focused (enabled)"
statements={statements} statements={focusedStatements}
icon={icon} icon={icon}
onSelect={onFocusedSelected} onSelect={onFocusedSelected}
/> />
); );
}, [isFocusedSelected, onFocusedSelected]); }, [isFocusedSelected, onFocusedSelected]);
const isFocusedBadgeOnlySelected = notificationSettings === 'badge-only'; const isFocusedBadgeOnlySelected = notificationSettings === 'badge-only';
const focusedBadgeOnlyItem = React.useMemo(() => { const focusedBadgeOnlyItem = React.useMemo(() => {
const statements = [
{ statement: 'Banner notifs', isStatementValid: false },
{ statement: 'Badge count', isStatementValid: true },
{ statement: 'Lives in Focused tab', isStatementValid: true },
];
const icon = ( const icon = (
<img <img
src={`${assetCacheURLPrefix}/${badgeOnlyNotificationsIllustrationAsset.fileName}`} src={`${assetCacheURLPrefix}/${badgeOnlyNotificationsIllustrationAsset.fileName}`}
height={badgeOnlyNotificationsIllustrationAsset.height} height={badgeOnlyNotificationsIllustrationAsset.height}
width={badgeOnlyNotificationsIllustrationAsset.width} width={badgeOnlyNotificationsIllustrationAsset.width}
/> />
); );
return ( return (
<EnumSettingsOption <EnumSettingsOption
selected={isFocusedBadgeOnlySelected} selected={isFocusedBadgeOnlySelected}
title="Focused (badge only)" title="Focused (badge only)"
statements={statements} statements={badgeOnlyStatements}
icon={icon} icon={icon}
onSelect={onBadgeOnlySelected} onSelect={onBadgeOnlySelected}
/> />
); );
}, [isFocusedBadgeOnlySelected, onBadgeOnlySelected]); }, [isFocusedBadgeOnlySelected, onBadgeOnlySelected]);
const isBackgroundSelected = notificationSettings === 'background'; const isBackgroundSelected = notificationSettings === 'background';
const backgroundItem = React.useMemo(() => { const backgroundItem = React.useMemo(() => {
const statements = [
{ statement: 'Banner notifs', isStatementValid: false },
{ statement: 'Badge count', isStatementValid: false },
{ statement: 'Lives in Background tab', isStatementValid: true },
];
const icon = ( const icon = (
<img <img
src={`${assetCacheURLPrefix}/${backgroundNotificationsIllustrationAsset.fileName}`} src={`${assetCacheURLPrefix}/${backgroundNotificationsIllustrationAsset.fileName}`}
height={backgroundNotificationsIllustrationAsset.height} height={backgroundNotificationsIllustrationAsset.height}
width={backgroundNotificationsIllustrationAsset.width} width={backgroundNotificationsIllustrationAsset.width}
/> />
); );
return ( return (
<EnumSettingsOption <EnumSettingsOption
selected={isBackgroundSelected} selected={isBackgroundSelected}
title="Background" title="Background"
statements={statements} statements={backgroundStatements}
icon={icon} icon={icon}
onSelect={onBackgroundSelected} onSelect={onBackgroundSelected}
/> />
); );
}, [isBackgroundSelected, onBackgroundSelected]); }, [isBackgroundSelected, onBackgroundSelected]);
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
▲ Show 20 Lines • Show All 43 Lines • Show Last 20 Lines
View Options

lib/actions/message-actions.js

Show All 20 Lines
import Button from '../../../components/button.react'; import Button from '../../../components/button.react';
import EnumSettingsOption from '../../../components/enum-settings-option.react'; import EnumSettingsOption from '../../../components/enum-settings-option.react';
import { useSelector } from '../../../redux/redux-utils'; import { useSelector } from '../../../redux/redux-utils';
import Modal from '../../modal.react'; import Modal from '../../modal.react';
import css from './notifications-modal.css'; import css from './notifications-modal.css';
type NotificationSettings = 'focused' | 'badge-only' | 'background'; type NotificationSettings = 'focused' | 'badge-only' | 'background';
const BANNER_NOTIFS = 'Banner notifs';
const BADGE_COUNT = 'Badge count';
const IN_FOCUSED_TAB = 'Lives in Focused tab';
const IN_BACKGROUND_TAB = 'Lives in Background tab';
const focusedStatements = [
{ statement: BANNER_NOTIFS, isStatementValid: true },
{ statement: BADGE_COUNT, isStatementValid: true },
{ statement: IN_FOCUSED_TAB, isStatementValid: true },
];
const badgeOnlyStatements = [
{ statement: BANNER_NOTIFS, isStatementValid: false },
{ statement: BADGE_COUNT, isStatementValid: true },
{ statement: IN_FOCUSED_TAB, isStatementValid: true },
];
const backgroundStatements = [
{ statement: BANNER_NOTIFS, isStatementValid: false },
{ statement: BADGE_COUNT, isStatementValid: false },
{ statement: IN_BACKGROUND_TAB, isStatementValid: true },
];
type Props = { type Props = {
+threadID: string, +threadID: string,
+onClose: () => void, +onClose: () => void,
}; };
function NotificationsModal(props: Props): React.Node { function NotificationsModal(props: Props): React.Node {
const { onClose, threadID } = props; const { onClose, threadID } = props;
const threadInfo = useSelector(state => threadInfoSelector(state)[threadID]); const threadInfo = useSelector(state => threadInfoSelector(state)[threadID]);
const { subscription } = threadInfo.currentUser; const { subscription } = threadInfo.currentUser;
const initialThreadSetting = React.useMemo<NotificationSettings>(() => { const initialThreadSetting = React.useMemo<NotificationSettings>(() => {
if (!subscription.home) { if (!subscription.home) {
return 'background'; return 'background';
Show All 19 Linesfunction NotificationsModal(props: Props): React.Node {
); );
const onBackgroundSelected = React.useCallback( const onBackgroundSelected = React.useCallback(
() => setNotificationSettings('background'), () => setNotificationSettings('background'),
[], [],
); );
const isFocusedSelected = notificationSettings === 'focused'; const isFocusedSelected = notificationSettings === 'focused';
const focusedItem = React.useMemo(() => { const focusedItem = React.useMemo(() => {
const statements = [
{ statement: 'Banner notifs', isStatementValid: true },
{ statement: 'Badge count', isStatementValid: true },
{ statement: 'Lives in Focused tab', isStatementValid: true },
];
const icon = ( const icon = (
<img <img
src={`${assetCacheURLPrefix}/${focusedNotificationsIllustrationAsset.fileName}`} src={`${assetCacheURLPrefix}/${focusedNotificationsIllustrationAsset.fileName}`}
height={focusedNotificationsIllustrationAsset.height} height={focusedNotificationsIllustrationAsset.height}
width={focusedNotificationsIllustrationAsset.width} width={focusedNotificationsIllustrationAsset.width}
/> />
); );
return ( return (
<EnumSettingsOption <EnumSettingsOption
selected={isFocusedSelected} selected={isFocusedSelected}
title="Focused (enabled)" title="Focused (enabled)"
statements={statements} statements={focusedStatements}
icon={icon} icon={icon}
onSelect={onFocusedSelected} onSelect={onFocusedSelected}
/> />
); );
}, [isFocusedSelected, onFocusedSelected]); }, [isFocusedSelected, onFocusedSelected]);
const isFocusedBadgeOnlySelected = notificationSettings === 'badge-only'; const isFocusedBadgeOnlySelected = notificationSettings === 'badge-only';
const focusedBadgeOnlyItem = React.useMemo(() => { const focusedBadgeOnlyItem = React.useMemo(() => {
const statements = [
{ statement: 'Banner notifs', isStatementValid: false },
{ statement: 'Badge count', isStatementValid: true },
{ statement: 'Lives in Focused tab', isStatementValid: true },
];
const icon = ( const icon = (
<img <img
src={`${assetCacheURLPrefix}/${badgeOnlyNotificationsIllustrationAsset.fileName}`} src={`${assetCacheURLPrefix}/${badgeOnlyNotificationsIllustrationAsset.fileName}`}
height={badgeOnlyNotificationsIllustrationAsset.height} height={badgeOnlyNotificationsIllustrationAsset.height}
width={badgeOnlyNotificationsIllustrationAsset.width} width={badgeOnlyNotificationsIllustrationAsset.width}
/> />
); );
return ( return (
<EnumSettingsOption <EnumSettingsOption
selected={isFocusedBadgeOnlySelected} selected={isFocusedBadgeOnlySelected}
title="Focused (badge only)" title="Focused (badge only)"
statements={statements} statements={badgeOnlyStatements}
icon={icon} icon={icon}
onSelect={onBadgeOnlySelected} onSelect={onBadgeOnlySelected}
/> />
); );
}, [isFocusedBadgeOnlySelected, onBadgeOnlySelected]); }, [isFocusedBadgeOnlySelected, onBadgeOnlySelected]);
const isBackgroundSelected = notificationSettings === 'background'; const isBackgroundSelected = notificationSettings === 'background';
const backgroundItem = React.useMemo(() => { const backgroundItem = React.useMemo(() => {
const statements = [
{ statement: 'Banner notifs', isStatementValid: false },
{ statement: 'Badge count', isStatementValid: false },
{ statement: 'Lives in Background tab', isStatementValid: true },
];
const icon = ( const icon = (
<img <img
src={`${assetCacheURLPrefix}/${backgroundNotificationsIllustrationAsset.fileName}`} src={`${assetCacheURLPrefix}/${backgroundNotificationsIllustrationAsset.fileName}`}
height={backgroundNotificationsIllustrationAsset.height} height={backgroundNotificationsIllustrationAsset.height}
width={backgroundNotificationsIllustrationAsset.width} width={backgroundNotificationsIllustrationAsset.width}
/> />
); );
return ( return (
<EnumSettingsOption <EnumSettingsOption
selected={isBackgroundSelected} selected={isBackgroundSelected}
title="Background" title="Background"
statements={statements} statements={backgroundStatements}
icon={icon} icon={icon}
onSelect={onBackgroundSelected} onSelect={onBackgroundSelected}
/> />
); );
}, [isBackgroundSelected, onBackgroundSelected]); }, [isBackgroundSelected, onBackgroundSelected]);
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
▲ Show 20 Lines • Show All 43 Lines • Show Last 20 Lines