oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity

Move phone number format/parse into ts/types/PhoneNumber

Browse source
This commit is contained in:
Scott Nonnenberg 2018-05-09 08:54:56 -07:00
parent 93d3abbf8d
commit 80b069e9b6
4 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/modules/types/contact.js
View file

@ -2,7 +2,7 @@ const { omit, compact, map } = require('lodash');
const { toLogFormat } = require('./errors');
const { SignalService } = require('../../../ts/protobuf');
const { parsePhoneNumber } = require('../../../ts/util/parsePhoneNumber');
const { parse: parsePhoneNumber } = require('../../../ts/types/PhoneNumber');
const DEFAULT_PHONE_TYPE = SignalService.DataMessage.Contact.Phone.Type.HOME;
const DEFAULT_EMAIL_TYPE = SignalService.DataMessage.Contact.Email.Type.HOME;

2
ts/types/Contact.ts
View file

@ -1,6 +1,6 @@
// @ts-ignore
import Attachments from '../../app/attachments';
import { formatPhoneNumber } from '../util/formatPhoneNumber';
import { format as formatPhoneNumber } from '../types/PhoneNumber';
export interface Contact {
name: Name;

20
ts/util/formatPhoneNumber.ts → ts/types/PhoneNumber.ts
View file

@ -1,6 +1,6 @@
import { instance, PhoneNumberFormat } from './libphonenumberInstance';
import { instance, PhoneNumberFormat } from '../util/libphonenumberInstance';
export function formatPhoneNumber(
export function format(
phoneNumber: string,
options: {
ourRegionCode: string;
@ -20,3 +20,19 @@ export function formatPhoneNumber(
return phoneNumber;
}
}
export function parse(
phoneNumber: string,
options: {
regionCode: string;
}
): string {
const { regionCode } = options;
const parsedNumber = instance.parse(phoneNumber, regionCode);
if (instance.isValidNumber(parsedNumber)) {
return instance.format(parsedNumber, PhoneNumberFormat.E164);
}
return phoneNumber;
}

17
ts/util/parsePhoneNumber.ts
View file

@ -1,17 +0,0 @@
import { instance, PhoneNumberFormat } from './libphonenumberInstance';
export function parsePhoneNumber(
phoneNumber: string,
options: {
regionCode: string;
}
): string {
const { regionCode } = options;
const parsedNumber = instance.parse(phoneNumber, regionCode);
if (instance.isValidNumber(parsedNumber)) {
return instance.format(parsedNumber, PhoneNumberFormat.E164);
}
return phoneNumber;
}