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

rename authorPhoneNumber to what ever makes more sense

Browse Source
pull/2131/head
Audric Ackermann 3 years ago
parent 46d838218d
commit 1c46d81a20
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4
13 changed files with 69 additions and 80 deletions
Show Stats Download Patch File Download Diff File

4
ts/components/conversation/H5AudioPlayer.tsx
Unescape Escape View File

@ -60,8 +60,8 @@ export const AudioPlayerWithEncryptedFile = (props: {
// justEndedMessageIndex cannot be -1 nor 0, so it is >= 1
const nextMessageIndex = justEndedMessageIndex - 1;
// stop auto-playing when the audio messages change author.
const prevAuthorNumber = messageProps[justEndedMessageIndex].propsForMessage.authorPhoneNumber;
const nextAuthorNumber = messageProps[nextMessageIndex].propsForMessage.authorPhoneNumber;
const prevAuthorNumber = messageProps[justEndedMessageIndex].propsForMessage.sender;
const nextAuthorNumber = messageProps[nextMessageIndex].propsForMessage.sender;
const differentAuthor = prevAuthorNumber !== nextAuthorNumber;
if (differentAuthor) {
dispatch(setNextMessageToPlayId(undefined));

1
ts/components/conversation/SessionConversation.tsx
Unescape Escape View File

@ -532,7 +532,6 @@ export class SessionConversation extends React.Component<Props, State> {
return {
id: pubKey,
authorPhoneNumber: pubKey,
authorProfileName: profileName,
};
});

2
ts/components/conversation/SessionMessagesListContainer.tsx
Unescape Escape View File

@ -330,7 +330,7 @@ class SessionMessagesListContainerInner extends React.Component<Props> {
}
// Look for message in memory first, which would tell us if we could scroll to it
const targetMessage = messagesProps.find(item => {
const messageAuthor = item.propsForMessage?.authorPhoneNumber;
const messageAuthor = item.propsForMessage?.sender;
if (!messageAuthor || quoteAuthor !== messageAuthor) {
return false;

5
ts/components/conversation/composition/CompositionBox.tsx
Unescape Escape View File

@ -466,7 +466,7 @@ class CompositionBoxInner extends React.Component<Props, State> {
.map(user => {
return {
display: user.authorProfileName,
id: user.authorPhoneNumber,
id: user.id,
};
}) || [];
callback(filtered);
@ -509,7 +509,6 @@ class CompositionBoxInner extends React.Component<Props, State> {
}
return {
id: pubKey,
authorPhoneNumber: pubKey,
authorProfileName: profileName,
};
});
@ -524,7 +523,7 @@ class CompositionBoxInner extends React.Component<Props, State> {
// Transform the users to what react-mentions expects
const mentionsData = members.map(user => ({
display: user.authorProfileName || window.i18n('anonymous'),
id: user.authorPhoneNumber,
id: user.id,
}));
callback(mentionsData);
}

8
ts/components/conversation/message/message-content/MessageAttachment.tsx
Unescape Escape View File

@ -38,7 +38,7 @@ export type MessageAttachmentSelectorProps = Pick<
| 'direction'
| 'timestamp'
| 'serverTimestamp'
| 'authorPhoneNumber'
| 'sender'
| 'convoId'
> & {
attachments: Array<PropsForAttachment>;
@ -81,11 +81,11 @@ export const MessageAttachment = (props: Props) => {
}
const messageTimestamp = attachmentProps?.timestamp || attachmentProps?.serverTimestamp || 0;
if (attachmentProps?.authorPhoneNumber && attachmentProps?.convoId) {
if (attachmentProps?.sender && attachmentProps?.convoId) {
void saveAttachmentToDisk({
attachment: attachments[0],
messageTimestamp,
messageSender: attachmentProps?.authorPhoneNumber,
messageSender: attachmentProps?.sender,
conversationId: attachmentProps?.convoId,
});
}
@ -94,7 +94,7 @@ export const MessageAttachment = (props: Props) => {
attachmentProps?.attachments,
attachmentProps?.timestamp,
attachmentProps?.serverTimestamp,
attachmentProps?.authorPhoneNumber,
attachmentProps?.sender,
attachmentProps?.convoId,
]
);

16
ts/components/conversation/message/message-content/MessageAuthorText.tsx
Unescape Escape View File

@ -12,7 +12,7 @@ import { ContactName } from '../../ContactName';
export type MessageAuthorSelectorProps = Pick<
MessageRenderingProps,
'authorName' | 'authorProfileName' | 'authorPhoneNumber' | 'direction' | 'firstMessageOfSeries'
'authorName' | 'authorProfileName' | 'sender' | 'direction' | 'firstMessageOfSeries'
>;
type Props = {
@ -27,23 +27,17 @@ export const MessageAuthorText = (props: Props) => {
if (!selected) {
return null;
}
const {
authorName,
authorPhoneNumber,
authorProfileName,
direction,
firstMessageOfSeries,
} = selected;
const { authorName, sender, authorProfileName, direction, firstMessageOfSeries } = selected;
const title = authorName ? authorName : authorPhoneNumber;
const title = authorName ? authorName : sender;
if (direction !== 'incoming' || !isGroup || !title || !firstMessageOfSeries) {
return null;
}
const shortenedPubkey = PubKey.shorten(authorPhoneNumber);
const shortenedPubkey = PubKey.shorten(sender);
const displayedPubkey = authorProfileName ? shortenedPubkey : authorPhoneNumber;
const displayedPubkey = authorProfileName ? shortenedPubkey : sender;
return (
<Flex container={true}>

16
ts/components/conversation/message/message-content/MessageAvatar.tsx
Unescape Escape View File

@ -10,7 +10,7 @@ export type MessageAvatarSelectorProps = Pick<
MessageRenderingProps,
| 'authorAvatarPath'
| 'authorName'
| 'authorPhoneNumber'
| 'sender'
| 'authorProfileName'
| 'isSenderAdmin'
| 'conversationType'
@ -33,7 +33,7 @@ export const MessageAvatar = (props: Props) => {
const {
authorAvatarPath,
authorName,
authorPhoneNumber,
sender,
authorProfileName,
conversationType,
direction,
@ -45,28 +45,28 @@ export const MessageAvatar = (props: Props) => {
if (conversationType !== 'group' || direction === 'outgoing') {
return null;
}
const userName = authorName || authorProfileName || authorPhoneNumber;
const userName = authorName || authorProfileName || sender;
const onMessageAvatarClick = useCallback(() => {
dispatch(
updateUserDetailsModal({
conversationId: authorPhoneNumber,
conversationId: sender,
userName,
authorAvatarPath,
})
);
}, [userName, authorPhoneNumber, authorAvatarPath]);
}, [userName, sender, authorAvatarPath]);
if (!lastMessageOfSeries) {
return <div style={{ marginInlineEnd: '60px' }} key={`msg-avatar-${authorPhoneNumber}`} />;
return <div style={{ marginInlineEnd: '60px' }} key={`msg-avatar-${sender}`} />;
}
return (
<div className="module-message__author-avatar" key={`msg-avatar-${authorPhoneNumber}`}>
<div className="module-message__author-avatar" key={`msg-avatar-${sender}`}>
<Avatar
size={AvatarSize.S}
onAvatarClick={(!isPublic && onMessageAvatarClick) || undefined}
pubkey={authorPhoneNumber}
pubkey={sender}
/>
{isSenderAdmin && <CrownIcon />}
</div>

24
ts/components/conversation/message/message-content/MessageContextMenu.tsx
Unescape Escape View File

@ -26,7 +26,7 @@ import { saveAttachmentToDisk } from '../../../../util/attachmentsUtil';
export type MessageContextMenuSelectorProps = Pick<
MessageRenderingProps,
| 'attachments'
| 'authorPhoneNumber'
| 'sender'
| 'convoId'
| 'direction'
| 'status'
@ -54,7 +54,7 @@ export const MessageContextMenu = (props: Props) => {
}
const {
attachments,
authorPhoneNumber,
sender,
convoId,
direction,
status,
@ -103,12 +103,12 @@ export const MessageContextMenu = (props: Props) => {
const unsendMessageText = window.i18n('deleteForEveryone');
const addModerator = useCallback(() => {
void addSenderAsModerator(authorPhoneNumber, convoId);
}, [authorPhoneNumber, convoId]);
void addSenderAsModerator(sender, convoId);
}, [sender, convoId]);
const removeModerator = useCallback(() => {
void removeSenderFromModerator(authorPhoneNumber, convoId);
}, [authorPhoneNumber, convoId]);
void removeSenderFromModerator(sender, convoId);
}, [sender, convoId]);
const onReply = useCallback(() => {
if (isBlocked) {
@ -128,11 +128,11 @@ export const MessageContextMenu = (props: Props) => {
void saveAttachmentToDisk({
attachment: attachments[0],
messageTimestamp,
messageSender: authorPhoneNumber,
messageSender: sender,
conversationId: convoId,
});
},
[convoId, authorPhoneNumber, timestamp, serverTimestamp, convoId, attachments]
[convoId, sender, timestamp, serverTimestamp, convoId, attachments]
);
const copyText = useCallback(() => {
@ -147,12 +147,12 @@ export const MessageContextMenu = (props: Props) => {
}, [messageId]);
const onBan = useCallback(() => {
MessageInteraction.banUser(authorPhoneNumber, convoId);
}, [authorPhoneNumber, convoId]);
MessageInteraction.banUser(sender, convoId);
}, [sender, convoId]);
const onUnban = useCallback(() => {
MessageInteraction.unbanUser(authorPhoneNumber, convoId);
}, [authorPhoneNumber, convoId]);
MessageInteraction.unbanUser(sender, convoId);
}, [sender, convoId]);
const onSelect = useCallback(() => {
dispatch(toggleSelectedMessageId(messageId));

12
ts/components/conversation/message/message-content/MessageQuote.tsx
Unescape Escape View File

@ -40,11 +40,11 @@ export const MessageQuote = (props: Props) => {
return;
}
const { authorPhoneNumber, referencedMessageNotFound, messageId } = selected.quote;
const { sender, referencedMessageNotFound, messageId } = selected.quote;
const quoteId = _.toNumber(messageId);
scrollToQuote?.({
quoteAuthor: authorPhoneNumber,
quoteAuthor: sender,
quoteId,
referencedMessageNotFound: referencedMessageNotFound || false,
});
@ -57,12 +57,12 @@ export const MessageQuote = (props: Props) => {
const { quote, direction } = selected;
if (!quote || !quote.authorPhoneNumber || !quote.messageId) {
if (!quote || !quote.sender || !quote.messageId) {
return null;
}
const shortenedPubkey = PubKey.shorten(quote.authorPhoneNumber);
const shortenedPubkey = PubKey.shorten(quote.sender);
const displayedPubkey = quote.authorProfileName ? shortenedPubkey : quote.authorPhoneNumber;
const displayedPubkey = quote.authorProfileName ? shortenedPubkey : quote.sender;
return (
<Quote
@ -70,7 +70,7 @@ export const MessageQuote = (props: Props) => {
text={quote.text || ''}
attachment={quote.attachment}
isIncoming={direction === 'incoming'}
authorPhoneNumber={displayedPubkey}
sender={displayedPubkey}
authorProfileName={quote.authorProfileName}
authorName={quote.authorName}
referencedMessageNotFound={quote.referencedMessageNotFound || false}

10
ts/components/conversation/message/message-content/Quote.tsx
Unescape Escape View File

@ -20,7 +20,7 @@ import { MessageBody } from './MessageBody';
export type QuotePropsWithoutListener = {
attachment?: QuotedAttachmentType;
authorPhoneNumber: string;
sender: string;
authorProfileName?: string;
authorName?: string;
isFromMe: boolean;
@ -269,7 +269,7 @@ export const QuoteText = (
};
type QuoteAuthorProps = {
authorPhoneNumber: string;
author: string;
authorProfileName?: string;
authorName?: string;
isFromMe: boolean;
@ -278,7 +278,7 @@ type QuoteAuthorProps = {
};
const QuoteAuthor = (props: QuoteAuthorProps) => {
const { authorProfileName, authorPhoneNumber, authorName, isFromMe, isIncoming } = props;
const { authorProfileName, author, authorName, isFromMe, isIncoming } = props;
return (
<div
@ -291,7 +291,7 @@ const QuoteAuthor = (props: QuoteAuthorProps) => {
window.i18n('you')
) : (
<ContactName
pubkey={PubKey.shorten(authorPhoneNumber)}
pubkey={PubKey.shorten(author)}
name={authorName}
profileName={authorProfileName}
compact={true}
@ -365,7 +365,7 @@ export const Quote = (props: QuotePropsWithListener) => {
<div className="module-quote__primary">
<QuoteAuthor
authorName={props.authorName}
authorPhoneNumber={props.authorPhoneNumber}
author={props.sender}
authorProfileName={props.authorProfileName}
isFromMe={props.isFromMe}
isIncoming={props.isIncoming}

6
ts/models/message.ts
Unescape Escape View File

@ -421,7 +421,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
id: this.id,
direction: (this.isIncoming() ? 'incoming' : 'outgoing') as MessageModelType,
timestamp: this.get('sent_at') || 0,
authorPhoneNumber: sender,
sender,
convoId: this.get('conversationId'),
};
if (body) {
@ -557,14 +557,14 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
const firstAttachment = quote.attachments && quote.attachments[0];
const quoteProps: {
referencedMessageNotFound?: boolean;
authorPhoneNumber: string;
sender: string;
messageId: string;
authorName: string;
text?: string;
attachment?: any;
isFromMe?: boolean;
} = {
authorPhoneNumber: author,
sender: author,
messageId: id,
authorName: authorName || 'Unknown',
};

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

@ -165,7 +165,7 @@ export type PropsForMessageWithoutConvoProps = {
id: string; // messageId
direction: MessageModelType;
timestamp: number;
authorPhoneNumber: string; // this is the sender
sender: string; // this is the sender
convoId: string; // this is the conversation in which this message was sent
text?: string;
@ -179,7 +179,7 @@ export type PropsForMessageWithoutConvoProps = {
text?: string;
attachment?: QuotedAttachmentType;
isFromMe?: boolean;
authorPhoneNumber: string;
sender: string;
authorProfileName?: string;
authorName?: string;
messageId?: string;
@ -283,7 +283,6 @@ export type ConversationsStateType = {
export type MentionsMembersType = Array<{
id: string;
authorPhoneNumber: string;
authorProfileName: string;
}>;

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

@ -667,14 +667,13 @@ function updateFirstMessageOfSeries(
const sortedMessageProps: Array<SortedMessageModelProps> = [];
for (let i = 0; i < messageModelsProps.length; i++) {
const currentSender = messageModelsProps[i].propsForMessage?.authorPhoneNumber;
const currentSender = messageModelsProps[i].propsForMessage?.sender;
// most recent message is at index 0, so the previous message sender is 1+index
const previousSender =
i < messageModelsProps.length - 1
? messageModelsProps[i + 1].propsForMessage?.authorPhoneNumber
? messageModelsProps[i + 1].propsForMessage?.sender
: undefined;
const nextSender =
i > 0 ? messageModelsProps[i - 1].propsForMessage?.authorPhoneNumber : undefined;
const nextSender = i > 0 ? messageModelsProps[i - 1].propsForMessage?.sender : undefined;
// Handle firstMessageOfSeries for conditional avatar rendering
sortedMessageProps.push({
@ -773,14 +772,14 @@ export const getMessagePropsByMessageId = createSelector(
if (!foundMessageProps || !foundMessageProps.propsForMessage.convoId) {
return undefined;
}
const authorPhoneNumber = foundMessageProps?.propsForMessage?.authorPhoneNumber;
const sender = foundMessageProps?.propsForMessage?.sender;
const foundMessageConversation = conversations[foundMessageProps.propsForMessage.convoId];
if (!foundMessageConversation || !authorPhoneNumber) {
if (!foundMessageConversation || !sender) {
return undefined;
}
const foundSenderConversation = conversations[authorPhoneNumber];
const foundSenderConversation = conversations[sender];
if (!foundSenderConversation) {
return undefined;
}
@ -795,16 +794,15 @@ export const getMessagePropsByMessageId = createSelector(
// either we sent it,
// or the convo is not a public one (in this case, we will only be able to delete for us)
// or the convo is public and we are an admin
const isDeletable = authorPhoneNumber === ourPubkey || !isPublic || (isPublic && !!weAreAdmin);
const isDeletable = sender === ourPubkey || !isPublic || (isPublic && !!weAreAdmin);
// A message is deletable for everyone if
// either we sent it no matter what the conversation type,
// or the convo is public and we are an admin
const isDeletableForEveryone =
authorPhoneNumber === ourPubkey || (isPublic && !!weAreAdmin) || false;
const isDeletableForEveryone = sender === ourPubkey || (isPublic && !!weAreAdmin) || false;
const isSenderAdmin = groupAdmins.includes(authorPhoneNumber);
const senderIsUs = authorPhoneNumber === ourPubkey;
const isSenderAdmin = groupAdmins.includes(sender);
const senderIsUs = sender === ourPubkey;
const authorName = foundSenderConversation.name || null;
const authorProfileName = senderIsUs ? window.i18n('you') : foundSenderConversation.profileName;
@ -821,7 +819,7 @@ export const getMessagePropsByMessageId = createSelector(
isDeletableForEveryone,
weAreAdmin,
conversationType: foundMessageConversation.type,
authorPhoneNumber,
sender,
authorAvatarPath: foundSenderConversation.avatarPath || null,
isKickedFromGroup: foundMessageConversation.isKickedFromGroup || false,
authorProfileName: authorProfileName || 'Unknown',
@ -843,7 +841,7 @@ export const getMessageAvatarProps = createSelector(getMessagePropsByMessageId,
const {
authorAvatarPath,
authorName,
authorPhoneNumber,
sender,
authorProfileName,
conversationType,
direction,
@ -856,7 +854,7 @@ export const getMessageAvatarProps = createSelector(getMessagePropsByMessageId,
const messageAvatarProps: MessageAvatarSelectorProps = {
authorAvatarPath,
authorName,
authorPhoneNumber,
sender,
authorProfileName,
conversationType,
direction,
@ -949,7 +947,7 @@ export const getMessageContextMenuProps = createSelector(getMessagePropsByMessag
const {
attachments,
authorPhoneNumber,
sender,
convoId,
direction,
status,
@ -967,7 +965,7 @@ export const getMessageContextMenuProps = createSelector(getMessagePropsByMessag
const msgProps: MessageContextMenuSelectorProps = {
attachments,
authorPhoneNumber,
sender,
convoId,
direction,
status,
@ -993,12 +991,12 @@ export const getMessageAuthorProps = createSelector(getMessagePropsByMessageId,
return undefined;
}
const { authorName, authorPhoneNumber, authorProfileName, direction } = props.propsForMessage;
const { authorName, sender, authorProfileName, direction } = props.propsForMessage;
const { firstMessageOfSeries } = props;
const msgProps: MessageAuthorSelectorProps = {
authorName,
authorPhoneNumber,
sender,
authorProfileName,
direction,
firstMessageOfSeries,
@ -1031,7 +1029,7 @@ export const getMessageAttachmentProps = createSelector(getMessagePropsByMessage
isTrustedForAttachmentDownload,
timestamp,
serverTimestamp,
authorPhoneNumber,
sender,
convoId,
} = props.propsForMessage;
const msgProps: MessageAttachmentSelectorProps = {
@ -1040,7 +1038,7 @@ export const getMessageAttachmentProps = createSelector(getMessagePropsByMessage
isTrustedForAttachmentDownload,
timestamp,
serverTimestamp,
authorPhoneNumber,
sender,
convoId,
};

Write Preview
Loading…
Cancel
Save