Page Menu
Home
Phorge
Search
Configure Global Search
Log In
Files
F32210009
D7564.1765129200.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Size
44 KB
Referenced Files
None
Subscribers
None
D7564.1765129200.diff
View Options
diff --git a/keyserver/src/creators/account-creator.js b/keyserver/src/creators/account-creator.js
--- a/keyserver/src/creators/account-creator.js
+++ b/keyserver/src/creators/account-creator.js
@@ -22,7 +22,7 @@
DeviceTokenUpdateRequest,
} from 'lib/types/device-types.js';
import type { CalendarQuery } from 'lib/types/entry-types.js';
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import type { SIWESocialProof } from 'lib/types/siwe-types.js';
import { threadTypes } from 'lib/types/thread-types.js';
import { ServerError } from 'lib/utils/errors.js';
diff --git a/keyserver/src/creators/entry-creator.js b/keyserver/src/creators/entry-creator.js
--- a/keyserver/src/creators/entry-creator.js
+++ b/keyserver/src/creators/entry-creator.js
@@ -6,7 +6,7 @@
CreateEntryRequest,
SaveEntryResponse,
} from 'lib/types/entry-types.js';
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import { threadPermissions } from 'lib/types/thread-types.js';
import { dateFromString } from 'lib/utils/date-utils.js';
import { ServerError } from 'lib/utils/errors.js';
diff --git a/keyserver/src/creators/message-creator.js b/keyserver/src/creators/message-creator.js
--- a/keyserver/src/creators/message-creator.js
+++ b/keyserver/src/creators/message-creator.js
@@ -12,8 +12,8 @@
import { pushTypes } from 'lib/shared/messages/message-spec.js';
import type { PushType } from 'lib/shared/messages/message-spec.js';
import { messageSpecs } from 'lib/shared/messages/message-specs.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import {
- messageTypes,
messageDataLocalID,
type MessageData,
type RawMessageInfo,
diff --git a/keyserver/src/creators/message-report-creator.js b/keyserver/src/creators/message-report-creator.js
--- a/keyserver/src/creators/message-report-creator.js
+++ b/keyserver/src/creators/message-report-creator.js
@@ -3,7 +3,7 @@
import bots from 'lib/facts/bots.js';
import { createMessageQuote } from 'lib/shared/message-utils.js';
import { type MessageReportCreationRequest } from 'lib/types/message-report-types.js';
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import type { RawMessageInfo } from 'lib/types/message-types.js';
import type { ServerThreadInfo } from 'lib/types/thread-types.js';
import { ServerError } from 'lib/utils/errors.js';
diff --git a/keyserver/src/creators/report-creator.js b/keyserver/src/creators/report-creator.js
--- a/keyserver/src/creators/report-creator.js
+++ b/keyserver/src/creators/report-creator.js
@@ -7,7 +7,7 @@
filterRawEntryInfosByCalendarQuery,
serverEntryInfosObject,
} from 'lib/shared/entry-utils.js';
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import {
type ReportCreationRequest,
type ReportCreationResponse,
diff --git a/keyserver/src/creators/thread-creator.js b/keyserver/src/creators/thread-creator.js
--- a/keyserver/src/creators/thread-creator.js
+++ b/keyserver/src/creators/thread-creator.js
@@ -12,7 +12,7 @@
import { getThreadTypeParentRequirement } from 'lib/shared/thread-utils.js';
import { hasMinCodeVersion } from 'lib/shared/version-utils.js';
import type { Shape } from 'lib/types/core.js';
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import {
type ServerNewThreadRequest,
type NewThreadResponse,
diff --git a/keyserver/src/cron/daily-updates.js b/keyserver/src/cron/daily-updates.js
--- a/keyserver/src/cron/daily-updates.js
+++ b/keyserver/src/cron/daily-updates.js
@@ -3,7 +3,7 @@
import invariant from 'invariant';
import ashoat from 'lib/facts/ashoat.js';
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import { threadTypes } from 'lib/types/thread-types.js';
import {
getDate,
diff --git a/keyserver/src/database/migration-config.js b/keyserver/src/database/migration-config.js
--- a/keyserver/src/database/migration-config.js
+++ b/keyserver/src/database/migration-config.js
@@ -3,7 +3,7 @@
import fs from 'fs';
import { policyTypes } from 'lib/facts/policies.js';
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import { dbQuery, SQL } from '../database/database.js';
import { processMessagesInDBForSearch } from '../database/search-utils.js';
diff --git a/keyserver/src/database/search-utils.js b/keyserver/src/database/search-utils.js
--- a/keyserver/src/database/search-utils.js
+++ b/keyserver/src/database/search-utils.js
@@ -3,7 +3,7 @@
import natural from 'natural';
import type { RawMessageInfo } from 'lib/types/message-types';
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import { dbQuery, SQL } from '../database/database.js';
import { getSegmenter } from '../utils/segmenter.js';
diff --git a/keyserver/src/deleters/entry-deleters.js b/keyserver/src/deleters/entry-deleters.js
--- a/keyserver/src/deleters/entry-deleters.js
+++ b/keyserver/src/deleters/entry-deleters.js
@@ -6,7 +6,7 @@
RestoreEntryRequest,
RestoreEntryResponse,
} from 'lib/types/entry-types.js';
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import { threadPermissions } from 'lib/types/thread-types.js';
import { dateString } from 'lib/utils/date-utils.js';
import { ServerError } from 'lib/utils/errors.js';
diff --git a/keyserver/src/fetchers/message-fetchers.js b/keyserver/src/fetchers/message-fetchers.js
--- a/keyserver/src/fetchers/message-fetchers.js
+++ b/keyserver/src/fetchers/message-fetchers.js
@@ -9,14 +9,16 @@
import { messageSpecs } from 'lib/shared/messages/message-specs.js';
import { getNotifCollapseKey } from 'lib/shared/notif-utils.js';
import { hasMinCodeVersion } from 'lib/shared/version-utils.js';
+import {
+ messageTypes,
+ type MessageType,
+ assertMessageType,
+} from 'lib/types/message-types-enum.js';
import {
type RawMessageInfo,
type RawComposableMessageInfo,
type RawRobotextMessageInfo,
- messageTypes,
- type MessageType,
type EditMessageContent,
- assertMessageType,
type MessageSelectionCriteria,
type MessageTruncationStatus,
messageTruncationStatus,
diff --git a/keyserver/src/fetchers/upload-fetchers.js b/keyserver/src/fetchers/upload-fetchers.js
--- a/keyserver/src/fetchers/upload-fetchers.js
+++ b/keyserver/src/fetchers/upload-fetchers.js
@@ -4,7 +4,7 @@
import _keyBy from 'lodash/fp/keyBy.js';
import type { Media, Image, EncryptedImage } from 'lib/types/media-types.js';
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import type { MediaMessageServerDBContent } from 'lib/types/messages/media.js';
import { getUploadIDsFromMediaMessageServerDBContents } from 'lib/types/messages/media.js';
import { threadPermissions } from 'lib/types/thread-types.js';
diff --git a/keyserver/src/push/send.js b/keyserver/src/push/send.js
--- a/keyserver/src/push/send.js
+++ b/keyserver/src/push/send.js
@@ -23,10 +23,10 @@
threadInfoFromRawThreadInfo,
} from 'lib/shared/thread-utils.js';
import type { Platform, PlatformDetails } from 'lib/types/device-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import {
type RawMessageInfo,
type MessageData,
- messageTypes,
} from 'lib/types/message-types.js';
import type {
WebNotification,
diff --git a/keyserver/src/responders/message-responders.js b/keyserver/src/responders/message-responders.js
--- a/keyserver/src/responders/message-responders.js
+++ b/keyserver/src/responders/message-responders.js
@@ -10,8 +10,8 @@
} from 'lib/shared/message-utils.js';
import { relationshipBlockedInEitherDirection } from 'lib/shared/relationship-utils.js';
import type { Media } from 'lib/types/media-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import {
- messageTypes,
type SendTextMessageRequest,
type SendMultimediaMessageRequest,
type SendReactionMessageRequest,
diff --git a/keyserver/src/scripts/rename-sidebar-message-fields.js b/keyserver/src/scripts/rename-sidebar-message-fields.js
--- a/keyserver/src/scripts/rename-sidebar-message-fields.js
+++ b/keyserver/src/scripts/rename-sidebar-message-fields.js
@@ -1,6 +1,6 @@
// @flow
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import { main } from './utils.js';
import { dbQuery, SQL } from '../database/database.js';
diff --git a/keyserver/src/scripts/set-last-read-messages.js b/keyserver/src/scripts/set-last-read-messages.js
--- a/keyserver/src/scripts/set-last-read-messages.js
+++ b/keyserver/src/scripts/set-last-read-messages.js
@@ -1,6 +1,6 @@
// @flow
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import { threadPermissions } from 'lib/types/thread-types.js';
import { endScript } from './utils.js';
diff --git a/keyserver/src/scripts/setup-sidebars.js b/keyserver/src/scripts/setup-sidebars.js
--- a/keyserver/src/scripts/setup-sidebars.js
+++ b/keyserver/src/scripts/setup-sidebars.js
@@ -1,7 +1,7 @@
// @flow
import { messageSpecs } from 'lib/shared/messages/message-specs.js';
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import { updateTypes } from 'lib/types/update-types.js';
import { main } from './utils.js';
diff --git a/keyserver/src/scripts/soft-launch-migration.js b/keyserver/src/scripts/soft-launch-migration.js
--- a/keyserver/src/scripts/soft-launch-migration.js
+++ b/keyserver/src/scripts/soft-launch-migration.js
@@ -6,7 +6,7 @@
import bots from 'lib/facts/bots.js';
import genesis from 'lib/facts/genesis.js';
import testers from 'lib/facts/testers.js';
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import { threadTypes, type ThreadType } from 'lib/types/thread-types.js';
import { main } from './utils.js';
diff --git a/keyserver/src/updaters/activity-updaters.js b/keyserver/src/updaters/activity-updaters.js
--- a/keyserver/src/updaters/activity-updaters.js
+++ b/keyserver/src/updaters/activity-updaters.js
@@ -11,7 +11,7 @@
SetThreadUnreadStatusRequest,
SetThreadUnreadStatusResult,
} from 'lib/types/activity-types.js';
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import { threadPermissions } from 'lib/types/thread-types.js';
import { updateTypes } from 'lib/types/update-types.js';
import { ServerError } from 'lib/utils/errors.js';
diff --git a/keyserver/src/updaters/entry-updaters.js b/keyserver/src/updaters/entry-updaters.js
--- a/keyserver/src/updaters/entry-updaters.js
+++ b/keyserver/src/updaters/entry-updaters.js
@@ -14,7 +14,7 @@
type CalendarQuery,
defaultCalendarQuery,
} from 'lib/types/entry-types.js';
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import { threadPermissions } from 'lib/types/thread-types.js';
import {
updateTypes,
diff --git a/keyserver/src/updaters/relationship-updaters.js b/keyserver/src/updaters/relationship-updaters.js
--- a/keyserver/src/updaters/relationship-updaters.js
+++ b/keyserver/src/updaters/relationship-updaters.js
@@ -3,7 +3,7 @@
import invariant from 'invariant';
import { sortIDs } from 'lib/shared/relationship-utils.js';
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import {
type RelationshipRequest,
type RelationshipErrors,
diff --git a/keyserver/src/updaters/thread-updaters.js b/keyserver/src/updaters/thread-updaters.js
--- a/keyserver/src/updaters/thread-updaters.js
+++ b/keyserver/src/updaters/thread-updaters.js
@@ -12,10 +12,8 @@
} from 'lib/shared/thread-utils.js';
import { hasMinCodeVersion } from 'lib/shared/version-utils.js';
import type { Shape } from 'lib/types/core.js';
-import {
- messageTypes,
- defaultNumberPerThread,
-} from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
+import { defaultNumberPerThread } from 'lib/types/message-types.js';
import {
type RoleChangeRequest,
type ChangeThreadSettingsResult,
diff --git a/lib/reducers/message-reducer.js b/lib/reducers/message-reducer.js
--- a/lib/reducers/message-reducer.js
+++ b/lib/reducers/message-reducer.js
@@ -69,6 +69,7 @@
import threadWatcher from '../shared/thread-watcher.js';
import { unshimMessageInfos } from '../shared/unshim-utils.js';
import type { Media, Image } from '../types/media-types.js';
+import { messageTypes } from '../types/message-types-enum.js';
import {
type RawMessageInfo,
type LocalMessageInfo,
@@ -78,7 +79,6 @@
type MessageTruncationStatus,
type MessageTruncationStatuses,
messageTruncationStatus,
- messageTypes,
defaultNumberPerThread,
type ThreadMessageInfo,
} from '../types/message-types.js';
diff --git a/lib/reducers/message-reducer.test.js b/lib/reducers/message-reducer.test.js
--- a/lib/reducers/message-reducer.test.js
+++ b/lib/reducers/message-reducer.test.js
@@ -4,8 +4,8 @@
import { reduceMessageStore } from './message-reducer.js';
import { createPendingThread } from '../shared/thread-utils.js';
+import { messageTypes } from '../types/message-types-enum.js';
import type { MessageStore } from '../types/message-types.js';
-import { messageTypes } from '../types/message-types.js';
import { threadTypes } from '../types/thread-types.js';
const messageStoreBeforeMediaUpdate: MessageStore = {
diff --git a/lib/selectors/chat-selectors.js b/lib/selectors/chat-selectors.js
--- a/lib/selectors/chat-selectors.js
+++ b/lib/selectors/chat-selectors.js
@@ -27,13 +27,13 @@
threadIsTopLevel,
threadInChatList,
} from '../shared/thread-utils.js';
+import { messageTypes } from '../types/message-types-enum.js';
import {
type MessageInfo,
type MessageStore,
type ComposableMessageInfo,
type RobotextMessageInfo,
type LocalMessageInfo,
- messageTypes,
isComposableMessageType,
} from '../types/message-types.js';
import type { BaseAppState } from '../types/redux-types.js';
diff --git a/lib/shared/edit-messages-utils.js b/lib/shared/edit-messages-utils.js
--- a/lib/shared/edit-messages-utils.js
+++ b/lib/shared/edit-messages-utils.js
@@ -13,7 +13,7 @@
RobotextMessageInfo,
ComposableMessageInfo,
} from '../types/message-types';
-import { messageTypes } from '../types/message-types.js';
+import { messageTypes } from '../types/message-types-enum.js';
import { threadPermissions, type ThreadInfo } from '../types/thread-types.js';
import {
useDispatchActionPromise,
diff --git a/lib/shared/message-utils.js b/lib/shared/message-utils.js
--- a/lib/shared/message-utils.js
+++ b/lib/shared/message-utils.js
@@ -14,6 +14,7 @@
import { userIDsToRelativeUserInfos } from '../selectors/user-selectors.js';
import { type PlatformDetails, isWebPlatform } from '../types/device-types.js';
import type { Media } from '../types/media-types.js';
+import { messageTypes } from '../types/message-types-enum.js';
import {
type MessageInfo,
type RawMessageInfo,
@@ -24,7 +25,6 @@
type MultimediaMessageData,
type MessageStore,
type ComposableMessageInfo,
- messageTypes,
messageTruncationStatus,
type RawComposableMessageInfo,
type ThreadMessageInfo,
diff --git a/lib/shared/messages/add-members-message-spec.js b/lib/shared/messages/add-members-message-spec.js
--- a/lib/shared/messages/add-members-message-spec.js
+++ b/lib/shared/messages/add-members-message-spec.js
@@ -4,7 +4,7 @@
import type { CreateMessageInfoParams, MessageSpec } from './message-spec.js';
import { joinResult } from './utils.js';
-import { messageTypes } from '../../types/message-types.js';
+import { messageTypes } from '../../types/message-types-enum.js';
import type {
MessageInfo,
ClientDBMessageInfo,
diff --git a/lib/shared/messages/change-role-message-spec.js b/lib/shared/messages/change-role-message-spec.js
--- a/lib/shared/messages/change-role-message-spec.js
+++ b/lib/shared/messages/change-role-message-spec.js
@@ -9,7 +9,7 @@
type RobotextParams,
} from './message-spec.js';
import { joinResult } from './utils.js';
-import { messageTypes } from '../../types/message-types.js';
+import { messageTypes } from '../../types/message-types-enum.js';
import type {
MessageInfo,
ClientDBMessageInfo,
diff --git a/lib/shared/messages/change-settings-message-spec.js b/lib/shared/messages/change-settings-message-spec.js
--- a/lib/shared/messages/change-settings-message-spec.js
+++ b/lib/shared/messages/change-settings-message-spec.js
@@ -8,7 +8,7 @@
type RobotextParams,
} from './message-spec.js';
import { joinResult } from './utils.js';
-import { messageTypes } from '../../types/message-types.js';
+import { messageTypes } from '../../types/message-types-enum.js';
import type {
MessageInfo,
ClientDBMessageInfo,
diff --git a/lib/shared/messages/create-entry-message-spec.js b/lib/shared/messages/create-entry-message-spec.js
--- a/lib/shared/messages/create-entry-message-spec.js
+++ b/lib/shared/messages/create-entry-message-spec.js
@@ -4,7 +4,7 @@
import { pushTypes, type MessageSpec } from './message-spec.js';
import { joinResult } from './utils.js';
-import { messageTypes } from '../../types/message-types.js';
+import { messageTypes } from '../../types/message-types-enum.js';
import type {
MessageInfo,
ClientDBMessageInfo,
diff --git a/lib/shared/messages/create-sidebar-message-spec.js b/lib/shared/messages/create-sidebar-message-spec.js
--- a/lib/shared/messages/create-sidebar-message-spec.js
+++ b/lib/shared/messages/create-sidebar-message-spec.js
@@ -11,7 +11,7 @@
} from './message-spec.js';
import { joinResult } from './utils.js';
import type { PlatformDetails } from '../../types/device-types.js';
-import { messageTypes } from '../../types/message-types.js';
+import { messageTypes } from '../../types/message-types-enum.js';
import type {
MessageInfo,
ClientDBMessageInfo,
diff --git a/lib/shared/messages/create-sub-thread-message-spec.js b/lib/shared/messages/create-sub-thread-message-spec.js
--- a/lib/shared/messages/create-sub-thread-message-spec.js
+++ b/lib/shared/messages/create-sub-thread-message-spec.js
@@ -10,7 +10,7 @@
} from './message-spec.js';
import { assertSingleMessageInfo } from './utils.js';
import { permissionLookup } from '../../permissions/thread-permissions.js';
-import { messageTypes } from '../../types/message-types.js';
+import { messageTypes } from '../../types/message-types-enum.js';
import type {
MessageInfo,
ClientDBMessageInfo,
diff --git a/lib/shared/messages/create-thread-message-spec.js b/lib/shared/messages/create-thread-message-spec.js
--- a/lib/shared/messages/create-thread-message-spec.js
+++ b/lib/shared/messages/create-thread-message-spec.js
@@ -9,7 +9,7 @@
type RobotextParams,
} from './message-spec.js';
import { assertSingleMessageInfo } from './utils.js';
-import { messageTypes } from '../../types/message-types.js';
+import { messageTypes } from '../../types/message-types-enum.js';
import type {
MessageInfo,
ClientDBMessageInfo,
diff --git a/lib/shared/messages/delete-entry-message-spec.js b/lib/shared/messages/delete-entry-message-spec.js
--- a/lib/shared/messages/delete-entry-message-spec.js
+++ b/lib/shared/messages/delete-entry-message-spec.js
@@ -4,7 +4,7 @@
import { pushTypes, type MessageSpec } from './message-spec.js';
import { assertSingleMessageInfo } from './utils.js';
-import { messageTypes } from '../../types/message-types.js';
+import { messageTypes } from '../../types/message-types-enum.js';
import type {
MessageInfo,
ClientDBMessageInfo,
diff --git a/lib/shared/messages/edit-entry-message-spec.js b/lib/shared/messages/edit-entry-message-spec.js
--- a/lib/shared/messages/edit-entry-message-spec.js
+++ b/lib/shared/messages/edit-entry-message-spec.js
@@ -4,7 +4,7 @@
import { pushTypes, type MessageSpec } from './message-spec.js';
import { joinResult } from './utils.js';
-import { messageTypes } from '../../types/message-types.js';
+import { messageTypes } from '../../types/message-types-enum.js';
import type {
MessageInfo,
ClientDBMessageInfo,
diff --git a/lib/shared/messages/edit-message-spec.js b/lib/shared/messages/edit-message-spec.js
--- a/lib/shared/messages/edit-message-spec.js
+++ b/lib/shared/messages/edit-message-spec.js
@@ -7,8 +7,8 @@
import {
assertMessageType,
messageTypes,
- type ClientDBMessageInfo,
-} from '../../types/message-types.js';
+} from '../../types/message-types-enum.js';
+import { type ClientDBMessageInfo } from '../../types/message-types.js';
import type {
EditMessageData,
RawEditMessageInfo,
diff --git a/lib/shared/messages/join-thread-message-spec.js b/lib/shared/messages/join-thread-message-spec.js
--- a/lib/shared/messages/join-thread-message-spec.js
+++ b/lib/shared/messages/join-thread-message-spec.js
@@ -4,7 +4,7 @@
import type { MessageSpec, RobotextParams } from './message-spec.js';
import { joinResult } from './utils.js';
-import { messageTypes } from '../../types/message-types.js';
+import { messageTypes } from '../../types/message-types-enum.js';
import type {
MessageInfo,
ClientDBMessageInfo,
diff --git a/lib/shared/messages/leave-thread-message-spec.js b/lib/shared/messages/leave-thread-message-spec.js
--- a/lib/shared/messages/leave-thread-message-spec.js
+++ b/lib/shared/messages/leave-thread-message-spec.js
@@ -4,7 +4,7 @@
import type { MessageSpec, RobotextParams } from './message-spec.js';
import { joinResult } from './utils.js';
-import { messageTypes } from '../../types/message-types.js';
+import { messageTypes } from '../../types/message-types-enum.js';
import type {
MessageInfo,
ClientDBMessageInfo,
diff --git a/lib/shared/messages/message-specs.js b/lib/shared/messages/message-specs.js
--- a/lib/shared/messages/message-specs.js
+++ b/lib/shared/messages/message-specs.js
@@ -22,7 +22,10 @@
import { togglePinMessageSpec } from './toggle-pin-message-spec.js';
import { unsupportedMessageSpec } from './unsupported-message-spec.js';
import { updateRelationshipMessageSpec } from './update-relationship-message-spec.js';
-import { messageTypes, type MessageType } from '../../types/message-types.js';
+import {
+ messageTypes,
+ type MessageType,
+} from '../../types/message-types-enum.js';
export const messageSpecs: {
[MessageType]: MessageSpec<*, *, *>,
diff --git a/lib/shared/messages/multimedia-message-spec.js b/lib/shared/messages/multimedia-message-spec.js
--- a/lib/shared/messages/multimedia-message-spec.js
+++ b/lib/shared/messages/multimedia-message-spec.js
@@ -15,10 +15,10 @@
} from '../../media/media-utils.js';
import type { PlatformDetails } from '../../types/device-types.js';
import {
- messageTypes,
assertMessageType,
- isMediaMessageType,
-} from '../../types/message-types.js';
+ messageTypes,
+} from '../../types/message-types-enum.js';
+import { isMediaMessageType } from '../../types/message-types.js';
import type {
MessageInfo,
RawMessageInfo,
diff --git a/lib/shared/messages/reaction-message-spec.js b/lib/shared/messages/reaction-message-spec.js
--- a/lib/shared/messages/reaction-message-spec.js
+++ b/lib/shared/messages/reaction-message-spec.js
@@ -13,6 +13,8 @@
import {
assertMessageType,
messageTypes,
+} from '../../types/message-types-enum.js';
+import {
type MessageInfo,
type ClientDBMessageInfo,
} from '../../types/message-types.js';
diff --git a/lib/shared/messages/remove-members-message-spec.js b/lib/shared/messages/remove-members-message-spec.js
--- a/lib/shared/messages/remove-members-message-spec.js
+++ b/lib/shared/messages/remove-members-message-spec.js
@@ -4,7 +4,7 @@
import type { CreateMessageInfoParams, MessageSpec } from './message-spec.js';
import { joinResult } from './utils.js';
-import { messageTypes } from '../../types/message-types.js';
+import { messageTypes } from '../../types/message-types-enum.js';
import type {
MessageInfo,
ClientDBMessageInfo,
diff --git a/lib/shared/messages/restore-entry-message-spec.js b/lib/shared/messages/restore-entry-message-spec.js
--- a/lib/shared/messages/restore-entry-message-spec.js
+++ b/lib/shared/messages/restore-entry-message-spec.js
@@ -4,7 +4,7 @@
import { pushTypes, type MessageSpec } from './message-spec.js';
import { assertSingleMessageInfo } from './utils.js';
-import { messageTypes } from '../../types/message-types.js';
+import { messageTypes } from '../../types/message-types-enum.js';
import type {
MessageInfo,
ClientDBMessageInfo,
diff --git a/lib/shared/messages/sidebar-source-message-spec.js b/lib/shared/messages/sidebar-source-message-spec.js
--- a/lib/shared/messages/sidebar-source-message-spec.js
+++ b/lib/shared/messages/sidebar-source-message-spec.js
@@ -10,12 +10,12 @@
} from './message-spec.js';
import { joinResult } from './utils.js';
import type { PlatformDetails } from '../../types/device-types.js';
+import { messageTypes } from '../../types/message-types-enum.js';
import {
type RawSidebarSourceMessageInfo,
type SidebarSourceMessageData,
type SidebarSourceMessageInfo,
type ClientDBMessageInfo,
- messageTypes,
isMessageSidebarSourceReactionOrEdit,
} from '../../types/message-types.js';
import type { RawUnsupportedMessageInfo } from '../../types/messages/unsupported.js';
diff --git a/lib/shared/messages/text-message-spec.js b/lib/shared/messages/text-message-spec.js
--- a/lib/shared/messages/text-message-spec.js
+++ b/lib/shared/messages/text-message-spec.js
@@ -14,7 +14,7 @@
changeThreadSettingsActionTypes,
changeThreadSettings,
} from '../../actions/thread-actions.js';
-import { messageTypes } from '../../types/message-types.js';
+import { messageTypes } from '../../types/message-types-enum.js';
import type {
MessageInfo,
ClientDBMessageInfo,
diff --git a/lib/shared/messages/toggle-pin-message-spec.js b/lib/shared/messages/toggle-pin-message-spec.js
--- a/lib/shared/messages/toggle-pin-message-spec.js
+++ b/lib/shared/messages/toggle-pin-message-spec.js
@@ -8,7 +8,7 @@
RawMessageInfoFromServerDBRowParams,
} from './message-spec.js';
import type { PlatformDetails } from '../../types/device-types';
-import { messageTypes } from '../../types/message-types.js';
+import { messageTypes } from '../../types/message-types-enum.js';
import type { ClientDBMessageInfo } from '../../types/message-types.js';
import type {
TogglePinMessageData,
diff --git a/lib/shared/messages/unsupported-message-spec.js b/lib/shared/messages/unsupported-message-spec.js
--- a/lib/shared/messages/unsupported-message-spec.js
+++ b/lib/shared/messages/unsupported-message-spec.js
@@ -3,10 +3,8 @@
import invariant from 'invariant';
import { pushTypes, type MessageSpec } from './message-spec.js';
-import {
- messageTypes,
- type ClientDBMessageInfo,
-} from '../../types/message-types.js';
+import { messageTypes } from '../../types/message-types-enum.js';
+import { type ClientDBMessageInfo } from '../../types/message-types.js';
import type {
RawUnsupportedMessageInfo,
UnsupportedMessageInfo,
diff --git a/lib/shared/messages/update-relationship-message-spec.js b/lib/shared/messages/update-relationship-message-spec.js
--- a/lib/shared/messages/update-relationship-message-spec.js
+++ b/lib/shared/messages/update-relationship-message-spec.js
@@ -9,7 +9,7 @@
} from './message-spec.js';
import { assertSingleMessageInfo } from './utils.js';
import type { PlatformDetails } from '../../types/device-types.js';
-import { messageTypes } from '../../types/message-types.js';
+import { messageTypes } from '../../types/message-types-enum.js';
import type {
MessageInfo,
ClientDBMessageInfo,
diff --git a/lib/shared/notif-utils.js b/lib/shared/notif-utils.js
--- a/lib/shared/notif-utils.js
+++ b/lib/shared/notif-utils.js
@@ -7,14 +7,13 @@
import type { NotificationTextsParams } from './messages/message-spec.js';
import { messageSpecs } from './messages/message-specs.js';
import { threadNoun } from './thread-utils.js';
+import { type MessageType, messageTypes } from '../types/message-types-enum.js';
import {
type MessageInfo,
type RawMessageInfo,
type RobotextMessageInfo,
- type MessageType,
type MessageData,
type SidebarSourceMessageInfo,
- messageTypes,
} from '../types/message-types.js';
import type { CreateSidebarMessageInfo } from '../types/messages/create-sidebar.js';
import type { TextMessageInfo } from '../types/messages/text.js';
diff --git a/lib/shared/thread-utils.js b/lib/shared/thread-utils.js
--- a/lib/shared/thread-utils.js
+++ b/lib/shared/thread-utils.js
@@ -45,10 +45,10 @@
} from '../selectors/user-selectors.js';
import { getUserAvatarForThread } from '../shared/avatar-utils.js';
import type { CalendarQuery } from '../types/entry-types.js';
+import { messageTypes } from '../types/message-types-enum.js';
import {
type RobotextMessageInfo,
type ComposableMessageInfo,
- messageTypes,
} from '../types/message-types.js';
import { userRelationshipStatus } from '../types/relationship-types.js';
import {
diff --git a/lib/shared/unshim-utils.js b/lib/shared/unshim-utils.js
--- a/lib/shared/unshim-utils.js
+++ b/lib/shared/unshim-utils.js
@@ -3,11 +3,10 @@
import _mapValues from 'lodash/fp/mapValues.js';
import { messageSpecs } from './messages/message-specs.js';
+import { type MessageType, messageTypes } from '../types/message-types-enum.js';
import {
type MessageStore,
type RawMessageInfo,
- type MessageType,
- messageTypes,
} from '../types/message-types.js';
function unshimFunc(
diff --git a/lib/types/message-types-enum.js b/lib/types/message-types-enum.js
new file mode 100644
--- /dev/null
+++ b/lib/types/message-types-enum.js
@@ -0,0 +1,66 @@
+// @flow
+
+import invariant from 'invariant';
+
+export const messageTypes = Object.freeze({
+ TEXT: 0,
+ // Appears in the newly created thread
+ CREATE_THREAD: 1,
+ ADD_MEMBERS: 2,
+ // Appears in the parent when a child thread is created
+ // (historically also when a sidebar was created)
+ CREATE_SUB_THREAD: 3,
+ CHANGE_SETTINGS: 4,
+ REMOVE_MEMBERS: 5,
+ CHANGE_ROLE: 6,
+ LEAVE_THREAD: 7,
+ JOIN_THREAD: 8,
+ CREATE_ENTRY: 9,
+ EDIT_ENTRY: 10,
+ DELETE_ENTRY: 11,
+ RESTORE_ENTRY: 12,
+ // When the server has a message to deliver that the client can't properly
+ // render because the client is too old, the server will send this message
+ // type instead. Consequently, there is no MessageData for UNSUPPORTED - just
+ // a RawMessageInfo and a MessageInfo. Note that native/persist.js handles
+ // converting these MessageInfos when the client is upgraded.
+ UNSUPPORTED: 13,
+ IMAGES: 14,
+ MULTIMEDIA: 15,
+ UPDATE_RELATIONSHIP: 16,
+ SIDEBAR_SOURCE: 17,
+ // Appears in the newly created sidebar
+ CREATE_SIDEBAR: 18,
+ REACTION: 19,
+ EDIT_MESSAGE: 20,
+ TOGGLE_PIN: 21,
+});
+export type MessageType = $Values<typeof messageTypes>;
+export function assertMessageType(ourMessageType: number): MessageType {
+ invariant(
+ ourMessageType === 0 ||
+ ourMessageType === 1 ||
+ ourMessageType === 2 ||
+ ourMessageType === 3 ||
+ ourMessageType === 4 ||
+ ourMessageType === 5 ||
+ ourMessageType === 6 ||
+ ourMessageType === 7 ||
+ ourMessageType === 8 ||
+ ourMessageType === 9 ||
+ ourMessageType === 10 ||
+ ourMessageType === 11 ||
+ ourMessageType === 12 ||
+ ourMessageType === 13 ||
+ ourMessageType === 14 ||
+ ourMessageType === 15 ||
+ ourMessageType === 16 ||
+ ourMessageType === 17 ||
+ ourMessageType === 18 ||
+ ourMessageType === 19 ||
+ ourMessageType === 20 ||
+ ourMessageType === 21,
+ 'number is not MessageType enum',
+ );
+ return ourMessageType;
+}
diff --git a/lib/types/message-types.js b/lib/types/message-types.js
--- a/lib/types/message-types.js
+++ b/lib/types/message-types.js
@@ -3,6 +3,7 @@
import invariant from 'invariant';
import { type ClientDBMediaInfo } from './media-types.js';
+import { messageTypes, type MessageType } from './message-types-enum.js';
import type {
AddMembersMessageData,
AddMembersMessageInfo,
@@ -111,69 +112,6 @@
import { type RelativeUserInfo, type UserInfos } from './user-types.js';
import type { CallServerEndpointResultInfoInterface } from '../utils/call-server-endpoint.js';
-export const messageTypes = Object.freeze({
- TEXT: 0,
- // Appears in the newly created thread
- CREATE_THREAD: 1,
- ADD_MEMBERS: 2,
- // Appears in the parent when a child thread is created
- // (historically also when a sidebar was created)
- CREATE_SUB_THREAD: 3,
- CHANGE_SETTINGS: 4,
- REMOVE_MEMBERS: 5,
- CHANGE_ROLE: 6,
- LEAVE_THREAD: 7,
- JOIN_THREAD: 8,
- CREATE_ENTRY: 9,
- EDIT_ENTRY: 10,
- DELETE_ENTRY: 11,
- RESTORE_ENTRY: 12,
- // When the server has a message to deliver that the client can't properly
- // render because the client is too old, the server will send this message
- // type instead. Consequently, there is no MessageData for UNSUPPORTED - just
- // a RawMessageInfo and a MessageInfo. Note that native/persist.js handles
- // converting these MessageInfos when the client is upgraded.
- UNSUPPORTED: 13,
- IMAGES: 14,
- MULTIMEDIA: 15,
- UPDATE_RELATIONSHIP: 16,
- SIDEBAR_SOURCE: 17,
- // Appears in the newly created sidebar
- CREATE_SIDEBAR: 18,
- REACTION: 19,
- EDIT_MESSAGE: 20,
- TOGGLE_PIN: 21,
-});
-export type MessageType = $Values<typeof messageTypes>;
-export function assertMessageType(ourMessageType: number): MessageType {
- invariant(
- ourMessageType === 0 ||
- ourMessageType === 1 ||
- ourMessageType === 2 ||
- ourMessageType === 3 ||
- ourMessageType === 4 ||
- ourMessageType === 5 ||
- ourMessageType === 6 ||
- ourMessageType === 7 ||
- ourMessageType === 8 ||
- ourMessageType === 9 ||
- ourMessageType === 10 ||
- ourMessageType === 11 ||
- ourMessageType === 12 ||
- ourMessageType === 13 ||
- ourMessageType === 14 ||
- ourMessageType === 15 ||
- ourMessageType === 16 ||
- ourMessageType === 17 ||
- ourMessageType === 18 ||
- ourMessageType === 19 ||
- ourMessageType === 20 ||
- ourMessageType === 21,
- 'number is not MessageType enum',
- );
- return ourMessageType;
-}
-
const composableMessageTypes = new Set([
messageTypes.TEXT,
messageTypes.IMAGES,
diff --git a/lib/utils/message-ops-utils.js b/lib/utils/message-ops-utils.js
--- a/lib/utils/message-ops-utils.js
+++ b/lib/utils/message-ops-utils.js
@@ -13,10 +13,12 @@
Video,
} from '../types/media-types';
import {
- type ClientDBMessageInfo,
- type RawMessageInfo,
messageTypes,
assertMessageType,
+} from '../types/message-types-enum.js';
+import {
+ type ClientDBMessageInfo,
+ type RawMessageInfo,
type MessageStoreOperation,
type ClientDBMessageStoreOperation,
type ClientDBThreadMessageInfo,
diff --git a/native/chat/chat-input-bar.react.js b/native/chat/chat-input-bar.react.js
--- a/native/chat/chat-input-bar.react.js
+++ b/native/chat/chat-input-bar.react.js
@@ -58,7 +58,7 @@
import type { CalendarQuery } from 'lib/types/entry-types.js';
import type { LoadingStatus } from 'lib/types/loading-types.js';
import type { PhotoPaste } from 'lib/types/media-types.js';
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import type {
SendEditMessageResponse,
MessageInfo,
diff --git a/native/chat/chat-item-height-measurer.react.js b/native/chat/chat-item-height-measurer.react.js
--- a/native/chat/chat-item-height-measurer.react.js
+++ b/native/chat/chat-item-height-measurer.react.js
@@ -4,7 +4,10 @@
import * as React from 'react';
import { messageID } from 'lib/shared/message-utils.js';
-import { messageTypes, type MessageType } from 'lib/types/message-types.js';
+import {
+ messageTypes,
+ type MessageType,
+} from 'lib/types/message-types-enum.js';
import { entityTextToRawString } from 'lib/utils/entity-text.js';
import type { MeasurementTask } from './chat-context-provider.react.js';
diff --git a/native/chat/failed-send.react.js b/native/chat/failed-send.react.js
--- a/native/chat/failed-send.react.js
+++ b/native/chat/failed-send.react.js
@@ -6,10 +6,8 @@
import { threadInfoSelector } from 'lib/selectors/thread-selectors.js';
import { messageID } from 'lib/shared/message-utils.js';
-import {
- assertComposableRawMessage,
- messageTypes,
-} from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
+import { assertComposableRawMessage } from 'lib/types/message-types.js';
import type { RawComposableMessageInfo } from 'lib/types/message-types.js';
import type { ThreadInfo } from 'lib/types/thread-types.js';
diff --git a/native/chat/reaction-message-utils.js b/native/chat/reaction-message-utils.js
--- a/native/chat/reaction-message-utils.js
+++ b/native/chat/reaction-message-utils.js
@@ -9,7 +9,7 @@
sendReactionMessageActionTypes,
} from 'lib/actions/message-actions.js';
import type { ReactionInfo } from 'lib/selectors/chat-selectors.js';
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import type { RawReactionMessageInfo } from 'lib/types/messages/reaction.js';
import {
useDispatchActionPromise,
diff --git a/native/input/input-state-container.react.js b/native/input/input-state-container.react.js
--- a/native/input/input-state-container.react.js
+++ b/native/input/input-state-container.react.js
@@ -54,8 +54,8 @@
MediaMissionResult,
MediaMission,
} from 'lib/types/media-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import {
- messageTypes,
type RawMessageInfo,
type RawMultimediaMessageInfo,
type SendMessageResult,
diff --git a/native/redux/persist.js b/native/redux/persist.js
--- a/native/redux/persist.js
+++ b/native/redux/persist.js
@@ -19,10 +19,10 @@
} from 'lib/shared/unshim-utils.js';
import { defaultEnabledApps } from 'lib/types/enabled-apps.js';
import { defaultCalendarFilters } from 'lib/types/filter-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import {
type LocalMessageInfo,
type MessageStore,
- messageTypes,
type ClientDBMessageStoreOperation,
} from 'lib/types/message-types.js';
import { defaultConnectionInfo } from 'lib/types/socket-types.js';
diff --git a/native/redux/unshim-utils.js b/native/redux/unshim-utils.js
--- a/native/redux/unshim-utils.js
+++ b/native/redux/unshim-utils.js
@@ -1,8 +1,8 @@
// @flow
import { unshimFunc } from 'lib/shared/unshim-utils.js';
+import { type MessageType } from 'lib/types/message-types-enum.js';
import type {
- MessageType,
ClientDBMessageStoreOperation,
ClientDBMessageInfo,
} from 'lib/types/message-types.js';
diff --git a/web/chat/chat-input-bar.react.js b/web/chat/chat-input-bar.react.js
--- a/web/chat/chat-input-bar.react.js
+++ b/web/chat/chat-input-bar.react.js
@@ -29,7 +29,7 @@
} from 'lib/shared/thread-utils.js';
import type { CalendarQuery } from 'lib/types/entry-types.js';
import type { LoadingStatus } from 'lib/types/loading-types.js';
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import {
type ThreadInfo,
threadPermissions,
diff --git a/web/chat/failed-send.react.js b/web/chat/failed-send.react.js
--- a/web/chat/failed-send.react.js
+++ b/web/chat/failed-send.react.js
@@ -6,8 +6,8 @@
import { type ChatMessageInfoItem } from 'lib/selectors/chat-selectors.js';
import { threadInfoSelector } from 'lib/selectors/thread-selectors.js';
import { messageID } from 'lib/shared/message-utils.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import {
- messageTypes,
type RawComposableMessageInfo,
assertComposableMessageType,
} from 'lib/types/message-types.js';
diff --git a/web/chat/message.react.js b/web/chat/message.react.js
--- a/web/chat/message.react.js
+++ b/web/chat/message.react.js
@@ -4,7 +4,7 @@
import * as React from 'react';
import { type ChatMessageInfoItem } from 'lib/selectors/chat-selectors.js';
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import { type ThreadInfo } from 'lib/types/thread-types.js';
import { longAbsoluteDate } from 'lib/utils/date-utils.js';
diff --git a/web/chat/multimedia-message-send-failed.js b/web/chat/multimedia-message-send-failed.js
--- a/web/chat/multimedia-message-send-failed.js
+++ b/web/chat/multimedia-message-send-failed.js
@@ -3,7 +3,7 @@
import invariant from 'invariant';
import type { ChatMessageInfoItem } from 'lib/selectors/chat-selectors.js';
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import type { InputState } from '../input/input-state.js';
diff --git a/web/chat/multimedia-message.react.js b/web/chat/multimedia-message.react.js
--- a/web/chat/multimedia-message.react.js
+++ b/web/chat/multimedia-message.react.js
@@ -4,7 +4,7 @@
import * as React from 'react';
import { type ChatMessageInfoItem } from 'lib/selectors/chat-selectors.js';
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import { type ThreadInfo } from 'lib/types/thread-types.js';
import css from './chat-message-list.css';
diff --git a/web/chat/reaction-message-utils.js b/web/chat/reaction-message-utils.js
--- a/web/chat/reaction-message-utils.js
+++ b/web/chat/reaction-message-utils.js
@@ -8,7 +8,7 @@
sendReactionMessageActionTypes,
} from 'lib/actions/message-actions.js';
import { useModalContext } from 'lib/components/modal-provider.react.js';
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import type { RawReactionMessageInfo } from 'lib/types/messages/reaction.js';
import {
useDispatchActionPromise,
diff --git a/web/chat/text-message-send-failed.js b/web/chat/text-message-send-failed.js
--- a/web/chat/text-message-send-failed.js
+++ b/web/chat/text-message-send-failed.js
@@ -1,7 +1,7 @@
// @flow
import type { ChatMessageInfoItem } from 'lib/selectors/chat-selectors.js';
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
export default function textMessageSendFailed(
item: ChatMessageInfoItem,
diff --git a/web/chat/text-message.react.js b/web/chat/text-message.react.js
--- a/web/chat/text-message.react.js
+++ b/web/chat/text-message.react.js
@@ -7,7 +7,7 @@
import type { ChatMessageInfoItem } from 'lib/selectors/chat-selectors.js';
import { colorIsDark } from 'lib/shared/color-utils.js';
import { onlyEmojiRegex } from 'lib/shared/emojis.js';
-import { messageTypes } from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import { type ThreadInfo } from 'lib/types/thread-types.js';
import css from './chat-message-list.css';
diff --git a/web/input/input-state-container.react.js b/web/input/input-state-container.react.js
--- a/web/input/input-state-container.react.js
+++ b/web/input/input-state-container.react.js
@@ -57,8 +57,8 @@
MediaMissionResult,
MediaMission,
} from 'lib/types/media-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
import {
- messageTypes,
type RawMessageInfo,
type RawMultimediaMessageInfo,
type SendMessageResult,
diff --git a/web/utils/tooltip-action-utils.js b/web/utils/tooltip-action-utils.js
--- a/web/utils/tooltip-action-utils.js
+++ b/web/utils/tooltip-action-utils.js
@@ -12,10 +12,8 @@
threadHasPermission,
useSidebarExistsOrCanBeCreated,
} from 'lib/shared/thread-utils.js';
-import {
- isComposableMessageType,
- messageTypes,
-} from 'lib/types/message-types.js';
+import { messageTypes } from 'lib/types/message-types-enum.js';
+import { isComposableMessageType } from 'lib/types/message-types.js';
import type { ThreadInfo } from 'lib/types/thread-types.js';
import { threadPermissions } from 'lib/types/thread-types.js';
import { longAbsoluteDate } from 'lib/utils/date-utils.js';
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Dec 7, 5:40 PM (19 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5845234
Default Alt Text
D7564.1765129200.diff (44 KB)
Attached To
Mode
D7564: [lib] Move `messageTypes` enum to a separate file
Attached
Detach File
Event Timeline
Log In to Comment