keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

make moderators and groupAdmins a single name

Browse Source
pull/1438/head
Audric Ackermann 4 years ago
parent 6a776b56f6
commit dc0733968d
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4
22 changed files with 218 additions and 182 deletions
Show Stats Download Patch File Download Diff File

2
js/models/conversations.d.ts vendored
Unescape Escape View File

@ -65,7 +65,7 @@ export interface ConversationModel
isRss: () => boolean; isRss: () => boolean;
isBlocked: () => boolean; isBlocked: () => boolean;
isClosable: () => boolean; isClosable: () => boolean;
isModerator: (id: string) => boolean; isAdmin: (id: string) => boolean;
throttledBumpTyping: () => void; throttledBumpTyping: () => void;
messageCollection: Backbone.Collection<MessageModel>; messageCollection: Backbone.Collection<MessageModel>;

40
js/models/conversations.js
Unescape Escape View File

@ -457,14 +457,18 @@
format() { format() {
return this.cachedProps; return this.cachedProps;
}, },
getGroupAdmins() {
return this.get('groupAdmins') || this.get('moderators');
},
getProps() { getProps() {
const { format } = PhoneNumber; const { format } = PhoneNumber;
const regionCode = storage.get('regionCode'); const regionCode = storage.get('regionCode');
const typingKeys = Object.keys(this.contactTypingTimers || {}); const typingKeys = Object.keys(this.contactTypingTimers || {});
const groupAdmins = this.isPublic() const groupAdmins = this.getGroupAdmins();
? this.get('moderators')
: this.get('groupAdmins'); const members =
this.isGroup() && !this.isPublic() ? this.get('members') : undefined;
const result = { const result = {
id: this.id, id: this.id,
@ -499,7 +503,7 @@
isKickedFromGroup: !!this.get('isKickedFromGroup'), isKickedFromGroup: !!this.get('isKickedFromGroup'),
left: !!this.get('left'), left: !!this.get('left'),
groupAdmins, groupAdmins,
members,
onClick: () => this.trigger('select', this), onClick: () => this.trigger('select', this),
onBlockContact: () => this.block(), onBlockContact: () => this.block(),
onUnblockContact: () => this.unblock(), onUnblockContact: () => this.unblock(),
@ -676,6 +680,15 @@
} }
}, },
async updateGroupAdmins(groupAdmins) { async updateGroupAdmins(groupAdmins) {
const existingAdmins = _.sortBy(this.getGroupAdmins());
const newAdmins = _.sortBy(groupAdmins);
if (_.isEqual(existingAdmins, newAdmins)) {
window.log.info(
'Skipping updates of groupAdmins/moderators. No change detected.'
);
return;
}
this.set({ groupAdmins }); this.set({ groupAdmins });
await this.commit(); await this.commit();
}, },
@ -1828,27 +1841,16 @@
await this.commit(); await this.commit();
} }
}, },
isModerator(pubKey) { isAdmin(pubKey) {
if (!this.isPublic()) { if (!this.isPublic()) {
return false; return false;
} }
if (!pubKey) { if (!pubKey) {
throw new Error('isModerator() pubKey is falsy'); throw new Error('isAdmin() pubKey is falsy');
} }
const moderators = this.get('moderators'); const groupAdmins = this.getGroupAdmins();
return Array.isArray(moderators) && moderators.includes(pubKey); return Array.isArray(groupAdmins) && groupAdmins.includes(pubKey);
}, },
async setModerators(moderators) {
if (!this.isPublic()) {
return;
}
// TODO: compare array properly
if (!_.isEqual(this.get('moderators'), moderators)) {
this.set({ moderators });
await this.commit();
}
},
// SIGNAL PROFILES // SIGNAL PROFILES
onChangeProfileKey() { onChangeProfileKey() {

7
js/models/messages.js
Unescape Escape View File

@ -568,8 +568,7 @@
// for the public group chat // for the public group chat
const conversation = this.getConversation(); const conversation = this.getConversation();
const isModerator = const isAdmin = conversation && !!conversation.isAdmin(phoneNumber);
conversation && !!conversation.isModerator(phoneNumber);
const convoId = conversation ? conversation.id : undefined; const convoId = conversation ? conversation.id : undefined;
const isGroup = !!conversation && !conversation.isPrivate(); const isGroup = !!conversation && !conversation.isPrivate();
@ -606,9 +605,9 @@
conversation && conversation.get('isKickedFromGroup'), conversation && conversation.get('isKickedFromGroup'),
isDeletable: isDeletable:
!this.get('isPublic') || !this.get('isPublic') ||
isModerator || isAdmin ||
phoneNumber === textsecure.storage.user.getNumber(), phoneNumber === textsecure.storage.user.getNumber(),
isModerator, isAdmin,
onCopyText: () => this.copyText(), onCopyText: () => this.copyText(),
onCopyPubKey: () => this.copyPubKey(), onCopyPubKey: () => this.copyPubKey(),

2
js/modules/loki_app_dot_net_api.js
Unescape Escape View File

@ -1204,7 +1204,7 @@ class LokiPublicChannelAPI {
} }
if (this.running) { if (this.running) {
await this.conversation.setModerators(moderators || []); await this.conversation.updateGroupAdmins(moderators || []);
} }
} }

4
js/views/create_group_dialog_view.js
Unescape Escape View File

@ -31,7 +31,7 @@
this.titleText = i18n('updateGroupDialogTitle', this.groupName); this.titleText = i18n('updateGroupDialogTitle', this.groupName);
// I'd much prefer to integrate mods with groupAdmins // I'd much prefer to integrate mods with groupAdmins
// but lets discuss first... // but lets discuss first...
this.isAdmin = groupConvo.isModerator( this.isAdmin = groupConvo.isAdmin(
window.storage.get('primaryDevicePubKey') window.storage.get('primaryDevicePubKey')
); );
} }
@ -92,7 +92,7 @@
this.titleText = i18n('updateGroupDialogTitle', this.groupName); this.titleText = i18n('updateGroupDialogTitle', this.groupName);
// I'd much prefer to integrate mods with groupAdmins // I'd much prefer to integrate mods with groupAdmins
// but lets discuss first... // but lets discuss first...
this.isAdmin = groupConvo.isModerator( this.isAdmin = groupConvo.isAdmin(
window.storage.get('primaryDevicePubKey') window.storage.get('primaryDevicePubKey')
); );
// zero out contactList for now // zero out contactList for now

16
ts/components/LeftPane.tsx
Unescape Escape View File

@ -69,7 +69,6 @@ export class LeftPane extends React.Component<Props> {
} }
public render(): JSX.Element { public render(): JSX.Element {
const ourPrimaryConversation = this.props.ourPrimaryConversation;
return ( return (
<SessionTheme theme={this.props.theme}> <SessionTheme theme={this.props.theme}>
<div className="module-left-pane-session"> <div className="module-left-pane-session">
@ -77,8 +76,6 @@ export class LeftPane extends React.Component<Props> {
{...this.props} {...this.props}
selectedSection={this.props.focusedSection} selectedSection={this.props.focusedSection}
onSectionSelected={this.handleSectionSelected} onSectionSelected={this.handleSectionSelected}
unreadMessageCount={this.props.unreadMessageCount}
ourPrimaryConversation={ourPrimaryConversation}
/> />
<div className="module-left-pane">{this.renderSection()}</div> <div className="module-left-pane">{this.renderSection()}</div>
</div> </div>
@ -162,22 +159,13 @@ export class LeftPane extends React.Component<Props> {
} }
private renderSettingSection() { private renderSettingSection() {
const { const { settingsCategory } = this.props;
isSecondaryDevice,
showSessionSettingsCategory,
settingsCategory,
} = this.props;
const category = settingsCategory || SessionSettingCategory.Appearance; const category = settingsCategory || SessionSettingCategory.Appearance;
return ( return (
<> <>
<LeftPaneSettingSection <LeftPaneSettingSection {...this.props} settingsCategory={category} />
{...this.props}
isSecondaryDevice={isSecondaryDevice}
showSessionSettingsCategory={showSessionSettingsCategory}
settingsCategory={category}
/>
</> </>
); );
} }

12
ts/components/conversation/Message.tsx
Unescape Escape View File

@ -52,8 +52,8 @@ interface LinkPreviewType {
export interface Props { export interface Props {
disableMenu?: boolean; disableMenu?: boolean;
isDeletable: boolean; isDeletable: boolean;
isModerator?: boolean; isAdmin?: boolean;
weAreModerator?: boolean; weAreAdmin?: boolean;
text?: string; text?: string;
bodyPending?: boolean; bodyPending?: boolean;
id: string; id: string;
@ -574,7 +574,7 @@ class MessageInner extends React.PureComponent<Props, State> {
authorPhoneNumber, authorPhoneNumber,
authorProfileName, authorProfileName,
collapseMetadata, collapseMetadata,
isModerator, isAdmin,
conversationType, conversationType,
direction, direction,
onShowUserDetails, onShowUserDetails,
@ -605,7 +605,7 @@ class MessageInner extends React.PureComponent<Props, State> {
}} }}
pubkey={authorPhoneNumber} pubkey={authorPhoneNumber}
/> />
{isModerator && ( {isAdmin && (
<div className="module-avatar__icon--crown-wrapper"> <div className="module-avatar__icon--crown-wrapper">
<div className="module-avatar__icon--crown" /> <div className="module-avatar__icon--crown" />
</div> </div>
@ -692,7 +692,7 @@ class MessageInner extends React.PureComponent<Props, State> {
onRetrySend, onRetrySend,
onShowDetail, onShowDetail,
isPublic, isPublic,
weAreModerator, weAreAdmin,
onBanUser, onBanUser,
} = this.props; } = this.props;
@ -760,7 +760,7 @@ class MessageInner extends React.PureComponent<Props, State> {
</Item> </Item>
</> </>
) : null} ) : null}
{weAreModerator && isPublic ? ( {weAreAdmin && isPublic ? (
<Item onClick={onBanUser}>{window.i18n('banUser')}</Item> <Item onClick={onBanUser}>{window.i18n('banUser')}</Item>
) : null} ) : null}
</Menu> </Menu>

6
ts/components/conversation/message/MessageMetadata.tsx
Unescape Escape View File

@ -14,7 +14,7 @@ import styled, { DefaultTheme } from 'styled-components';
type Props = { type Props = {
disableMenu?: boolean; disableMenu?: boolean;
isModerator?: boolean; isAdmin?: boolean;
isDeletable: boolean; isDeletable: boolean;
text?: string; text?: string;
bodyPending?: boolean; bodyPending?: boolean;
@ -74,7 +74,7 @@ export const MessageMetadata = (props: Props) => {
serverTimestamp, serverTimestamp,
isShowingImage, isShowingImage,
isPublic, isPublic,
isModerator, isAdmin,
theme, theme,
} = props; } = props;
@ -109,7 +109,7 @@ export const MessageMetadata = (props: Props) => {
<MetadataBadges <MetadataBadges
direction={direction} direction={direction}
isPublic={isPublic} isPublic={isPublic}
isModerator={isModerator} isAdmin={isAdmin}
id={id} id={id}
withImageNoCaption={withImageNoCaption} withImageNoCaption={withImageNoCaption}
/> />

6
ts/components/conversation/message/MetadataBadge.tsx
Unescape Escape View File

@ -45,15 +45,15 @@ type BadgesProps = {
id: string; id: string;
direction: string; direction: string;
isPublic?: boolean; isPublic?: boolean;
isModerator?: boolean; isAdmin?: boolean;
withImageNoCaption: boolean; withImageNoCaption: boolean;
}; };
export const MetadataBadges = (props: BadgesProps): JSX.Element => { export const MetadataBadges = (props: BadgesProps): JSX.Element => {
const { id, direction, isPublic, isModerator, withImageNoCaption } = props; const { id, direction, isPublic, isAdmin, withImageNoCaption } = props;
const badges = [ const badges = [
(isPublic && 'Public') || null, (isPublic && 'Public') || null,
(isModerator && 'Mod') || null, (isAdmin && 'Mod') || null,
].filter(nonNullish); ].filter(nonNullish);
if (!badges || badges.length === 0) { if (!badges || badges.length === 0) {

15
ts/components/session/ActionsPanel.tsx
Unescape Escape View File

@ -10,10 +10,11 @@ import { ConversationType } from '../../state/ducks/conversations';
import { noop } from 'lodash'; import { noop } from 'lodash';
import { DefaultTheme } from 'styled-components'; import { DefaultTheme } from 'styled-components';
import { StateType } from '../../state/reducer'; import { StateType } from '../../state/reducer';
import { MessageEncrypter } from '../../session/crypto';
import { PubKey } from '../../session/types';
import { UserUtil } from '../../util'; import { UserUtil } from '../../util';
import { ConversationController } from '../../session/conversations'; import { ConversationController } from '../../session/conversations';
import { getFocusedSection } from '../../state/selectors/section';
import { getTheme } from '../../state/selectors/theme';
import { getPrimaryPubkey } from '../../state/selectors/user';
// tslint:disable-next-line: no-import-side-effect no-submodule-imports // tslint:disable-next-line: no-import-side-effect no-submodule-imports
export enum SectionType { export enum SectionType {
@ -30,6 +31,7 @@ interface Props {
selectedSection: SectionType; selectedSection: SectionType;
unreadMessageCount: number; unreadMessageCount: number;
ourPrimaryConversation: ConversationType; ourPrimaryConversation: ConversationType;
ourPrimary: string;
applyTheme?: any; applyTheme?: any;
theme: DefaultTheme; theme: DefaultTheme;
} }
@ -68,6 +70,7 @@ class ActionsPanelPrivate extends React.Component<Props> {
avatarPath?: string; avatarPath?: string;
notificationCount?: number; notificationCount?: number;
}) => { }) => {
const { ourPrimary } = this.props;
const handleClick = onSelect const handleClick = onSelect
? () => { ? () => {
/* tslint:disable:no-void-expression */ /* tslint:disable:no-void-expression */
@ -89,7 +92,6 @@ class ActionsPanelPrivate extends React.Component<Props> {
: undefined; : undefined;
if (type === SectionType.Profile) { if (type === SectionType.Profile) {
const ourPrimary = window.storage.get('primaryDevicePubKey');
const conversation = ConversationController.getInstance().get(ourPrimary); const conversation = ConversationController.getInstance().get(ourPrimary);
const profile = conversation?.getLokiProfile(); const profile = conversation?.getLokiProfile();
@ -202,11 +204,10 @@ class ActionsPanelPrivate extends React.Component<Props> {
} }
const mapStateToProps = (state: StateType) => { const mapStateToProps = (state: StateType) => {
const { section, theme } = state;
return { return {
section: section.focusedSection, section: getFocusedSection(state),
theme, theme: getTheme(state),
ourPrimary: getPrimaryPubkey(state),
}; };
}; };

21
ts/components/session/conversation/SessionCompositionBox.tsx
Unescape Escape View File

@ -29,6 +29,7 @@ import { MemberItem } from '../../conversation/MemberList';
import { CaptionEditor } from '../../CaptionEditor'; import { CaptionEditor } from '../../CaptionEditor';
import { DefaultTheme } from 'styled-components'; import { DefaultTheme } from 'styled-components';
import { ConversationController } from '../../../session/conversations/ConversationController'; import { ConversationController } from '../../../session/conversations/ConversationController';
import { ConversationType } from '../../../state/ducks/conversations';
export interface ReplyingToMessageProps { export interface ReplyingToMessageProps {
convoId: string; convoId: string;
@ -64,7 +65,8 @@ interface Props {
isPrivate: boolean; isPrivate: boolean;
isKickedFromGroup: boolean; isKickedFromGroup: boolean;
left: boolean; left: boolean;
conversationKey: string; selectedConversationKey: string;
selectedConversation: ConversationType | undefined;
isPublic: boolean; isPublic: boolean;
quotedMessageProps?: ReplyingToMessageProps; quotedMessageProps?: ReplyingToMessageProps;
@ -186,7 +188,9 @@ export class SessionCompositionBox extends React.Component<Props, State> {
} }
public componentDidUpdate(prevProps: Props, _prevState: State) { public componentDidUpdate(prevProps: Props, _prevState: State) {
// reset the state on new conversation key // reset the state on new conversation key
if (prevProps.conversationKey !== this.props.conversationKey) { if (
prevProps.selectedConversationKey !== this.props.selectedConversationKey
) {
this.setState(getDefaultState(), this.focusCompositionBox); this.setState(getDefaultState(), this.focusCompositionBox);
this.lastBumpTypingMessageLength = 0; this.lastBumpTypingMessageLength = 0;
} else if ( } else if (
@ -452,13 +456,14 @@ export class SessionCompositionBox extends React.Component<Props, State> {
} }
private fetchUsersForClosedGroup(query: any, callback: any) { private fetchUsersForClosedGroup(query: any, callback: any) {
const conversationModel = ConversationController.getInstance().get( const { selectedConversation } = this.props;
this.props.conversationKey if (!selectedConversation) {
); return;
if (!conversationModel) { }
const allPubKeys = selectedConversation.members;
if (!allPubKeys || allPubKeys.length === 0) {
return; return;
} }
const allPubKeys = conversationModel.get('members');
const allMembers = allPubKeys.map(pubKey => { const allMembers = allPubKeys.map(pubKey => {
const conv = ConversationController.getInstance().get(pubKey); const conv = ConversationController.getInstance().get(pubKey);
@ -724,7 +729,7 @@ export class SessionCompositionBox extends React.Component<Props, State> {
// catching ESC, tab, or whatever which is not typing // catching ESC, tab, or whatever which is not typing
if (message.length && message.length !== this.lastBumpTypingMessageLength) { if (message.length && message.length !== this.lastBumpTypingMessageLength) {
const conversationModel = ConversationController.getInstance().get( const conversationModel = ConversationController.getInstance().get(
this.props.conversationKey this.props.selectedConversationKey
); );
if (!conversationModel) { if (!conversationModel) {
return; return;

184
ts/components/session/conversation/SessionConversation.tsx
Unescape Escape View File

@ -72,8 +72,8 @@ interface State {
interface Props { interface Props {
ourPrimary: string; ourPrimary: string;
conversationKey: string; selectedConversationKey: string;
conversation: ConversationType; selectedConversation?: ConversationType;
theme: DefaultTheme; theme: DefaultTheme;
messages: Array<any>; messages: Array<any>;
actions: any; actions: any;
@ -88,13 +88,7 @@ export class SessionConversation extends React.Component<Props, State> {
constructor(props: any) { constructor(props: any) {
super(props); super(props);
const { conversationKey } = this.props; const unreadCount = this.props.selectedConversation?.unreadCount || 0;
const conversationModel = ConversationController.getInstance().get(
conversationKey
);
const unreadCount = conversationModel?.get('unreadCount') || 0;
this.state = { this.state = {
messageProgressVisible: false, messageProgressVisible: false,
sendingProgress: 0, sendingProgress: 0,
@ -163,10 +157,10 @@ export class SessionConversation extends React.Component<Props, State> {
public componentDidUpdate(prevProps: Props, prevState: State) { public componentDidUpdate(prevProps: Props, prevState: State) {
const { const {
conversationKey: newConversationKey, selectedConversationKey: newConversationKey,
conversation: newConversation, selectedConversation: newConversation,
} = this.props; } = this.props;
const { conversationKey: oldConversationKey } = prevProps; const { selectedConversationKey: oldConversationKey } = prevProps;
// if the convo is valid, and it changed, register for drag events // if the convo is valid, and it changed, register for drag events
if ( if (
@ -255,18 +249,19 @@ export class SessionConversation extends React.Component<Props, State> {
} = this.state; } = this.state;
const selectionMode = !!selectedMessages.length; const selectionMode = !!selectedMessages.length;
const { conversation, conversationKey, messages } = this.props; const {
const conversationModel = ConversationController.getInstance().get( selectedConversation,
conversationKey selectedConversationKey,
); messages,
} = this.props;
if (!conversationModel || !messages) { if (!selectedConversation || !messages) {
// return an empty message view // return an empty message view
return <MessageView />; return <MessageView />;
} }
const conversationModel = ConversationController.getInstance().get(
const { isRss } = conversation; selectedConversationKey
);
// TODO VINCE: OPTIMISE FOR NEW SENDING??? // TODO VINCE: OPTIMISE FOR NEW SENDING???
const sendMessageFn = ( const sendMessageFn = (
body: any, body: any,
@ -276,6 +271,9 @@ export class SessionConversation extends React.Component<Props, State> {
groupInvitation: any, groupInvitation: any,
otherOptions: any otherOptions: any
) => { ) => {
if (!conversationModel) {
return;
}
void conversationModel.sendMessage( void conversationModel.sendMessage(
body, body,
attachments, attachments,
@ -292,11 +290,12 @@ export class SessionConversation extends React.Component<Props, State> {
} }
}; };
const shouldRenderRightPanel = !conversationModel.isRss();
const showSafetyNumber = infoViewState === 'safetyNumber'; const showSafetyNumber = infoViewState === 'safetyNumber';
const showMessageDetails = !!messageDetailShowProps; const showMessageDetails = !!messageDetailShowProps;
const isPublic = selectedConversation.isPublic || false;
const isPrivate = selectedConversation.type === 'direct';
return ( return (
<SessionTheme theme={this.props.theme}> <SessionTheme theme={this.props.theme}>
<div className="conversation-header">{this.renderHeader()}</div> <div className="conversation-header">{this.renderHeader()}</div>
@ -344,45 +343,41 @@ export class SessionConversation extends React.Component<Props, State> {
{isDraggingFile && <SessionFileDropzone />} {isDraggingFile && <SessionFileDropzone />}
</div> </div>
{!isRss && ( <SessionCompositionBox
// tslint:disable-next-line: use-simple-attributes isBlocked={selectedConversation.isBlocked}
<SessionCompositionBox left={selectedConversation.left}
isBlocked={conversation.isBlocked} isKickedFromGroup={selectedConversation.isKickedFromGroup}
left={conversation.left} isPrivate={isPrivate}
isKickedFromGroup={conversation.isKickedFromGroup} isPublic={isPublic}
isPrivate={conversation.type === 'direct'} selectedConversationKey={selectedConversationKey}
isPublic={conversation.isPublic || false} selectedConversation={selectedConversation}
conversationKey={conversationKey} sendMessage={sendMessageFn}
sendMessage={sendMessageFn} stagedAttachments={stagedAttachments}
stagedAttachments={stagedAttachments} onMessageSending={this.onMessageSending}
onMessageSending={this.onMessageSending} onMessageSuccess={this.onMessageSuccess}
onMessageSuccess={this.onMessageSuccess} onMessageFailure={this.onMessageFailure}
onMessageFailure={this.onMessageFailure} onLoadVoiceNoteView={this.onLoadVoiceNoteView}
onLoadVoiceNoteView={this.onLoadVoiceNoteView} onExitVoiceNoteView={this.onExitVoiceNoteView}
onExitVoiceNoteView={this.onExitVoiceNoteView} quotedMessageProps={quotedMessageProps}
quotedMessageProps={quotedMessageProps} removeQuotedMessage={() => {
removeQuotedMessage={() => { void this.replyToMessage(undefined);
void this.replyToMessage(undefined); }}
}} textarea={this.compositionBoxRef}
textarea={this.compositionBoxRef} clearAttachments={this.clearAttachments}
clearAttachments={this.clearAttachments} removeAttachment={this.removeAttachment}
removeAttachment={this.removeAttachment} onChoseAttachments={this.onChoseAttachments}
onChoseAttachments={this.onChoseAttachments} theme={this.props.theme}
theme={this.props.theme} />
/>
)}
</div> </div>
{shouldRenderRightPanel && ( <div
<div className={classNames(
className={classNames( 'conversation-item__options-pane',
'conversation-item__options-pane', showOptionsPane && 'show'
showOptionsPane && 'show' )}
)} >
> <SessionRightPanelWithDetails {...this.getRightPanelProps()} />
<SessionRightPanelWithDetails {...this.getRightPanelProps()} /> </div>
</div>
)}
</SessionTheme> </SessionTheme>
); );
} }
@ -397,33 +392,34 @@ export class SessionConversation extends React.Component<Props, State> {
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
public async loadInitialMessages() { public async loadInitialMessages() {
const { conversationKey } = this.props; const { selectedConversation, selectedConversationKey } = this.props;
const conversationModel = ConversationController.getInstance().get(
conversationKey if (!selectedConversation) {
);
if (!conversationModel) {
return; return;
} }
const conversationModel = ConversationController.getInstance().get(
selectedConversationKey
);
const unreadCount = await conversationModel.getUnreadCount(); const unreadCount = await conversationModel.getUnreadCount();
const messagesToFetch = Math.max( const messagesToFetch = Math.max(
Constants.CONVERSATION.DEFAULT_MESSAGE_FETCH_COUNT, Constants.CONVERSATION.DEFAULT_MESSAGE_FETCH_COUNT,
unreadCount unreadCount
); );
this.props.actions.fetchMessagesForConversation({ this.props.actions.fetchMessagesForConversation({
conversationKey, conversationKey: selectedConversationKey,
count: messagesToFetch, count: messagesToFetch,
}); });
} }
public getHeaderProps() { public getHeaderProps() {
const { conversationKey } = this.props; const { selectedConversationKey, ourPrimary } = this.props;
const { const {
selectedMessages, selectedMessages,
infoViewState, infoViewState,
messageDetailShowProps, messageDetailShowProps,
} = this.state; } = this.state;
const conversation = ConversationController.getInstance().getOrThrow( const conversation = ConversationController.getInstance().getOrThrow(
conversationKey selectedConversationKey
); );
const expireTimer = conversation.get('expireTimer'); const expireTimer = conversation.get('expireTimer');
const expirationSettingName = expireTimer const expirationSettingName = expireTimer
@ -446,9 +442,7 @@ export class SessionConversation extends React.Component<Props, State> {
isPrivate: conversation.isPrivate(), isPrivate: conversation.isPrivate(),
isPublic: conversation.isPublic(), isPublic: conversation.isPublic(),
isRss: conversation.isRss(), isRss: conversation.isRss(),
isAdmin: conversation.isModerator( isAdmin: conversation.isAdmin(ourPrimary),
window.storage.get('primaryDevicePubKey')
),
members, members,
subscriberCount: conversation.get('subscriberCount'), subscriberCount: conversation.get('subscriberCount'),
isKickedFromGroup: conversation.get('isKickedFromGroup'), isKickedFromGroup: conversation.get('isKickedFromGroup'),
@ -524,17 +518,23 @@ export class SessionConversation extends React.Component<Props, State> {
} }
public getMessagesListProps() { public getMessagesListProps() {
const { conversation, ourPrimary, messages, actions } = this.props; const {
selectedConversation,
selectedConversationKey,
ourPrimary,
messages,
actions,
} = this.props;
const { quotedMessageTimestamp, selectedMessages } = this.state; const { quotedMessageTimestamp, selectedMessages } = this.state;
return { return {
selectedMessages, selectedMessages,
ourPrimary, ourPrimary,
conversationKey: conversation.id, conversationKey: selectedConversationKey,
messages, messages,
resetSelection: this.resetSelection, resetSelection: this.resetSelection,
quotedMessageTimestamp, quotedMessageTimestamp,
conversation, conversation: selectedConversation as ConversationType,
selectMessage: this.selectMessage, selectMessage: this.selectMessage,
deleteMessage: this.deleteMessage, deleteMessage: this.deleteMessage,
fetchMessagesForConversation: actions.fetchMessagesForConversation, fetchMessagesForConversation: actions.fetchMessagesForConversation,
@ -548,9 +548,9 @@ export class SessionConversation extends React.Component<Props, State> {
} }
public getRightPanelProps() { public getRightPanelProps() {
const { conversationKey } = this.props; const { selectedConversationKey } = this.props;
const conversation = ConversationController.getInstance().getOrThrow( const conversation = ConversationController.getInstance().getOrThrow(
conversationKey selectedConversationKey
); );
const ourPrimary = window.storage.get('primaryDevicePubKey'); const ourPrimary = window.storage.get('primaryDevicePubKey');
@ -558,7 +558,7 @@ export class SessionConversation extends React.Component<Props, State> {
const isAdmin = conversation.isMediumGroup() const isAdmin = conversation.isMediumGroup()
? true ? true
: conversation.isPublic() : conversation.isPublic()
? conversation.isModerator(ourPrimary) ? conversation.isAdmin(ourPrimary)
: false; : false;
return { return {
@ -670,26 +670,32 @@ export class SessionConversation extends React.Component<Props, State> {
askUserForConfirmation: boolean askUserForConfirmation: boolean
) { ) {
// Get message objects // Get message objects
const { conversationKey, messages } = this.props; const {
selectedConversationKey,
selectedConversation,
messages,
} = this.props;
const conversationModel = ConversationController.getInstance().getOrThrow( const conversationModel = ConversationController.getInstance().getOrThrow(
conversationKey selectedConversationKey
); );
if (!selectedConversation) {
window.log.info('No valid selected conversation.');
return;
}
const selectedMessages = messages.filter(message => const selectedMessages = messages.filter(message =>
messageIds.find(selectedMessage => selectedMessage === message.id) messageIds.find(selectedMessage => selectedMessage === message.id)
); );
const multiple = selectedMessages.length > 1; const multiple = selectedMessages.length > 1;
const isPublic = conversationModel.isPublic();
// In future, we may be able to unsend private messages also // In future, we may be able to unsend private messages also
// isServerDeletable also defined in ConversationHeader.tsx for // isServerDeletable also defined in ConversationHeader.tsx for
// future reference // future reference
const isServerDeletable = isPublic; const isServerDeletable = selectedConversation.isPublic;
const warningMessage = (() => { const warningMessage = (() => {
if (isPublic) { if (selectedConversation.isPublic) {
return multiple return multiple
? window.i18n('deleteMultiplePublicWarning') ? window.i18n('deleteMultiplePublicWarning')
: window.i18n('deletePublicWarning'); : window.i18n('deletePublicWarning');
@ -704,7 +710,7 @@ export class SessionConversation extends React.Component<Props, State> {
// VINCE TODO: MARK TO-DELETE MESSAGES AS READ // VINCE TODO: MARK TO-DELETE MESSAGES AS READ
if (isPublic) { if (selectedConversation.isPublic) {
// Get our Moderator status // Get our Moderator status
const ourDevicePubkey = await UserUtil.getCurrentDevicePubKey(); const ourDevicePubkey = await UserUtil.getCurrentDevicePubKey();
if (!ourDevicePubkey) { if (!ourDevicePubkey) {
@ -713,7 +719,7 @@ export class SessionConversation extends React.Component<Props, State> {
const ourPrimaryPubkey = ( const ourPrimaryPubkey = (
await MultiDeviceProtocol.getPrimaryDevice(ourDevicePubkey) await MultiDeviceProtocol.getPrimaryDevice(ourDevicePubkey)
).key; ).key;
const isModerator = conversationModel.isModerator(ourPrimaryPubkey); const isAdmin = conversationModel.isAdmin(ourPrimaryPubkey);
const ourNumbers = (await MultiDeviceProtocol.getOurDevices()).map( const ourNumbers = (await MultiDeviceProtocol.getOurDevices()).map(
m => m.key m => m.key
); );
@ -721,7 +727,7 @@ export class SessionConversation extends React.Component<Props, State> {
ourNumbers.includes(message.attributes.source) ourNumbers.includes(message.attributes.source)
); );
if (!isAllOurs && !isModerator) { if (!isAllOurs && !isAdmin) {
ToastUtils.pushMessageDeleteForbidden(); ToastUtils.pushMessageDeleteForbidden();
this.setState({ selectedMessages: [] }); this.setState({ selectedMessages: [] });
@ -820,14 +826,14 @@ export class SessionConversation extends React.Component<Props, State> {
// ~~~~~~~~~~~~~~ MESSAGE QUOTE ~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~ MESSAGE QUOTE ~~~~~~~~~~~~~~~
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
private async replyToMessage(quotedMessageTimestamp?: number) { private async replyToMessage(quotedMessageTimestamp?: number) {
if (this.props.conversation.isBlocked) { if (this.props.selectedConversation?.isBlocked) {
pushUnblockToSend(); pushUnblockToSend();
return; return;
} }
if (!_.isEqual(this.state.quotedMessageTimestamp, quotedMessageTimestamp)) { if (!_.isEqual(this.state.quotedMessageTimestamp, quotedMessageTimestamp)) {
const { messages, conversationKey } = this.props; const { messages, selectedConversationKey } = this.props;
const conversationModel = ConversationController.getInstance().getOrThrow( const conversationModel = ConversationController.getInstance().getOrThrow(
conversationKey selectedConversationKey
); );
let quotedMessageProps = null; let quotedMessageProps = null;
@ -1229,7 +1235,7 @@ export class SessionConversation extends React.Component<Props, State> {
private async updateMemberList() { private async updateMemberList() {
const allPubKeys = await window.Signal.Data.getPubkeysInPublicConversation( const allPubKeys = await window.Signal.Data.getPubkeysInPublicConversation(
this.props.conversationKey this.props.selectedConversationKey
); );
const allMembers = allPubKeys.map((pubKey: string) => { const allMembers = allPubKeys.map((pubKey: string) => {

5
ts/components/session/conversation/SessionMessagesList.tsx
Unescape Escape View File

@ -297,9 +297,8 @@ export class SessionMessagesList extends React.Component<Props, State> {
); );
} }
// allow moderators feature on messages (like banning a user) if (messageProps.conversationType === 'group') {
if (messageProps.isPublic) { messageProps.weAreAdmin = conversation.groupAdmins?.includes(
messageProps.weAreModerator = conversation.groupAdmins?.includes(
ourPrimary ourPrimary
); );
} }

8
ts/components/session/settings/SessionSettings.tsx
Unescape Escape View File

@ -19,6 +19,10 @@ import { mapDispatchToProps } from '../../../state/actions';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { StateType } from '../../../state/reducer'; import { StateType } from '../../../state/reducer';
import { ConversationController } from '../../../session/conversations'; import { ConversationController } from '../../../session/conversations';
import {
getConversationLookup,
getConversations,
} from '../../../state/selectors/conversations';
export enum SessionSettingCategory { export enum SessionSettingCategory {
Appearance = 'appearance', Appearance = 'appearance',
@ -746,10 +750,8 @@ class SettingsViewInner extends React.Component<SettingsViewProps, State> {
} }
const mapStateToProps = (state: StateType) => { const mapStateToProps = (state: StateType) => {
const { conversations } = state;
return { return {
conversations: conversations.conversationLookup, conversations: getConversationLookup(state),
}; };
}; };

3
ts/state/ducks/conversations.ts
Unescape Escape View File

@ -35,7 +35,7 @@ export type MessageType = {
isSelected?: boolean; isSelected?: boolean;
}; };
type MessageTypeInConvo = { export type MessageTypeInConvo = {
id: string; id: string;
conversationId: string; conversationId: string;
attributes: any; attributes: any;
@ -80,6 +80,7 @@ export type ConversationType = {
left: boolean; left: boolean;
avatarPath?: string; // absolute filepath to the avatar avatarPath?: string; // absolute filepath to the avatar
groupAdmins?: Array<string>; // admins for closed groups and moderators for open groups groupAdmins?: Array<string>; // admins for closed groups and moderators for open groups
members?: Array<string>; // members for closed groups only
}; };
export type ConversationLookupType = { export type ConversationLookupType = {
[key: string]: ConversationType; [key: string]: ConversationType;

1
ts/state/reducer.ts
Unescape Escape View File

@ -8,7 +8,6 @@ import {
import { reducer as user, UserStateType } from './ducks/user'; import { reducer as user, UserStateType } from './ducks/user';
import { reducer as theme, ThemeStateType } from './ducks/theme'; import { reducer as theme, ThemeStateType } from './ducks/theme';
import { reducer as section, SectionStateType } from './ducks/section'; import { reducer as section, SectionStateType } from './ducks/section';
import { PubKey } from '../session/types';
export type StateType = { export type StateType = {
search: SearchStateType; search: SearchStateType;

21
ts/state/selectors/conversations.ts
Unescape Escape View File

@ -7,6 +7,7 @@ import {
ConversationLookupType, ConversationLookupType,
ConversationsStateType, ConversationsStateType,
ConversationType, ConversationType,
MessageTypeInConvo,
} from '../ducks/conversations'; } from '../ducks/conversations';
import { getIntl, getRegionCode, getUserNumber } from './user'; import { getIntl, getRegionCode, getUserNumber } from './user';
@ -23,19 +24,33 @@ export const getConversationLookup = createSelector(
} }
); );
export const getSelectedConversation = createSelector( export const getSelectedConversationKey = createSelector(
getConversations, getConversations,
(state: ConversationsStateType): string | undefined => { (state: ConversationsStateType): string | undefined => {
return state.selectedConversation; return state.selectedConversation;
} }
); );
export const getSelectedConversation = createSelector(
getConversations,
(state: ConversationsStateType): ConversationType | undefined => {
return state.selectedConversation
? state.conversationLookup[state.selectedConversation]
: undefined;
}
);
export const getOurPrimaryConversation = createSelector( export const getOurPrimaryConversation = createSelector(
getConversations, getConversations,
(state: ConversationsStateType): ConversationType => (state: ConversationsStateType): ConversationType =>
state.conversationLookup[window.storage.get('primaryDevicePubKey')] state.conversationLookup[window.storage.get('primaryDevicePubKey')]
); );
export const getMessagesOfSelectedConversation = createSelector(
getConversations,
(state: ConversationsStateType): Array<MessageTypeInConvo> => state.messages
);
function getConversationTitle( function getConversationTitle(
conversation: ConversationType, conversation: ConversationType,
options: { i18n: LocalizerType; ourRegionCode: string } options: { i18n: LocalizerType; ourRegionCode: string }
@ -229,14 +244,14 @@ export const _getSessionConversationInfo = (
export const getLeftPaneLists = createSelector( export const getLeftPaneLists = createSelector(
getConversationLookup, getConversationLookup,
getConversationComparator, getConversationComparator,
getSelectedConversation, getSelectedConversationKey,
_getLeftPaneLists _getLeftPaneLists
); );
export const getSessionConversationInfo = createSelector( export const getSessionConversationInfo = createSelector(
getConversationLookup, getConversationLookup,
getConversationComparator, getConversationComparator,
getSelectedConversation, getSelectedConversationKey,
_getSessionConversationInfo _getSessionConversationInfo
); );

3
ts/state/selectors/search.ts
Unescape Escape View File

@ -7,6 +7,7 @@ import { SearchStateType } from '../ducks/search';
import { import {
getConversationLookup, getConversationLookup,
getSelectedConversation, getSelectedConversation,
getSelectedConversationKey,
} from './conversations'; } from './conversations';
import { ConversationLookupType } from '../ducks/conversations'; import { ConversationLookupType } from '../ducks/conversations';
@ -38,7 +39,7 @@ export const getSearchResults = createSelector(
getSearch, getSearch,
getRegionCode, getRegionCode,
getConversationLookup, getConversationLookup,
getSelectedConversation, getSelectedConversationKey,
getSelectedMessage, getSelectedMessage,
], ],
( (

12
ts/state/selectors/section.ts
Unescape Escape View File

@ -0,0 +1,12 @@
import { createSelector } from 'reselect';
import { StateType } from '../reducer';
import { SectionStateType } from '../ducks/section';
import { SectionType } from '../../components/session/ActionsPanel';
export const getSection = (state: StateType): SectionStateType => state.section;
export const getFocusedSection = createSelector(
getSection,
(state: SectionStateType): SectionType => state.focusedSection
);

4
ts/state/selectors/theme.ts
Unescape Escape View File

@ -0,0 +1,4 @@
import { StateType } from '../reducer';
import { ThemeStateType } from '../ducks/theme';
export const getTheme = (state: StateType): ThemeStateType => state.theme;

6
ts/state/smart/LeftPane.tsx
Unescape Escape View File

@ -14,6 +14,8 @@ import {
getOurPrimaryConversation, getOurPrimaryConversation,
} from '../selectors/conversations'; } from '../selectors/conversations';
import { mapDispatchToProps } from '../actions'; import { mapDispatchToProps } from '../actions';
import { getFocusedSection } from '../selectors/section';
import { getTheme } from '../selectors/theme';
// Workaround: A react component's required properties are filtering up through connect() // Workaround: A react component's required properties are filtering up through connect()
// https://github.com/DefinitelyTyped/DefinitelyTyped/issues/31363 // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/31363
@ -34,8 +36,8 @@ const mapStateToProps = (state: StateType) => {
searchResults, searchResults,
i18n: getIntl(state), i18n: getIntl(state),
unreadMessageCount: leftPaneList.unreadCount, unreadMessageCount: leftPaneList.unreadCount,
theme: state.theme, theme: getTheme(state),
focusedSection: state.section.focusedSection, focusedSection: getFocusedSection(state),
}; };
}; };

22
ts/state/smart/SessionConversation.tsx
Unescape Escape View File

@ -3,20 +3,20 @@ import { mapDispatchToProps } from '../actions';
import { SessionConversation } from '../../components/session/conversation/SessionConversation'; import { SessionConversation } from '../../components/session/conversation/SessionConversation';
import { StateType } from '../reducer'; import { StateType } from '../reducer';
import { getPrimaryPubkey } from '../selectors/user'; import { getPrimaryPubkey } from '../selectors/user';
import { getTheme } from '../selectors/theme';
import {
getMessagesOfSelectedConversation,
getSelectedConversation,
getSelectedConversationKey,
} from '../selectors/conversations';
const mapStateToProps = (state: StateType) => { const mapStateToProps = (state: StateType) => {
const conversationKey = state.conversations.selectedConversation;
const ourPrimary = getPrimaryPubkey(state);
const conversation =
(conversationKey &&
state.conversations.conversationLookup[conversationKey]) ||
null;
return { return {
conversation, selectedConversation: getSelectedConversation(state),
conversationKey, selectedConversationKey: getSelectedConversationKey(state),
theme: state.theme, theme: getTheme(state),
messages: state.conversations.messages, messages: getMessagesOfSelectedConversation(state),
ourPrimary, ourPrimary: getPrimaryPubkey(state),
}; };
}; };

Write Preview
Loading…
Cancel
Save