Clean up migrateColor utility

signalapp · Jan 26, 2021 · 12dbd38 · 12dbd38
1 parent b47d8d8
commit 12dbd38
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 36 deletions.
diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts
@@ -1,4 +1,4 @@
-// Copyright 2020 Signal Messenger, LLC
+// Copyright 2020-2021 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
 /* eslint-disable class-methods-use-this */
@@ -34,6 +34,7 @@ import {
 import { GroupChangeClass } from '../textsecure.d';
 import { BodyRangesType } from '../types/Util';
 import { getTextWithMentions } from '../util';
+import { migrateColor } from '../util/migrateColor';
 
 /* eslint-disable more/no-then */
 window.Whisper = window.Whisper || {};
@@ -4103,7 +4104,6 @@ export class ConversationModel extends window.Backbone.Model<
       return 'signal-blue';
     }
 
-    const { migrateColor } = Util;
     return migrateColor(this.get('color'));
   }
 

diff --git a/ts/util/index.ts b/ts/util/index.ts
@@ -1,4 +1,4 @@
-// Copyright 2018-2020 Signal Messenger, LLC
+// Copyright 2018-2021 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import * as GoogleChrome from './GoogleChrome';
@@ -19,7 +19,6 @@ import { getUserAgent } from './getUserAgent';
 import { hasExpired } from './hasExpired';
 import { isFileDangerous } from './isFileDangerous';
 import { makeLookup } from './makeLookup';
-import { migrateColor } from './migrateColor';
 import { missingCaseError } from './missingCaseError';
 import { parseRemoteClientExpiration } from './parseRemoteClientExpiration';
 import { sleep } from './sleep';
@@ -41,7 +40,6 @@ export {
   hasExpired,
   isFileDangerous,
   makeLookup,
-  migrateColor,
   missingCaseError,
   parseRemoteClientExpiration,
   Registration,

diff --git a/ts/util/migrateColor.ts b/ts/util/migrateColor.ts
@@ -1,51 +1,22 @@
-// Copyright 2018-2020 Signal Messenger, LLC
+// Copyright 2018-2021 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import { ColorType } from '../types/Colors';
 
-type OldColorType =
-  | 'amber'
-  | 'blue'
-  | 'blue_grey'
-  | 'brown'
-  | 'cyan'
-  | 'deep_orange'
-  | 'deep_purple'
-  | 'green'
-  | 'grey'
-  | 'indigo'
-  | 'lime'
-  | 'light_blue'
-  | 'light_green'
-  | 'orange'
-  | 'pink'
-  | 'purple'
-  | 'red'
-  | 'teal'
-  | 'yellow'
-  | 'ultramarine'
-  | string
-  | undefined;
-
-export function migrateColor(color?: OldColorType): ColorType {
+export function migrateColor(color?: string): ColorType {
   switch (color) {
     // These colors no longer exist
     case 'orange':
     case 'amber':
       return 'deep_orange';
-
     case 'yellow':
       return 'brown';
-
     case 'deep_purple':
       return 'purple';
-
     case 'light_blue':
       return 'blue';
-
     case 'cyan':
       return 'teal';
-
     case 'lime':
       return 'light_green';