mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Rename ContactType to EmbeddedContactType

Browse source
This commit is contained in:
Fedor Indutny 2021-08-19 18:56:39 -07:00 • committed by GitHub
parent 017a0fa807
commit fe040a2873
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 46 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/modules/signal.js
View file

@ -137,7 +137,7 @@ const searchSelectors = require('../../ts/state/selectors/search');
// Types // Types
const AttachmentType = require('../../ts/types/Attachment'); const AttachmentType = require('../../ts/types/Attachment');
const VisualAttachment = require('./types/visual_attachment'); const VisualAttachment = require('./types/visual_attachment');
const Contact = require('../../ts/types/Contact'); const EmbeddedContact = require('../../ts/types/EmbeddedContact');
const Conversation = require('./types/conversation'); const Conversation = require('./types/conversation');
const Errors = require('../../ts/types/errors'); const Errors = require('../../ts/types/errors');
const MediaGalleryMessage = require('../../ts/components/conversation/media-gallery/types/Message'); const MediaGalleryMessage = require('../../ts/components/conversation/media-gallery/types/Message');
@ -429,7 +429,7 @@ exports.setup = (options = {}) => {
const Types = { const Types = {
Attachment: AttachmentType, Attachment: AttachmentType,
Contact, EmbeddedContact,
Conversation, Conversation,
Errors, Errors,
Message: MessageType, Message: MessageType,

2
ts/components/conversation/ContactDetail.stories.tsx
View file

@ -8,7 +8,7 @@ import { boolean } from '@storybook/addon-knobs';
import { storiesOf } from '@storybook/react'; import { storiesOf } from '@storybook/react';
import { ContactDetail, Props } from './ContactDetail'; import { ContactDetail, Props } from './ContactDetail';
import { AddressType, ContactFormType } from '../../types/Contact'; import { AddressType, ContactFormType } from '../../types/EmbeddedContact';
import { setup as setupI18n } from '../../../js/modules/i18n'; import { setup as setupI18n } from '../../../js/modules/i18n';
import enMessages from '../../../_locales/en/messages.json'; import enMessages from '../../../_locales/en/messages.json';
import { IMAGE_GIF } from '../../types/MIME'; import { IMAGE_GIF } from '../../types/MIME';

6
ts/components/conversation/ContactDetail.tsx
View file

@ -6,11 +6,11 @@ import React from 'react';
import { import {
AddressType, AddressType,
ContactFormType, ContactFormType,
ContactType, EmbeddedContactType,
Email, Email,
Phone, Phone,
PostalAddress, PostalAddress,
} from '../../types/Contact'; } from '../../types/EmbeddedContact';
import { missingCaseError } from '../../util/missingCaseError'; import { missingCaseError } from '../../util/missingCaseError';
import { import {
@ -22,7 +22,7 @@ import {
import { LocalizerType } from '../../types/Util'; import { LocalizerType } from '../../types/Util';
export type Props = { export type Props = {
contact: ContactType; contact: EmbeddedContactType;
hasSignalAccount: boolean; hasSignalAccount: boolean;
i18n: LocalizerType; i18n: LocalizerType;
onSendMessage: () => void; onSendMessage: () => void;

2
ts/components/conversation/EmbeddedContact.stories.tsx
View file

@ -10,7 +10,7 @@ import { storiesOf } from '@storybook/react';
import { EmbeddedContact, Props } from './EmbeddedContact'; import { EmbeddedContact, Props } from './EmbeddedContact';
import { setup as setupI18n } from '../../../js/modules/i18n'; import { setup as setupI18n } from '../../../js/modules/i18n';
import enMessages from '../../../_locales/en/messages.json'; import enMessages from '../../../_locales/en/messages.json';
import { ContactFormType } from '../../types/Contact'; import { ContactFormType } from '../../types/EmbeddedContact';
import { IMAGE_GIF } from '../../types/MIME'; import { IMAGE_GIF } from '../../types/MIME';
const i18n = setupI18n('en', enMessages); const i18n = setupI18n('en', enMessages);

4
ts/components/conversation/EmbeddedContact.tsx
View file

@ -4,7 +4,7 @@
import React from 'react'; import React from 'react';
import classNames from 'classnames'; import classNames from 'classnames';
import { ContactType } from '../../types/Contact'; import { EmbeddedContactType } from '../../types/EmbeddedContact';
import { LocalizerType } from '../../types/Util'; import { LocalizerType } from '../../types/Util';
import { import {
@ -14,7 +14,7 @@ import {
} from './_contactUtil'; } from './_contactUtil';
export type Props = { export type Props = {
contact: ContactType; contact: EmbeddedContactType;
i18n: LocalizerType; i18n: LocalizerType;
isIncoming: boolean; isIncoming: boolean;
withContentAbove: boolean; withContentAbove: boolean;

6
ts/components/conversation/Message.tsx
View file

@ -49,7 +49,7 @@ import {
isVideo, isVideo,
isGIF, isGIF,
} from '../../types/Attachment'; } from '../../types/Attachment';
import { ContactType } from '../../types/Contact'; import { EmbeddedContactType } from '../../types/EmbeddedContact';
import { getIncrement } from '../../util/timer'; import { getIncrement } from '../../util/timer';
import { isFileDangerous } from '../../util/isFileDangerous'; import { isFileDangerous } from '../../util/isFileDangerous';
@ -129,7 +129,7 @@ export type PropsData = {
direction: DirectionType; direction: DirectionType;
timestamp: number; timestamp: number;
status?: MessageStatusType; status?: MessageStatusType;
contact?: ContactType; contact?: EmbeddedContactType;
author: Pick< author: Pick<
ConversationType, ConversationType,
| 'acceptedMessageRequest' | 'acceptedMessageRequest'
@ -216,7 +216,7 @@ export type PropsActions = {
openConversation: (conversationId: string, messageId?: string) => void; openConversation: (conversationId: string, messageId?: string) => void;
showContactDetail: (options: { showContactDetail: (options: {
contact: ContactType; contact: EmbeddedContactType;
signalAccount?: string; signalAccount?: string;
}) => void; }) => void;
showContactModal: (contactId: string) => void; showContactModal: (contactId: string) => void;

8
ts/components/conversation/_contactUtil.tsx
View file

@ -9,7 +9,7 @@ import { Spinner } from '../Spinner';
import { LocalizerType } from '../../types/Util'; import { LocalizerType } from '../../types/Util';
import { AvatarColors } from '../../types/Colors'; import { AvatarColors } from '../../types/Colors';
import { ContactType, getName } from '../../types/Contact'; import { EmbeddedContactType, getName } from '../../types/EmbeddedContact';
// This file starts with _ to keep it from showing up in the StyleGuide. // This file starts with _ to keep it from showing up in the StyleGuide.
@ -19,7 +19,7 @@ export function renderAvatar({
size, size,
direction, direction,
}: { }: {
contact: ContactType; contact: EmbeddedContactType;
i18n: LocalizerType; i18n: LocalizerType;
size: 28 | 52 | 80; size: 28 | 52 | 80;
direction?: 'outgoing' | 'incoming'; direction?: 'outgoing' | 'incoming';
@ -65,7 +65,7 @@ export function renderName({
isIncoming, isIncoming,
module, module,
}: { }: {
contact: ContactType; contact: EmbeddedContactType;
isIncoming: boolean; isIncoming: boolean;
module: string; module: string;
}): JSX.Element { }): JSX.Element {
@ -86,7 +86,7 @@ export function renderContactShorthand({
isIncoming, isIncoming,
module, module,
}: { }: {
contact: ContactType; contact: EmbeddedContactType;
isIncoming: boolean; isIncoming: boolean;
module: string; module: string;
}): JSX.Element { }): JSX.Element {

4
ts/model-types.d.ts vendored
View file

@ -23,7 +23,7 @@ import {
import { GroupNameCollisionsWithIdsByTitle } from './util/groupMemberNameCollisions'; import { GroupNameCollisionsWithIdsByTitle } from './util/groupMemberNameCollisions';
import { ConversationColorType } from './types/Colors'; import { ConversationColorType } from './types/Colors';
import { AttachmentType, ThumbnailType } from './types/Attachment'; import { AttachmentType, ThumbnailType } from './types/Attachment';
import { ContactType } from './types/Contact'; import { EmbeddedContactType } from './types/EmbeddedContact';
import { SignalService as Proto } from './protobuf'; import { SignalService as Proto } from './protobuf';
import { AvatarDataType } from './types/Avatar'; import { AvatarDataType } from './types/Avatar';
@ -156,7 +156,7 @@ export type MessageAttributesType = {
}; };
sent_at: number; sent_at: number;
unidentifiedDeliveries?: Array<string>; unidentifiedDeliveries?: Array<string>;
contact?: Array<ContactType>; contact?: Array<EmbeddedContactType>;
conversationId: string; conversationId: string;
reaction?: WhatIsThis; reaction?: WhatIsThis;

4
ts/models/conversations.ts
View file

@ -90,7 +90,7 @@ const FIXMEU8 = Uint8Array;
window.Whisper = window.Whisper || {}; window.Whisper = window.Whisper || {};
const { Services, Util } = window.Signal; const { Services, Util } = window.Signal;
const { Contact, Message } = window.Signal.Types; const { EmbeddedContact, Message } = window.Signal.Types;
const { const {
deleteAttachmentData, deleteAttachmentData,
doesAttachmentExist, doesAttachmentExist,
@ -3170,7 +3170,7 @@ export class ConversationModel extends window.Backbone
async makeQuote( async makeQuote(
quotedMessage: typeof window.Whisper.MessageType quotedMessage: typeof window.Whisper.MessageType
): Promise<QuotedMessageType> { ): Promise<QuotedMessageType> {
const { getName } = Contact; const { getName } = EmbeddedContact;
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const contact = quotedMessage.getContact()!; const contact = quotedMessage.getContact()!;
const attachments = quotedMessage.get('attachments'); const attachments = quotedMessage.get('attachments');

5
ts/models/messages.ts
View file

@ -129,7 +129,7 @@ const {
Message: TypedMessage, Message: TypedMessage,
Attachment, Attachment,
MIME, MIME,
Contact, EmbeddedContact,
Errors, Errors,
} = window.Signal.Types; } = window.Signal.Types;
const { const {
@ -678,7 +678,8 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
const contacts = this.get('contact'); const contacts = this.get('contact');
if (contacts && contacts.length) { if (contacts && contacts.length) {
return { return {
text: Contact.getName(contacts[0]) || window.i18n('unknownContact'), text:
EmbeddedContact.getName(contacts[0]) || window.i18n('unknownContact'),
emoji: '👤', emoji: '👤',
}; };
} }

9
ts/state/selectors/message.ts
View file

@ -38,7 +38,10 @@ import { QuotedAttachmentType } from '../../components/conversation/Quote';
import { getDomain, isStickerPack } from '../../types/LinkPreview'; import { getDomain, isStickerPack } from '../../types/LinkPreview';
import { ContactType, contactSelector } from '../../types/Contact'; import {
EmbeddedContactType,
embeddedContactSelector,
} from '../../types/EmbeddedContact';
import { AssertProps, BodyRangesType } from '../../types/Util'; import { AssertProps, BodyRangesType } from '../../types/Util';
import { LinkPreviewType } from '../../types/message/LinkPreviews'; import { LinkPreviewType } from '../../types/message/LinkPreviews';
import { ConversationColors } from '../../types/Colors'; import { ConversationColors } from '../../types/Colors';
@ -1260,7 +1263,7 @@ export function getPropsForEmbeddedContact(
message: MessageAttributesType, message: MessageAttributesType,
regionCode: string, regionCode: string,
accountSelector: (identifier?: string) => boolean accountSelector: (identifier?: string) => boolean
): ContactType | undefined { ): EmbeddedContactType | undefined {
const contacts = message.contact; const contacts = message.contact;
if (!contacts || !contacts.length) { if (!contacts || !contacts.length) {
return undefined; return undefined;
@ -1270,7 +1273,7 @@ export function getPropsForEmbeddedContact(
const numbers = firstContact?.number; const numbers = firstContact?.number;
const firstNumber = numbers && numbers[0] ? numbers[0].value : undefined; const firstNumber = numbers && numbers[0] ? numbers[0].value : undefined;
return contactSelector(firstContact, { return embeddedContactSelector(firstContact, {
regionCode, regionCode,
getAbsoluteAttachmentPath: getAbsoluteAttachmentPath:
window.Signal.Migrations.getAbsoluteAttachmentPath, window.Signal.Migrations.getAbsoluteAttachmentPath,

10
ts/test-node/types/Contact_test.ts → ts/test-node/types/EmbeddedContact_test.ts
View file

@ -4,7 +4,7 @@
import { assert } from 'chai'; import { assert } from 'chai';
import { IMAGE_GIF } from '../../types/MIME'; import { IMAGE_GIF } from '../../types/MIME';
import { contactSelector, getName } from '../../types/Contact'; import { embeddedContactSelector, getName } from '../../types/EmbeddedContact';
describe('Contact', () => { describe('Contact', () => {
describe('getName', () => { describe('getName', () => {
@ -65,7 +65,7 @@ describe('Contact', () => {
assert.strictEqual(actual, expected); assert.strictEqual(actual, expected);
}); });
}); });
describe('contactSelector', () => { describe('embeddedContactSelector', () => {
const regionCode = '1'; const regionCode = '1';
const firstNumber = '+1202555000'; const firstNumber = '+1202555000';
const isNumberOnSignal = false; const isNumberOnSignal = false;
@ -99,7 +99,7 @@ describe('Contact', () => {
isNumberOnSignal, isNumberOnSignal,
number: undefined, number: undefined,
}; };
const actual = contactSelector(contact, { const actual = embeddedContactSelector(contact, {
regionCode, regionCode,
firstNumber, firstNumber,
isNumberOnSignal, isNumberOnSignal,
@ -143,7 +143,7 @@ describe('Contact', () => {
isNumberOnSignal, isNumberOnSignal,
number: undefined, number: undefined,
}; };
const actual = contactSelector(contact, { const actual = embeddedContactSelector(contact, {
regionCode, regionCode,
firstNumber, firstNumber,
isNumberOnSignal, isNumberOnSignal,
@ -186,7 +186,7 @@ describe('Contact', () => {
isNumberOnSignal: true, isNumberOnSignal: true,
number: undefined, number: undefined,
}; };
const actual = contactSelector(contact, { const actual = embeddedContactSelector(contact, {
regionCode, regionCode,
firstNumber, firstNumber,
isNumberOnSignal: true, isNumberOnSignal: true,

10
ts/types/Contact.tsx → ts/types/EmbeddedContact.ts
View file

@ -4,7 +4,7 @@
import { format as formatPhoneNumber } from './PhoneNumber'; import { format as formatPhoneNumber } from './PhoneNumber';
import { AttachmentType } from './Attachment'; import { AttachmentType } from './Attachment';
export type ContactType = { export type EmbeddedContactType = {
name?: Name; name?: Name;
number?: Array<Phone>; number?: Array<Phone>;
email?: Array<Email>; email?: Array<Email>;
@ -68,15 +68,15 @@ type Avatar = {
isProfile: boolean; isProfile: boolean;
}; };
export function contactSelector( export function embeddedContactSelector(
contact: ContactType, contact: EmbeddedContactType,
options: { options: {
regionCode: string; regionCode: string;
firstNumber?: string; firstNumber?: string;
isNumberOnSignal?: boolean; isNumberOnSignal?: boolean;
getAbsoluteAttachmentPath: (path: string) => string; getAbsoluteAttachmentPath: (path: string) => string;
} }
): ContactType { ): EmbeddedContactType {
const { const {
getAbsoluteAttachmentPath, getAbsoluteAttachmentPath,
firstNumber, firstNumber,
@ -117,7 +117,7 @@ export function contactSelector(
}; };
} }
export function getName(contact: ContactType): string | undefined { export function getName(contact: EmbeddedContactType): string | undefined {
const { name, organization } = contact; const { name, organization } = contact;
const displayName = (name && name.displayName) || undefined; const displayName = (name && name.displayName) || undefined;
const givenName = (name && name.givenName) || undefined; const givenName = (name && name.givenName) || undefined;

4
ts/types/Message.ts
View file

@ -4,7 +4,7 @@
/* eslint-disable camelcase */ /* eslint-disable camelcase */
import { AttachmentType } from './Attachment'; import { AttachmentType } from './Attachment';
import { ContactType } from './Contact'; import { EmbeddedContactType } from './EmbeddedContact';
import { IndexableBoolean, IndexablePresence } from './IndexedDB'; import { IndexableBoolean, IndexablePresence } from './IndexedDB';
export type Message = ( export type Message = (
@ -110,7 +110,7 @@ type MessageSchemaVersion5 = Partial<
type MessageSchemaVersion6 = Partial< type MessageSchemaVersion6 = Partial<
Readonly<{ Readonly<{
contact: Array<ContactType>; contact: Array<EmbeddedContactType>;
}> }>
>; >;

6
ts/views/conversation_view.ts
View file

@ -65,7 +65,7 @@ import { ReadStatus } from '../messages/MessageReadStatus';
import { markViewed } from '../services/MessageUpdater'; import { markViewed } from '../services/MessageUpdater';
import { viewedReceiptsJobQueue } from '../jobs/viewedReceiptsJobQueue'; import { viewedReceiptsJobQueue } from '../jobs/viewedReceiptsJobQueue';
import { viewSyncJobQueue } from '../jobs/viewSyncJobQueue'; import { viewSyncJobQueue } from '../jobs/viewSyncJobQueue';
import type { ContactType } from '../types/Contact'; import type { EmbeddedContactType } from '../types/EmbeddedContact';
import type { WhatIsThis } from '../window.d'; import type { WhatIsThis } from '../window.d';
type AttachmentOptions = { type AttachmentOptions = {
@ -845,7 +845,7 @@ Whisper.ConversationView = Whisper.View.extend({
this.openConversation(conversationId, messageId); this.openConversation(conversationId, messageId);
}; };
const showContactDetail = (options: { const showContactDetail = (options: {
contact: ContactType; contact: EmbeddedContactType;
signalAccount?: string; signalAccount?: string;
}) => { }) => {
this.showContactDetail(options); this.showContactDetail(options);
@ -3486,7 +3486,7 @@ Whisper.ConversationView = Whisper.View.extend({
contact, contact,
signalAccount, signalAccount,
}: { }: {
contact: ContactType; contact: EmbeddedContactType;
signalAccount?: string; signalAccount?: string;
}) { }) {
const view = new Whisper.ReactWrapperView({ const view = new Whisper.ReactWrapperView({

4
ts/window.d.ts vendored
View file

@ -36,7 +36,7 @@ import * as zkgroup from './util/zkgroup';
import { LocalizerType, BodyRangesType, BodyRangeType } from './types/Util'; import { LocalizerType, BodyRangesType, BodyRangeType } from './types/Util';
import * as Attachment from './types/Attachment'; import * as Attachment from './types/Attachment';
import * as MIME from './types/MIME'; import * as MIME from './types/MIME';
import * as Contact from './types/Contact'; import * as EmbeddedContact from './types/EmbeddedContact';
import * as Errors from './types/errors'; import * as Errors from './types/errors';
import { ConversationController } from './ConversationController'; import { ConversationController } from './ConversationController';
import { ReduxActions } from './state/types'; import { ReduxActions } from './state/types';
@ -359,7 +359,7 @@ declare global {
Types: { Types: {
Attachment: typeof Attachment; Attachment: typeof Attachment;
MIME: typeof MIME; MIME: typeof MIME;
Contact: typeof Contact; EmbeddedContact: typeof EmbeddedContact;
Conversation: { Conversation: {
computeHash: (data: string) => Promise<string>; computeHash: (data: string) => Promise<string>;
deleteExternalFiles: ( deleteExternalFiles: (