@wireapp/core 37.2.0 → 37.2.2

package/lib/Account.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="node" />
 import { RegisterData, Context, Cookie, LoginData } from '@wireapp/api-client/lib/auth';
 import { ClientType, RegisteredClient } from '@wireapp/api-client/lib/client/';
-import * as Events from '@wireapp/api-client/lib/event';
 import { EventEmitter } from 'events';
 import { APIClient, BackendFeatures } from '@wireapp/api-client';
 import { CRUDEngine } from '@wireapp/store-engine';
@@ -9,16 +8,14 @@ import { AccountService } from './account/';
 import { BroadcastService } from './broadcast/';
 import { ClientInfo, ClientService } from './client/';
 import { ConnectionService } from './connection/';
-import { AssetService, ConversationService, PayloadBundleSource, PayloadBundleType } from './conversation/';
-import * as OtrMessage from './conversation/message/OtrMessage';
-import * as UserMessage from './conversation/message/UserMessage';
+import { AssetService, ConversationService } from './conversation/';
 import { CoreError } from './CoreError';
 import { CryptographyService, SessionId } from './cryptography/';
 import { GiphyService } from './giphy/';
 import { LinkPreviewService } from './linkPreview';
 import { MLSService } from './messagingProtocols/mls';
 import { MLSCallbacks, CryptoProtocolConfig } from './messagingProtocols/mls/types';
-import { HandledEventPayload, NotificationService } from './notification/';
+import { HandledEventPayload, NotificationService, NotificationSource } from './notification/';
 import { SelfService } from './self/';
 import { TeamService } from './team/';
 import { UserService } from './user/';
@@ -37,31 +34,6 @@ export declare enum ConnectionState {
     LIVE = "live"
 }
 export interface Account {
-    on(event: PayloadBundleType.ASSET, listener: (payload: OtrMessage.FileAssetMessage | OtrMessage.ImageAssetMessage) => void): this;
-    on(event: PayloadBundleType.BUTTON_ACTION, listener: (payload: OtrMessage.ButtonActionMessage) => void): this;
-    on(event: PayloadBundleType.ASSET_ABORT, listener: (payload: OtrMessage.FileAssetAbortMessage) => void): this;
-    on(event: PayloadBundleType.ASSET_IMAGE, listener: (payload: OtrMessage.ImageAssetMessage) => void): this;
-    on(event: PayloadBundleType.ASSET_META, listener: (payload: OtrMessage.FileAssetMetaDataMessage) => void): this;
-    on(event: PayloadBundleType.CALL, listener: (payload: OtrMessage.CallMessage) => void): this;
-    on(event: PayloadBundleType.CLIENT_ACTION, listener: (payload: OtrMessage.ResetSessionMessage) => void): this;
-    on(event: PayloadBundleType.CLIENT_ADD, listener: (payload: UserMessage.UserClientAddMessage) => void): this;
-    on(event: PayloadBundleType.CLIENT_REMOVE, listener: (payload: UserMessage.UserClientRemoveMessage) => void): this;
-    on(event: PayloadBundleType.CONFIRMATION, listener: (payload: OtrMessage.ConfirmationMessage) => void): this;
-    on(event: PayloadBundleType.CONNECTION_REQUEST, listener: (payload: UserMessage.UserConnectionMessage) => void): this;
-    on(event: PayloadBundleType.USER_UPDATE, listener: (payload: UserMessage.UserUpdateMessage) => void): this;
-    on(event: PayloadBundleType.CONVERSATION_CLEAR, listener: (payload: OtrMessage.ClearConversationMessage) => void): this;
-    on(event: PayloadBundleType.CONVERSATION_RENAME, listener: (payload: Events.ConversationRenameEvent) => void): this;
-    on(event: PayloadBundleType.LOCATION, listener: (payload: OtrMessage.LocationMessage) => void): this;
-    on(event: PayloadBundleType.MEMBER_JOIN, listener: (payload: Events.TeamMemberJoinEvent) => void): this;
-    on(event: PayloadBundleType.MESSAGE_DELETE, listener: (payload: OtrMessage.DeleteMessage) => void): this;
-    on(event: PayloadBundleType.MESSAGE_EDIT, listener: (payload: OtrMessage.EditedTextMessage) => void): this;
-    on(event: PayloadBundleType.MESSAGE_HIDE, listener: (payload: OtrMessage.HideMessage) => void): this;
-    on(event: PayloadBundleType.PING, listener: (payload: OtrMessage.PingMessage) => void): this;
-    on(event: PayloadBundleType.REACTION, listener: (payload: OtrMessage.ReactionMessage) => void): this;
-    on(event: PayloadBundleType.TEXT, listener: (payload: OtrMessage.TextMessage) => void): this;
-    on(event: PayloadBundleType.TIMER_UPDATE, listener: (payload: Events.ConversationMessageTimerUpdateEvent) => void): this;
-    on(event: PayloadBundleType.TYPING, listener: (payload: Events.ConversationTypingEvent) => void): this;
-    on(event: PayloadBundleType.UNKNOWN, listener: (payload: any) => void): this;
     on(event: TOPIC.ERROR, listener: (payload: CoreError) => void): this;
 }
 export type CreateStoreFn = (storeName: string, context: Context) => undefined | Promise<CRUDEngine | undefined>;
@@ -208,7 +180,7 @@ export declare class Account<T = any> extends EventEmitter {
          * @param payload the payload of the event. Contains the raw event received and the decrypted data (if event was encrypted)
          * @param source where the message comes from (either websocket or notification stream)
          */
-        onEvent?: (payload: HandledEventPayload, source: PayloadBundleSource) => void;
+        onEvent?: (payload: HandledEventPayload, source: NotificationSource) => void;
         /**
          * During the notification stream processing, this function will be called whenever a new notification has been processed
          */

package/lib/Account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Account.d.ts","sourceRoot":"","sources":["../src/Account.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Account.d.ts","sourceRoot":"","sources":["../src/Account.ts"],"names":[],"mappings":";AAmBA,OAAO,EACL,YAAY,EAGZ,OAAO,EACP,MAAM,EAEN,SAAS,EACV,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAuB,UAAU,EAAE,gBAAgB,EAAC,MAAM,iCAAiC,CAAC;AAWnG,OAAO,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAC;AAEpC,OAAO,EAAC,SAAS,EAAE,eAAe,EAAC,MAAM,qBAAqB,CAAC;AAG/D,OAAO,EAAC,UAAU,EAA0C,MAAM,uBAAuB,CAAC;AAE1F,OAAO,EAAC,cAAc,EAAC,MAAM,YAAY,CAAC;AAE1C,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,UAAU,EAAE,aAAa,EAAC,MAAM,WAAW,CAAC;AACpD,OAAO,EAAC,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,EAAC,YAAY,EAAE,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AAElE,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AACtC,OAAO,EAAC,mBAAmB,EAAE,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AACtC,OAAO,EAAC,kBAAkB,EAAC,MAAM,eAAe,CAAC;AACjD,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAC,YAAY,EAAE,oBAAoB,EAAC,MAAM,gCAAgC,CAAC;AAElF,OAAO,EAAC,mBAAmB,EAAE,mBAAmB,EAAE,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AAC7F,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AACpC,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AACpC,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AAGpC,MAAM,MAAM,qBAAqB,GAAG,mBAAmB,CAAC;AAExD,aAAK,KAAK;IACR,KAAK,wBAAwB;CAC9B;AAED,oBAAY,eAAe;IACzB,8EAA8E;IAC9E,MAAM,WAAW;IACjB,oCAAoC;IACpC,UAAU,eAAe;IACzB,mFAAmF;IACnF,wBAAwB,6BAA6B;IACrD,oGAAoG;IACpG,IAAI,SAAS;CACd;AAED,MAAM,WAAW,OAAO;IACtB,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,SAAS,KAAK,IAAI,GAAG,IAAI,CAAC;CACtE;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,SAAS,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;AAEjH,UAAU,cAAc,CAAC,CAAC;IACxB,8FAA8F;IAC9F,WAAW,CAAC,EAAE,aAAa,CAAC;IAE5B;;;;;;;;OAQG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,oBAAoB,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC;CAChD;AAED,KAAK,WAAW,GAAG;IACjB,2FAA2F;IAC3F,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,6DAA6D;IAC7D,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,IAAI,CAAC;CAC9C,CAAC;AAQF,qBAAa,OAAO,CAAC,CAAC,GAAG,GAAG,CAAE,SAAQ,YAAY;IAChD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAgB;IAC5C,OAAO,CAAC,WAAW,CAAC,CAAa;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAA0B;IAChE,OAAO,CAAC,gBAAgB,CAAC,CAAa;IAEtC,gBAAuB,KAAK,eAAS;IAC9B,OAAO,CAAC,EAAE;QACf,GAAG,EAAE,UAAU,CAAC;QAChB,OAAO,EAAE,cAAc,CAAC;QACxB,KAAK,EAAE,YAAY,CAAC;QACpB,SAAS,EAAE,gBAAgB,CAAC;QAC5B,MAAM,EAAE,aAAa,CAAC;QACtB,UAAU,EAAE,iBAAiB,CAAC;QAC9B,YAAY,EAAE,mBAAmB,CAAC;QAClC,YAAY,EAAE,mBAAmB,CAAC;QAClC,KAAK,EAAE,YAAY,CAAC;QACpB,WAAW,EAAE,kBAAkB,CAAC;QAChC,YAAY,EAAE,mBAAmB,CAAC;QAClC,IAAI,EAAE,WAAW,CAAC;QAClB,IAAI,EAAE,WAAW,CAAC;QAClB,IAAI,EAAE,WAAW,CAAC;KACnB,CAAC;IACK,eAAe,EAAE,eAAe,CAAC;IAExC;;;OAGG;gBAED,SAAS,GAAE,SAA2B,EACtC,EAAC,WAA6B,EAAE,SAAa,EAAE,oBAAoB,EAAC,GAAE,cAAc,CAAC,CAAC,CAAM;IAyB9F;;;;;;;;;;OAUG;IACU,aAAa,CAAC,iBAAiB,EAAE,MAAM,EAAE,EAAE,aAAa,CAAC,EAAE,OAAO;IAM/E,OAAO,CAAC,aAAa;IAKrB,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;OAKG;IACU,QAAQ,CAAC,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAM3F;;;;;OAKG;IACU,IAAI,CACf,UAAU,EAAE,UAAU,EACtB,EAAC,MAAM,EAAE,UAAiB,EAAE,WAAW,EAAC,GAAE,WAAgB,GACzD,OAAO,CAAC,OAAO,CAAC;IA0CnB;;;;;;;OAOG;IACU,KAAK,CAChB,SAAS,EAAE,SAAS,EACpB,UAAU,GAAE,OAAc,EAC1B,UAAU,GAAE,UAA8B,GACzC,OAAO,CAAC,OAAO,CAAC;IAcnB;;;;;;;;;OASG;IACU,UAAU,CACrB,SAAS,EAAE,SAAS,EACpB,UAAU,CAAC,EAAE,UAAU,EACvB,WAAW,CAAC,EAAE,UAAU,GACvB,OAAO,CAAC;QAAC,WAAW,EAAE,OAAO,CAAC;QAAC,WAAW,EAAE,gBAAgB,CAAA;KAAC,CAAC;IAmDjE;;;;;;OAMG;IACH,qBAAqB,CAAC,YAAY,EAAE,YAAY;IAInC,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA0D7C,0BAA0B,CAAC,WAAW,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAiB9E,eAAe;YA2Cf,cAAc;IA4B5B,OAAO,CAAC,YAAY;IAKpB;;;OAGG;IACU,MAAM,CAAC,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9D;;;;;;OAMG;IACI,MAAM,CAAC,EACZ,OAAkB,EAClB,wBAAmC,EACnC,4BAAuC,EACvC,qBAAgC,EAChC,MAAc,GACf,GAAE;QACD;;;;WAIG;QACH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,mBAAmB,EAAE,MAAM,EAAE,kBAAkB,KAAK,IAAI,CAAC;QAE7E;;WAEG;QACH,4BAA4B,CAAC,EAAE,CAAC,EAAC,IAAI,EAAE,KAAK,EAAC,EAAE;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAC,KAAK,IAAI,CAAC;QAEtF;;WAEG;QACH,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;QAE5D;;;;;;WAMG;QACH,qBAAqB,CAAC,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,IAAI,CAAC;QAEzD;;WAEG;QACH,MAAM,CAAC,EAAE,OAAO,CAAC;KACb,GAAG,MAAM,IAAI;IAiFnB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,qBAAqB;YAIf,UAAU;CAqBzB"}

package/lib/Account.js

@@ -54,6 +54,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Account = exports.ConnectionState = void 0;
 const auth_1 = require("@wireapp/api-client/lib/auth");
 const client_1 = require("@wireapp/api-client/lib/client/");
+const event_1 = require("@wireapp/api-client/lib/event");
 const tcp_1 = require("@wireapp/api-client/lib/tcp/");
 const ReconnectingWebsocket_1 = require("@wireapp/api-client/lib/tcp/ReconnectingWebsocket");
 const axios_1 = __importDefault(require("axios"));
@@ -421,19 +422,16 @@ class Account extends events_1.EventEmitter {
             throw new Error('Context is not set - please login first');
         }
         const handleEvent = async (payload, source) => {
-            const { mappedEvent } = payload;
-            switch (mappedEvent === null || mappedEvent === void 0 ? void 0 : mappedEvent.type) {
-                case conversation_1.PayloadBundleType.TIMER_UPDATE: {
-                    const { data: { message_timer }, conversation, } = payload.event;
+            const { event } = payload;
+            switch (event === null || event === void 0 ? void 0 : event.type) {
+                case event_1.CONVERSATION_EVENT.MESSAGE_TIMER_UPDATE: {
+                    const { data: { message_timer }, conversation, } = event;
                     const expireAfterMillis = Number(message_timer);
                     this.service.conversation.messageTimer.setConversationLevelTimer(conversation, expireAfterMillis);
                     break;
                 }
             }
             onEvent(payload, source);
-            if (mappedEvent) {
-                this.emit(mappedEvent.type, payload.mappedEvent);
-            }
         };
         const handleNotification = async (notification, source) => {
             var _a, e_1, _b, _c;
@@ -465,7 +463,7 @@ class Account extends events_1.EventEmitter {
             }
         };
         this.apiClient.transport.ws.removeAllListeners(tcp_1.WebSocketClient.TOPIC.ON_MESSAGE);
-        this.apiClient.transport.ws.on(tcp_1.WebSocketClient.TOPIC.ON_MESSAGE, notification => handleNotification(notification, conversation_1.PayloadBundleSource.WEBSOCKET));
+        this.apiClient.transport.ws.on(tcp_1.WebSocketClient.TOPIC.ON_MESSAGE, notification => handleNotification(notification, notification_1.NotificationSource.WEBSOCKET));
         this.apiClient.transport.ws.on(tcp_1.WebSocketClient.TOPIC.ON_STATE_CHANGE, wsState => {
             const mapping = {
                 [ReconnectingWebsocket_1.WEBSOCKET_STATE.CLOSED]: ConnectionState.CLOSED,

package/lib/conversation/ConversationMapper/ConversationMapper.d.ts

@@ -1,7 +1,8 @@
 import { ConversationEvent } from '@wireapp/api-client/lib/event';
-import { PayloadBundle, PayloadBundleSource } from '../message/PayloadBundle';
+import { NotificationSource } from '../../notification';
+import { PayloadBundle } from '../message/PayloadBundle';
 export declare class ConversationMapper {
-    static mapConversationEvent(event: ConversationEvent, source: PayloadBundleSource): PayloadBundle;
+    static mapConversationEvent(event: ConversationEvent, source: NotificationSource): PayloadBundle;
     private static mapConversationEventType;
 }
 //# sourceMappingURL=ConversationMapper.d.ts.map

package/lib/conversation/ConversationMapper/ConversationMapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConversationMapper.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationMapper/ConversationMapper.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAqB,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AAGpF,OAAO,EAAC,aAAa,EAAE,mBAAmB,EAAwC,MAAM,0BAA0B,CAAC;AAEnH,qBAAa,kBAAkB;WACf,oBAAoB,CAAC,KAAK,EAAE,iBAAiB,EAAE,MAAM,EAAE,mBAAmB,GAAG,aAAa;IAgBxG,OAAO,CAAC,MAAM,CAAC,wBAAwB;CAcxC"}
+{"version":3,"file":"ConversationMapper.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationMapper/ConversationMapper.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAqB,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AAEpF,OAAO,EAAC,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAGtD,OAAO,EAAC,aAAa,EAAoB,MAAM,0BAA0B,CAAC;AAC1E,qBAAa,kBAAkB;WACf,oBAAoB,CAAC,KAAK,EAAE,iBAAiB,EAAE,MAAM,EAAE,kBAAkB,GAAG,aAAa;IAgBvG,OAAO,CAAC,MAAM,CAAC,wBAAwB;CAcxC"}

package/lib/conversation/ConversationMapper/ConversationMapper.js

@@ -20,6 +20,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConversationMapper = void 0;
 const event_1 = require("@wireapp/api-client/lib/event");
+const message_1 = require("../message");
 const MessageBuilder_1 = require("../message/MessageBuilder");
 const PayloadBundle_1 = require("../message/PayloadBundle");
 class ConversationMapper {
@@ -33,7 +34,7 @@ class ConversationMapper {
             id: (0, MessageBuilder_1.createId)(),
             messageTimer: 0,
             source,
-            state: PayloadBundle_1.PayloadBundleState.INCOMING,
+            state: message_1.MessageSendingState.INCOMING,
             timestamp: new Date(event.time).getTime(),
             type: this.mapConversationEventType(event.type),
         };

package/lib/conversation/ConversationService/ConversationService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ConversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.ts"],"names":[],"mappings":"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"}

package/lib/conversation/ConversationService/ConversationService.js

@@ -222,7 +222,7 @@ class ConversationService {
         return {
             id: payload.messageId,
             sentAt,
-            state: sentAt ? conversation_2.PayloadBundleState.OUTGOING_SENT : conversation_2.PayloadBundleState.CANCELLED,
+            state: sentAt ? conversation_2.MessageSendingState.OUTGOING_SENT : conversation_2.MessageSendingState.CANCELLED,
         };
     }
     async addUsersToMLSConversation({ qualifiedUserIds, groupId, conversationId, }) {

package/lib/conversation/ConversationService/ConversationService.types.d.ts

@@ -2,7 +2,7 @@ import { QualifiedUserClients, ClientMismatch, ConversationProtocol, MessageSend
 import { MlsEvent } from '@wireapp/api-client/lib/conversation/data/MlsEventData';
 import { QualifiedId } from '@wireapp/api-client/lib/user';
 import { GenericMessage } from '@wireapp/protocol-messaging';
-import { PayloadBundleState } from '..';
+import { MessageSendingState } from '..';
 export declare enum MessageTargetMode {
     NONE = 0,
     USERS = 1,
@@ -90,6 +90,6 @@ export type SendResult = {
     /** the ISO formatted date at which the message was received by the backend */
     sentAt: string;
     /** The sending state of the payload (has the payload been succesfully sent or canceled) */
-    state: PayloadBundleState;
+    state: MessageSendingState;
 };
 //# sourceMappingURL=ConversationService.types.d.ts.map

package/lib/conversation/ConversationService/ConversationService.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConversationService.types.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.types.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,oBAAoB,EACpB,cAAc,EACd,oBAAoB,EACpB,oBAAoB,EACpB,WAAW,EACX,YAAY,EACb,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAC,QAAQ,EAAC,MAAM,wDAAwD,CAAC;AAChF,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAC,kBAAkB,EAAC,MAAM,IAAI,CAAC;AAEtC,oBAAY,iBAAiB;IAC3B,IAAI,IAAA;IACJ,KAAK,IAAA;IACL,aAAa,IAAA;CACd;AAED,MAAM,WAAW,qBAAqB;IACpC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,GAAG,WAAW,GAAG,oBAAoB,CAAC;IAExE;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;OAEG;IACH,gBAAgB,CAAC,EAAE,uBAAuB,CAAC,kBAAkB,CAAC,CAAC;IAE/D;;;;;OAKG;IACH,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAChC;AAED,MAAM,WAAW,uBAAuB;IACtC;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,CACjB,MAAM,EAAE,cAAc,GAAG,oBAAoB,EAC7C,OAAO,EAAE,OAAO,KACb,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACxC;AAED;;;;GAIG;AAEH;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,EAAE,oBAAoB,CAAC;CAChC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,OAAO,EAAE,cAAc,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,gBAAgB,GAAG;IACpD;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,oBAAoB,CAAC,GAAG,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,WAAW,GAAG;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AAE9D,MAAM,MAAM,cAAc,GAAG;IAC3B,cAAc,EAAE,WAAW,CAAC;IAC5B,gBAAgB,EAAE,WAAW,EAAE,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,cAAc,EAAE,WAAW,CAAC;IAC5B,gBAAgB,EAAE,WAAW,EAAE,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAAC,MAAM,EAAE,QAAQ,EAAE,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAC,CAAC;AAE7E,MAAM,MAAM,UAAU,GAAG;IACvB,iCAAiC;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,8EAA8E;IAC9E,MAAM,EAAE,MAAM,CAAC;IACf,2FAA2F;IAC3F,KAAK,EAAE,kBAAkB,CAAC;CAC3B,CAAC"}
+{"version":3,"file":"ConversationService.types.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.types.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,oBAAoB,EACpB,cAAc,EACd,oBAAoB,EACpB,oBAAoB,EACpB,WAAW,EACX,YAAY,EACb,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAC,QAAQ,EAAC,MAAM,wDAAwD,CAAC;AAChF,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAC,mBAAmB,EAAC,MAAM,IAAI,CAAC;AAEvC,oBAAY,iBAAiB;IAC3B,IAAI,IAAA;IACJ,KAAK,IAAA;IACL,aAAa,IAAA;CACd;AAED,MAAM,WAAW,qBAAqB;IACpC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,GAAG,WAAW,GAAG,oBAAoB,CAAC;IAExE;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;OAEG;IACH,gBAAgB,CAAC,EAAE,uBAAuB,CAAC,kBAAkB,CAAC,CAAC;IAE/D;;;;;OAKG;IACH,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAChC;AAED,MAAM,WAAW,uBAAuB;IACtC;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,CACjB,MAAM,EAAE,cAAc,GAAG,oBAAoB,EAC7C,OAAO,EAAE,OAAO,KACb,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACxC;AAED;;;;GAIG;AAEH;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,EAAE,oBAAoB,CAAC;CAChC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,OAAO,EAAE,cAAc,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,gBAAgB,GAAG;IACpD;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,oBAAoB,CAAC,GAAG,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,WAAW,GAAG;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AAE9D,MAAM,MAAM,cAAc,GAAG;IAC3B,cAAc,EAAE,WAAW,CAAC;IAC5B,gBAAgB,EAAE,WAAW,EAAE,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,cAAc,EAAE,WAAW,CAAC;IAC5B,gBAAgB,EAAE,WAAW,EAAE,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAAC,MAAM,EAAE,QAAQ,EAAE,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAC,CAAC;AAE7E,MAAM,MAAM,UAAU,GAAG;IACvB,iCAAiC;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,8EAA8E;IAC9E,MAAM,EAAE,MAAM,CAAC;IACf,2FAA2F;IAC3F,KAAK,EAAE,mBAAmB,CAAC;CAC5B,CAAC"}

package/lib/conversation/index.d.ts

@@ -6,5 +6,6 @@ export * from './ConversationService';
 export * from './GenericMessageType';
 export * from './MessageTimer';
 export * from './message/PayloadBundle';
+export * from './message/Message.types';
 export * from './ReactionType';
 //# sourceMappingURL=index.d.ts.map

package/lib/conversation/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/conversation/index.ts"],"names":[],"mappings":"AAmBA,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/conversation/index.ts"],"names":[],"mappings":"AAmBA,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC"}

package/lib/conversation/index.js

@@ -40,4 +40,5 @@ __exportStar(require("./ConversationService"), exports);
 __exportStar(require("./GenericMessageType"), exports);
 __exportStar(require("./MessageTimer"), exports);
 __exportStar(require("./message/PayloadBundle"), exports);
+__exportStar(require("./message/Message.types"), exports);
 __exportStar(require("./ReactionType"), exports);

package/lib/conversation/message/Message.types.d.ts

@@ -0,0 +1,7 @@
+export declare enum MessageSendingState {
+    INCOMING = "INCOMING",
+    OUTGOING_SENT = "OUTGOING_SENT",
+    OUTGOING_UNSENT = "OUTGOING_UNSENT",
+    CANCELLED = "CANCELLED"
+}
+//# sourceMappingURL=Message.types.d.ts.map

package/lib/conversation/message/Message.types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Message.types.d.ts","sourceRoot":"","sources":["../../../src/conversation/message/Message.types.ts"],"names":[],"mappings":"AAmBA,oBAAY,mBAAmB;IAC7B,QAAQ,aAAa;IACrB,aAAa,kBAAkB;IAC/B,eAAe,oBAAoB;IACnC,SAAS,cAAc;CACxB"}

package/lib/conversation/message/Message.types.js

@@ -0,0 +1,28 @@
+"use strict";
+/*
+ * Wire
+ * Copyright (C) 2018 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MessageSendingState = void 0;
+var MessageSendingState;
+(function (MessageSendingState) {
+    MessageSendingState["INCOMING"] = "INCOMING";
+    MessageSendingState["OUTGOING_SENT"] = "OUTGOING_SENT";
+    MessageSendingState["OUTGOING_UNSENT"] = "OUTGOING_UNSENT";
+    MessageSendingState["CANCELLED"] = "CANCELLED";
+})(MessageSendingState = exports.MessageSendingState || (exports.MessageSendingState = {}));

package/lib/conversation/message/MessageService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MessageService.d.ts","sourceRoot":"","sources":["../../../src/conversation/message/MessageService.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,cAAc,EACd,oBAAoB,EAIpB,oBAAoB,EACpB,WAAW,EACZ,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAC,WAAW,EAAE,4BAA4B,EAAE,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AAQ5G,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAO9C,OAAO,EAAC,mBAAmB,EAAC,MAAM,oBAAoB,CAAC;AAMvD,qBAAa,cAAc;IACb,OAAO,CAAC,QAAQ,CAAC,SAAS;IAAa,OAAO,CAAC,QAAQ,CAAC,mBAAmB;gBAA1D,SAAS,EAAE,SAAS,EAAmB,mBAAmB,EAAE,mBAAmB;IAE5G;;;;;;;;;;;OAWG;IACU,WAAW,CACtB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,WAAW,GAAG,mBAAmB,EAC7C,SAAS,EAAE,UAAU,EACrB,OAAO,GAAE;QACP,cAAc,CAAC,EAAE,WAAW,CAAC;QAC7B,aAAa,CAAC,EAAE,OAAO,GAAG,MAAM,EAAE,CAAC;QACnC,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;KAC/E,GACL,OAAO,CAAC,cAAc,GAAG;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAC,CAAC;IAmChD;;;;;;;;;;;OAWG;IACU,oBAAoB,CAC/B,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,oBAAoB,GAAG,4BAA4B,EAC/D,SAAS,EAAE,UAAU,EACrB,OAAO,EAAE;QACP,SAAS,CAAC,EAAE,UAAU,CAAC;QACvB,cAAc,CAAC,EAAE,WAAW,CAAC;QAC7B,aAAa,CAAC,EAAE,OAAO,GAAG,WAAW,EAAE,CAAC;QACxC,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,oBAAoB,KAAK,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;KAC1F,GACA,OAAO,CAAC,oBAAoB,GAAG;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAC,CAAC;YAyBxC,uBAAuB;YAiEvB,cAAc;YAmCd,uBAAuB;IAkBrC,OAAO,CAAC,oBAAoB;IAc5B,OAAO,CAAC,qBAAqB;YAIf,sBAAsB;IAmBpC;;;;;;;OAOG;YACW,+BAA+B;YAuB/B,sBAAsB;CAoDrC"}
+{"version":3,"file":"MessageService.d.ts","sourceRoot":"","sources":["../../../src/conversation/message/MessageService.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,cAAc,EACd,oBAAoB,EAIpB,oBAAoB,EACpB,WAAW,EACZ,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAC,WAAW,EAAE,4BAA4B,EAAE,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AAQ5G,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAO9C,OAAO,EAAC,mBAAmB,EAAC,MAAM,oBAAoB,CAAC;AAMvD,qBAAa,cAAc;IACb,OAAO,CAAC,QAAQ,CAAC,SAAS;IAAa,OAAO,CAAC,QAAQ,CAAC,mBAAmB;gBAA1D,SAAS,EAAE,SAAS,EAAmB,mBAAmB,EAAE,mBAAmB;IAE5G;;;;;;;;;;;OAWG;IACU,WAAW,CACtB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,WAAW,GAAG,mBAAmB,EAC7C,SAAS,EAAE,UAAU,EACrB,OAAO,GAAE;QACP,cAAc,CAAC,EAAE,WAAW,CAAC;QAC7B,aAAa,CAAC,EAAE,OAAO,GAAG,MAAM,EAAE,CAAC;QACnC,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;KAC/E,GACL,OAAO,CAAC,cAAc,GAAG;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAC,CAAC;IAmChD;;;;;;;;;;;OAWG;IACU,oBAAoB,CAC/B,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,oBAAoB,GAAG,4BAA4B,EAC/D,SAAS,EAAE,UAAU,EACrB,OAAO,EAAE;QACP,SAAS,CAAC,EAAE,UAAU,CAAC;QACvB,cAAc,CAAC,EAAE,WAAW,CAAC;QAC7B,aAAa,CAAC,EAAE,OAAO,GAAG,WAAW,EAAE,CAAC;QACxC,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,oBAAoB,KAAK,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;KAC1F,GACA,OAAO,CAAC,oBAAoB,GAAG;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAC,CAAC;YAyBxC,uBAAuB;YAiEvB,cAAc;YAmCd,uBAAuB;IAiBrC,OAAO,CAAC,oBAAoB;IAc5B,OAAO,CAAC,qBAAqB;YAIf,sBAAsB;IAmBpC;;;;;;;OAOG;YACW,+BAA+B;YAuB/B,sBAAsB;CAoDrC"}

package/lib/conversation/message/MessageService.js

@@ -189,14 +189,13 @@ class MessageService {
     async generateExternalPayload(plainText) {
         const asset = await (0, AssetCryptography_1.encryptAsset)({ plainText });
         const { cipherText, keyBytes, sha256 } = asset;
-        const messageId = (0, MessageBuilder_1.createId)();
         const externalMessage = {
             otrKey: new Uint8Array(keyBytes),
             sha256: new Uint8Array(sha256),
         };
         const genericMessage = protocol_messaging_1.GenericMessage.create({
             [__1.GenericMessageType.EXTERNAL]: externalMessage,
-            messageId,
+            messageId: (0, MessageBuilder_1.createId)(),
         });
         return { text: protocol_messaging_1.GenericMessage.encode(genericMessage).finish(), cipherText };
     }

package/lib/conversation/message/MessageToProtoMapper.d.ts

@@ -1,8 +1,7 @@
 import { LinkPreview, Text } from '@wireapp/protocol-messaging';
-import { EditedTextMessage, TextMessage } from './OtrMessage';
-import { LinkPreviewUploadedContent } from '../content';
+import { EditedTextContent, LinkPreviewUploadedContent, TextContent } from '../content';
 export declare class MessageToProtoMapper {
     static mapLinkPreviews(linkPreviews: LinkPreviewUploadedContent[]): LinkPreview[];
-    static mapText(payloadBundle: TextMessage['content'] | EditedTextMessage['content']): Text;
+    static mapText(payloadBundle: TextContent | EditedTextContent): Text;
 }
 //# sourceMappingURL=MessageToProtoMapper.d.ts.map

package/lib/conversation/message/MessageToProtoMapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MessageToProtoMapper.d.ts","sourceRoot":"","sources":["../../../src/conversation/message/MessageToProtoMapper.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAiB,WAAW,EAAkB,IAAI,EAAQ,MAAM,6BAA6B,CAAC;AAErG,OAAO,EAAC,iBAAiB,EAAE,WAAW,EAAC,MAAM,cAAc,CAAC;AAE5D,OAAO,EAAC,0BAA0B,EAAC,MAAM,YAAY,CAAC;AAGtD,qBAAa,oBAAoB;IAC/B,MAAM,CAAC,eAAe,CAAC,YAAY,EAAE,0BAA0B,EAAE,GAAG,WAAW,EAAE;IA+DjF,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,WAAW,CAAC,SAAS,CAAC,GAAG,iBAAiB,CAAC,SAAS,CAAC,GAAG,IAAI;CA0B3F"}
+{"version":3,"file":"MessageToProtoMapper.d.ts","sourceRoot":"","sources":["../../../src/conversation/message/MessageToProtoMapper.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAiB,WAAW,EAAkB,IAAI,EAAQ,MAAM,6BAA6B,CAAC;AAErG,OAAO,EAAC,iBAAiB,EAAE,0BAA0B,EAAE,WAAW,EAAC,MAAM,YAAY,CAAC;AAGtF,qBAAa,oBAAoB;IAC/B,MAAM,CAAC,eAAe,CAAC,YAAY,EAAE,0BAA0B,EAAE,GAAG,WAAW,EAAE;IA+DjF,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,WAAW,GAAG,iBAAiB,GAAG,IAAI;CA0BrE"}

package/lib/conversation/message/PayloadBundle.d.ts

@@ -1,19 +1,10 @@
 import { ConversationEventData, TeamEventData, UserEventData } from '@wireapp/api-client/lib/event/';
 import { QualifiedId } from '@wireapp/api-client/lib/user';
 import { Message } from './Message';
+import { MessageSendingState } from './Message.types';
+import { NotificationSource } from '../../notification';
 import { ConversationContent } from '../content';
 export type PayloadBundleContent = ConversationContent | ConversationEventData | TeamEventData | UserEventData;
-export declare enum PayloadBundleSource {
-    LOCAL = "PayloadBundleSource.LOCAL",
-    NOTIFICATION_STREAM = "PayloadBundleSource.NOTIFICATION_STREAM",
-    WEBSOCKET = "PayloadBundleSource.WEBSOCKET"
-}
-export declare enum PayloadBundleState {
-    INCOMING = "PayloadBundleState.INCOMING",
-    OUTGOING_SENT = "PayloadBundleState.OUTGOING_SENT",
-    OUTGOING_UNSENT = "PayloadBundleState.OUTGOING_UNSENT",
-    CANCELLED = "PayloadBundleState.CANCELLED"
-}
 export interface BasePayloadBundle {
     content: PayloadBundleContent;
     conversation: string;
@@ -23,8 +14,8 @@ export interface BasePayloadBundle {
     fromClientId?: string;
     id: string;
     messageTimer?: number;
-    source: PayloadBundleSource;
-    state: PayloadBundleState;
+    source: NotificationSource;
+    state: MessageSendingState;
     timestamp: number;
     type: PayloadBundleType;
 }

package/lib/conversation/message/PayloadBundle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PayloadBundle.d.ts","sourceRoot":"","sources":["../../../src/conversation/message/PayloadBundle.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,qBAAqB,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,gCAAgC,CAAC;AACnG,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAElC,OAAO,EAAC,mBAAmB,EAAC,MAAM,YAAY,CAAC;AAE/C,MAAM,MAAM,oBAAoB,GAAG,mBAAmB,GAAG,qBAAqB,GAAG,aAAa,GAAG,aAAa,CAAC;AAE/G,oBAAY,mBAAmB;IAC7B,KAAK,8BAA8B;IACnC,mBAAmB,4CAA4C;IAC/D,SAAS,kCAAkC;CAC5C;AAED,oBAAY,kBAAkB;IAC5B,QAAQ,gCAAgC;IACxC,aAAa,qCAAqC;IAClD,eAAe,uCAAuC;IACtD,SAAS,iCAAiC;CAC3C;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,oBAAoB,CAAC;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,qBAAqB,CAAC,EAAE,WAAW,CAAC;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,WAAW,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,KAAK,EAAE,kBAAkB,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,iBAAiB,CAAC;CACzB;AAED,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,iBAAiB,CAAC;AAExD,oBAAY,iBAAiB;IAC3B,KAAK,4BAA4B;IACjC,WAAW,kCAAkC;IAC7C,WAAW,kCAAkC;IAC7C,UAAU,iCAAiC;IAC3C,aAAa,oCAAoC;IACjD,0BAA0B,iDAAiD;IAC3E,IAAI,2BAA2B;IAC/B,aAAa,oCAAoC;IACjD,UAAU,iCAAiC;IAC3C,aAAa,oCAAoC;IACjD,SAAS,gCAAgC;IACzC,YAAY,mCAAmC;IAC/C,kBAAkB,yCAAyC;IAC3D,kBAAkB,yCAAyC;IAC3D,mBAAmB,0CAA0C;IAC7D,QAAQ,+BAA+B;IACvC,WAAW,kCAAkC;IAC7C,cAAc,qCAAqC;IACnD,YAAY,mCAAmC;IAC/C,YAAY,mCAAmC;IAC/C,mBAAmB,kCAAkC;IACrD,IAAI,2BAA2B;IAC/B,QAAQ,+BAA+B;IACvC,wBAAwB,+CAA+C;IACvE,wBAAwB,+CAA+C;IACvE,WAAW,kCAAkC;IAC7C,gBAAgB,uCAAuC;IACvD,iBAAiB,wCAAwC;IACzD,WAAW,kCAAkC;IAC7C,IAAI,2BAA2B;IAC/B,YAAY,mCAAmC;IAC/C,MAAM,6BAA6B;IACnC,OAAO,8BAA8B;IACrC,aAAa,oCAAoC;IACjD,eAAe,sCAAsC;IACrD,kBAAkB,yCAAyC;IAC3D,eAAe,sCAAsC;IACrD,WAAW,kCAAkC;IAC7C,uBAAuB,8CAA8C;IACrE,sBAAsB,6CAA6C;IACnE,uBAAuB,8CAA8C;IACrE,mBAAmB,0CAA0C;IAC7D,WAAW,kCAAkC;CAC9C"}
+{"version":3,"file":"PayloadBundle.d.ts","sourceRoot":"","sources":["../../../src/conversation/message/PayloadBundle.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,qBAAqB,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,gCAAgC,CAAC;AACnG,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAClC,OAAO,EAAC,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EAAC,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAC,mBAAmB,EAAC,MAAM,YAAY,CAAC;AAE/C,MAAM,MAAM,oBAAoB,GAAG,mBAAmB,GAAG,qBAAqB,GAAG,aAAa,GAAG,aAAa,CAAC;AAE/G,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,oBAAoB,CAAC;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,qBAAqB,CAAC,EAAE,WAAW,CAAC;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,WAAW,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,KAAK,EAAE,mBAAmB,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,iBAAiB,CAAC;CACzB;AAED,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,iBAAiB,CAAC;AAExD,oBAAY,iBAAiB;IAC3B,KAAK,4BAA4B;IACjC,WAAW,kCAAkC;IAC7C,WAAW,kCAAkC;IAC7C,UAAU,iCAAiC;IAC3C,aAAa,oCAAoC;IACjD,0BAA0B,iDAAiD;IAC3E,IAAI,2BAA2B;IAC/B,aAAa,oCAAoC;IACjD,UAAU,iCAAiC;IAC3C,aAAa,oCAAoC;IACjD,SAAS,gCAAgC;IACzC,YAAY,mCAAmC;IAC/C,kBAAkB,yCAAyC;IAC3D,kBAAkB,yCAAyC;IAC3D,mBAAmB,0CAA0C;IAC7D,QAAQ,+BAA+B;IACvC,WAAW,kCAAkC;IAC7C,cAAc,qCAAqC;IACnD,YAAY,mCAAmC;IAC/C,YAAY,mCAAmC;IAC/C,mBAAmB,kCAAkC;IACrD,IAAI,2BAA2B;IAC/B,QAAQ,+BAA+B;IACvC,wBAAwB,+CAA+C;IACvE,wBAAwB,+CAA+C;IACvE,WAAW,kCAAkC;IAC7C,gBAAgB,uCAAuC;IACvD,iBAAiB,wCAAwC;IACzD,WAAW,kCAAkC;IAC7C,IAAI,2BAA2B;IAC/B,YAAY,mCAAmC;IAC/C,MAAM,6BAA6B;IACnC,OAAO,8BAA8B;IACrC,aAAa,oCAAoC;IACjD,eAAe,sCAAsC;IACrD,kBAAkB,yCAAyC;IAC3D,eAAe,sCAAsC;IACrD,WAAW,kCAAkC;IAC7C,uBAAuB,8CAA8C;IACrE,sBAAsB,6CAA6C;IACnE,uBAAuB,8CAA8C;IACrE,mBAAmB,0CAA0C;IAC7D,WAAW,kCAAkC;CAC9C"}

package/lib/conversation/message/PayloadBundle.js

@@ -18,20 +18,7 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PayloadBundleType = exports.PayloadBundleState = exports.PayloadBundleSource = void 0;
-var PayloadBundleSource;
-(function (PayloadBundleSource) {
-    PayloadBundleSource["LOCAL"] = "PayloadBundleSource.LOCAL";
-    PayloadBundleSource["NOTIFICATION_STREAM"] = "PayloadBundleSource.NOTIFICATION_STREAM";
-    PayloadBundleSource["WEBSOCKET"] = "PayloadBundleSource.WEBSOCKET";
-})(PayloadBundleSource = exports.PayloadBundleSource || (exports.PayloadBundleSource = {}));
-var PayloadBundleState;
-(function (PayloadBundleState) {
-    PayloadBundleState["INCOMING"] = "PayloadBundleState.INCOMING";
-    PayloadBundleState["OUTGOING_SENT"] = "PayloadBundleState.OUTGOING_SENT";
-    PayloadBundleState["OUTGOING_UNSENT"] = "PayloadBundleState.OUTGOING_UNSENT";
-    PayloadBundleState["CANCELLED"] = "PayloadBundleState.CANCELLED";
-})(PayloadBundleState = exports.PayloadBundleState || (exports.PayloadBundleState = {}));
+exports.PayloadBundleType = void 0;
 var PayloadBundleType;
 (function (PayloadBundleType) {
     PayloadBundleType["ASSET"] = "PayloadBundleType.ASSET";

package/lib/conversation/message/TextContentBuilder.d.ts

@@ -1,4 +1,3 @@
-import { QuotableMessage } from './OtrMessage';
 import { EditedTextContent, LegalHoldStatus, LinkPreviewUploadedContent, MentionContent, QuoteContent, TextContent } from '../content';
 export declare class TextContentBuilder<T extends TextContent | EditedTextContent> {
     private readonly content;
@@ -6,7 +5,7 @@ export declare class TextContentBuilder<T extends TextContent | EditedTextConten
     build(): T;
     withLinkPreviews(linkPreviews?: LinkPreviewUploadedContent[]): this;
     withMentions(mentions?: MentionContent[]): this;
-    withQuote(quote?: QuotableMessage | QuoteContent): this;
+    withQuote(quote?: QuoteContent): this;
     withReadConfirmation(expectsReadConfirmation?: boolean): this;
     withLegalHoldStatus(legalHoldStatus?: LegalHoldStatus): this;
 }

package/lib/conversation/message/TextContentBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TextContentBuilder.d.ts","sourceRoot":"","sources":["../../../src/conversation/message/TextContentBuilder.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,eAAe,EAAC,MAAM,cAAc,CAAC;AAG7C,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,0BAA0B,EAC1B,cAAc,EACd,YAAY,EACZ,WAAW,EACZ,MAAM,YAAY,CAAC;AAEpB,qBAAa,kBAAkB,CAAC,CAAC,SAAS,WAAW,GAAG,iBAAiB;IACvE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAI;gBAEhB,WAAW,EAAE,CAAC;IAI1B,KAAK,IAAI,CAAC;IAIV,gBAAgB,CAAC,YAAY,CAAC,EAAE,0BAA0B,EAAE;IAQ5D,YAAY,CAAC,QAAQ,CAAC,EAAE,cAAc,EAAE;IAQxC,SAAS,CAAC,KAAK,CAAC,EAAE,eAAe,GAAG,YAAY;IAqBhD,oBAAoB,CAAC,uBAAuB,UAAQ;IAOpD,mBAAmB,CAAC,eAAe,kBAA0B;CAM9D"}
+{"version":3,"file":"TextContentBuilder.d.ts","sourceRoot":"","sources":["../../../src/conversation/message/TextContentBuilder.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,0BAA0B,EAC1B,cAAc,EACd,YAAY,EACZ,WAAW,EACZ,MAAM,YAAY,CAAC;AAEpB,qBAAa,kBAAkB,CAAC,CAAC,SAAS,WAAW,GAAG,iBAAiB;IACvE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAI;gBAEhB,WAAW,EAAE,CAAC;IAI1B,KAAK,IAAI,CAAC;IAIV,gBAAgB,CAAC,YAAY,CAAC,EAAE,0BAA0B,EAAE;IAQ5D,YAAY,CAAC,QAAQ,CAAC,EAAE,cAAc,EAAE;IAQxC,SAAS,CAAC,KAAK,CAAC,EAAE,YAAY;IAQ9B,oBAAoB,CAAC,uBAAuB,UAAQ;IAOpD,mBAAmB,CAAC,eAAe,kBAA0B;CAM9D"}

package/lib/conversation/message/TextContentBuilder.js

@@ -19,7 +19,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TextContentBuilder = void 0;
-const cryptography_1 = require("../../cryptography");
 const content_1 = require("../content");
 class TextContentBuilder {
     constructor(textContent) {
@@ -42,17 +41,7 @@ class TextContentBuilder {
     }
     withQuote(quote) {
         if (quote) {
-            if (quote.quotedMessageId) {
-                this.content.quote = quote;
-            }
-            else {
-                const messageHashService = new cryptography_1.MessageHashService(quote.content, quote.timestamp);
-                const messageHashBuffer = messageHashService.getHash();
-                this.content.quote = {
-                    quotedMessageId: quote.id,
-                    quotedMessageSha256: new Uint8Array(messageHashBuffer),
-                };
-            }
+            this.content.quote = quote;
         }
         return this;
     }

package/lib/conversation/message/index.d.ts

@@ -0,0 +1,2 @@
+export * from './Message.types';
+//# sourceMappingURL=index.d.ts.map

package/lib/conversation/message/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/conversation/message/index.ts"],"names":[],"mappings":"AAmBA,cAAc,iBAAiB,CAAC"}

package/lib/conversation/{ConversationMapper → message}/index.js

@@ -32,4 +32,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./ConversationMapper"), exports);
+__exportStar(require("./Message.types"), exports);

package/lib/cryptography/CryptographyService.d.ts

@@ -7,7 +7,6 @@ import { APIClient } from '@wireapp/api-client';
 import { Cryptobox } from '@wireapp/cryptobox';
 import { GenericMessage } from '@wireapp/protocol-messaging';
 import { CRUDEngine } from '@wireapp/store-engine';
-import { PayloadBundle, PayloadBundleSource } from '../conversation';
 export type SessionId = {
     userId: string;
     clientId: string;
@@ -74,6 +73,5 @@ export declare class CryptographyService {
     deleteCryptographyStores(): Promise<boolean[]>;
     resetSession(sessionId: string): Promise<void>;
     decryptMessage(otrMessage: ConversationOtrMessageAddEvent): Promise<GenericMessage>;
-    mapGenericMessage(otrMessage: ConversationOtrMessageAddEvent, genericMessage: GenericMessage, source: PayloadBundleSource): PayloadBundle;
 }
 //# sourceMappingURL=CryptographyService.d.ts.map

package/lib/cryptography/CryptographyService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CryptographyService.d.ts","sourceRoot":"","sources":["../../src/cryptography/CryptographyService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CryptographyService.d.ts","sourceRoot":"","sources":["../../src/cryptography/CryptographyService.ts"],"names":[],"mappings":"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"}

package/lib/cryptography/CryptographyService.js

@@ -28,9 +28,7 @@ const cryptobox_1 = require("@wireapp/cryptobox");
 const proteus_1 = require("@wireapp/proteus");
 const protocol_messaging_1 = require("@wireapp/protocol-messaging");
 const CryptographyDatabaseRepository_1 = require("./CryptographyDatabaseRepository");
-const GenericMessageMapper_1 = require("./GenericMessageMapper");
 const generateDecryptionError_1 = require("./Utlility/generateDecryptionError");
-const conversation_1 = require("../conversation");
 const util_1 = require("../util");
 class CryptographyService {
     constructor(apiClient, storeEngine, config) {
@@ -220,18 +218,5 @@ class CryptographyService {
             throw (0, generateDecryptionError_1.generateDecryptionError)(otrMessage, error, this.logger);
         }
     }
-    mapGenericMessage(otrMessage, genericMessage, source) {
-        if (genericMessage.content === conversation_1.GenericMessageType.EPHEMERAL) {
-            const unwrappedMessage = GenericMessageMapper_1.GenericMessageMapper.mapGenericMessage(genericMessage.ephemeral, otrMessage, source);
-            unwrappedMessage.id = genericMessage.messageId;
-            if (genericMessage.ephemeral) {
-                const expireAfterMillis = genericMessage.ephemeral.expireAfterMillis;
-                unwrappedMessage.messageTimer =
-                    typeof expireAfterMillis === 'number' ? expireAfterMillis : expireAfterMillis.toNumber();
-            }
-            return unwrappedMessage;
-        }
-        return GenericMessageMapper_1.GenericMessageMapper.mapGenericMessage(genericMessage, otrMessage, source);
-    }
 }
 exports.CryptographyService = CryptographyService;

package/lib/cryptography/GenericMessageMapper.d.ts

@@ -1,7 +1,8 @@
 import { ConversationOtrMessageAddEvent } from '@wireapp/api-client/lib/event/';
-import { PayloadBundle, PayloadBundleSource } from '../conversation';
+import { PayloadBundle } from '../conversation';
+import { NotificationSource } from '../notification';
 export declare class GenericMessageMapper {
     private static readonly logger;
-    static mapGenericMessage(genericMessage: any, event: ConversationOtrMessageAddEvent, source: PayloadBundleSource): PayloadBundle;
+    static mapGenericMessage(genericMessage: any, event: ConversationOtrMessageAddEvent, source: NotificationSource): PayloadBundle;
 }
 //# sourceMappingURL=GenericMessageMapper.d.ts.map

package/lib/cryptography/GenericMessageMapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GenericMessageMapper.d.ts","sourceRoot":"","sources":["../../src/cryptography/GenericMessageMapper.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,8BAA8B,EAAC,MAAM,gCAAgC,CAAC;AAG9E,OAAO,EAEL,aAAa,EACb,mBAAmB,EAGpB,MAAM,iBAAiB,CAAC;AAczB,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAG3B;WAIW,iBAAiB,CAC7B,cAAc,EAAE,GAAG,EACnB,KAAK,EAAE,8BAA8B,EACrC,MAAM,EAAE,mBAAmB,GAC1B,aAAa;CA4NjB"}
+{"version":3,"file":"GenericMessageMapper.d.ts","sourceRoot":"","sources":["../../src/cryptography/GenericMessageMapper.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,8BAA8B,EAAC,MAAM,gCAAgC,CAAC;AAG9E,OAAO,EAA0C,aAAa,EAAoB,MAAM,iBAAiB,CAAC;AAa1G,OAAO,EAAC,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AACnD,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAG3B;WAIW,iBAAiB,CAC7B,cAAc,EAAE,GAAG,EACnB,KAAK,EAAE,8BAA8B,EACrC,MAAM,EAAE,kBAAkB,GACzB,aAAa;CA4NjB"}

package/lib/cryptography/GenericMessageMapper.js

@@ -34,7 +34,7 @@ class GenericMessageMapper {
             qualifiedFrom: event.qualified_from,
             fromClientId: event.data.sender,
             from: event.from,
-            state: conversation_1.PayloadBundleState.INCOMING,
+            state: conversation_1.MessageSendingState.INCOMING,
             timestamp: new Date(event.time).getTime(),
             id: genericMessage.messageId,
             messageTimer: 0,

package/lib/messagingProtocols/mls/EventHandler/ConversationEvent/events/messageAdd/messageAdd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messageAdd.d.ts","sourceRoot":"","sources":["../../../../../../../src/messagingProtocols/mls/EventHandler/ConversationEvent/events/messageAdd/messageAdd.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAE,8BAA8B,EAAqB,MAAM,+BAA+B,CAAC;AAE/G,OAAO,OAAO,MAAM,SAAS,CAAC;AAI9B,OAAO,EAAC,kBAAkB,EAAC,MAAM,6BAA6B,CAAC;AAE/D,OAAO,EAAC,kBAAkB,EAAC,MAAM,6BAA6B,CAAC;AAE/D,QAAA,MAAM,oBAAoB,UAAW,YAAY,4CACE,CAAC;AAEpD,UAAU,yBAA0B,SAAQ,kBAAkB;IAC5D,KAAK,EAAE,8BAA8B,CAAC;IACtC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC;CACxB;AACD,QAAA,MAAM,mBAAmB,kCAAuC,yBAAyB,uBAgDxF,CAAC;AAEF,OAAO,EAAC,oBAAoB,EAAE,mBAAmB,EAAC,CAAC"}
+{"version":3,"file":"messageAdd.d.ts","sourceRoot":"","sources":["../../../../../../../src/messagingProtocols/mls/EventHandler/ConversationEvent/events/messageAdd/messageAdd.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAE,8BAA8B,EAAqB,MAAM,+BAA+B,CAAC;AAE/G,OAAO,OAAO,MAAM,SAAS,CAAC;AAI9B,OAAO,EAAC,kBAAkB,EAAC,MAAM,6BAA6B,CAAC;AAE/D,OAAO,EAAC,kBAAkB,EAAC,MAAM,6BAA6B,CAAC;AAE/D,QAAA,MAAM,oBAAoB,UAAW,YAAY,4CACE,CAAC;AAEpD,UAAU,yBAA0B,SAAQ,kBAAkB;IAC5D,KAAK,EAAE,8BAA8B,CAAC;IACtC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC;CACxB;AACD,QAAA,MAAM,mBAAmB,kCAAuC,yBAAyB,uBA4CxF,CAAC;AAEF,OAAO,EAAC,oBAAoB,EAAE,mBAAmB,EAAC,CAAC"}

package/lib/messagingProtocols/mls/EventHandler/ConversationEvent/events/messageAdd/messageAdd.js

@@ -54,10 +54,6 @@ const handleMLSMessageAdd = async ({ mlsService, event, logger }) => {
         return;
     }
     const decryptedData = protocol_messaging_1.GenericMessage.decode(message);
-    /**
-     * @todo Find a proper solution to add mappedEvent to this return
-     * otherwise event.data will be base64 raw data of the received event
-     */
     return {
         event,
         decryptedData,

package/lib/messagingProtocols/mls/EventHandler/EventHandler.types.d.ts

@@ -1,11 +1,11 @@
 import { BackendEvent } from '@wireapp/api-client/lib/event';
-import { PayloadBundleSource } from '../../../conversation';
+import { NotificationSource } from '../../../notification';
 import { MLSService } from '../MLSService/MLSService';
-export { BackendEvent, PayloadBundleSource };
+export { BackendEvent };
 export type EventHandlerParams = {
     mlsService: MLSService;
     event: BackendEvent;
-    source: PayloadBundleSource;
+    source: NotificationSource;
     dryRun?: boolean;
 };
 //# sourceMappingURL=EventHandler.types.d.ts.map