@social-mail/social-mail-client 1.2.6 → 1.2.8

package/dist/web/page/mails/service/MailService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MailService.d.ts","sourceRoot":"","sources":["../../../../../src/web/page/mails/service/MailService.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgC,MAAM,EAA2B,MAAM,yBAAyB,CAAC;AAIxG,MAAM,CAAC,OAAO,OAAO,WAAW;IAG5B,OAAO,CAAC,aAAa,CAAgB;IAE/B,OAAO,CAAC,SAAS,EAAE,MAAM;IAOzB,IAAI,CAAC,EACP,MAAW,EACX,SAAS,EACT,KAAS,EACT,IAAS,EACT,OAAW,EACX,WAAmB,EACnB,WAAW,EACd;;;;;;;;KAAA;IAkBK,GAAG,CAAC,KAAK,EAAE,MAAM;IAOjB,IAAI,CAAC,KAAK,EAAE,MAAM;CAS3B"}
+{"version":3,"file":"MailService.d.ts","sourceRoot":"","sources":["../../../../../src/web/page/mails/service/MailService.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgC,QAAQ,EAAE,MAAM,EAA2B,MAAM,yBAAyB,CAAC;AAKlH,MAAM,CAAC,OAAO,OAAO,WAAW;IAG5B,OAAO,CAAC,aAAa,CAAgB;IAE/B,OAAO,CAAC,SAAS,EAAE,MAAM;IAOzB,IAAI,CAAC,EACP,MAAW,EACX,SAAS,EACT,KAAS,EACT,IAAS,EACT,OAAW,EACX,WAAmB,EACnB,WAAW,EACd;;;;;;;;KAAA;IAkBK,GAAG,CAAC,KAAK,EAAE,MAAM;IAOjB,IAAI,CAAC,KAAK,EAAE,MAAM;IAUlB,gBAAgB,CAAC,IAAI,EAAE,QAAQ;CAQxC"}

package/dist/web/page/mails/service/MailService.js

@@ -1,7 +1,7 @@
-System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/core/dist/di/Inject", "../../../../services/EntityService", "../../../../model/model", "../../../../common/Sql"], function (_export, _context) {
+System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/core/dist/di/Inject", "../../../../services/EntityService", "../../../../model/model", "../../../../common/Sql", "../../../../common/events/CommonEvents"], function (_export, _context) {
   "use strict";
 
-  var __awaiter, __decorate, __metadata, DISingleton, Inject, EntityService, AppFile, Mailbox, MailboxContact, Sql, MailService;
+  var __awaiter, __decorate, __metadata, DISingleton, Inject, EntityService, AppFile, Mailbox, MailboxContact, Sql, CommonEvents, MailService;
   return {
     setters: [function (_tslib) {
       __awaiter = _tslib.__awaiter;
@@ -19,6 +19,8 @@ System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/cor
       MailboxContact = _modelModel.MailboxContact;
     }, function (_commonSql) {
       Sql = _commonSql.Sql;
+    }, function (_commonEventsCommonEvents) {
+      CommonEvents = _commonEventsCommonEvents.CommonEvents;
     }],
     execute: function () {
       MailService = class MailService {
@@ -80,6 +82,18 @@ System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/cor
             yield this.entityService.save(cloner);
           });
         }
+        deleteAttachment(file) {
+          return __awaiter(this, void 0, void 0, function* () {
+            const {
+              appFileID
+            } = file;
+            yield this.entityService.save(AppFile.create({
+              $deleted: true,
+              appFileID
+            }));
+            CommonEvents.onFileDeleted.dispatchEvent(file);
+          });
+        }
       };
       __decorate([Inject, __metadata("design:type", EntityService)], MailService.prototype, "entityService", void 0);
       MailService = __decorate([DISingleton()], MailService);

package/dist/web/page/mails/service/MailService.js.map

@@ -1 +1 @@
-{"version":3,"names":["DISingleton","_webAtomsCoreDistDiDISingleton","default","_webAtomsCoreDistDiInject","Inject","_servicesEntityService","EntityService","_modelModel","AppFile","Mailbox","MailboxContact","_commonSql","Sql","execute","MailService","mailbox","mailboxID","entityService","query","where","p","x","include","emailAddress","firstOrDefault","list","search","start","size","version","showBlocked","cancelToken","q","blocked","orderByDescending","dateUpdated","likeSearch","text","iLike","lastEmail","textBody","subject","name","senderName","toPagedList","raw","email","originalFileID","file","appFileID","rs","fetch","url","send","iterator","recipients","emailAddressText","trim","cloner","attachments","copy","save","__decorate","_export"],"sources":["../../../../../src/web/page/mails/service/MailService.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"names":["DISingleton","_webAtomsCoreDistDiDISingleton","default","_webAtomsCoreDistDiInject","Inject","_servicesEntityService","EntityService","_modelModel","AppFile","Mailbox","MailboxContact","_commonSql","Sql","_commonEventsCommonEvents","CommonEvents","execute","MailService","mailbox","mailboxID","entityService","query","where","p","x","include","emailAddress","firstOrDefault","list","search","start","size","version","showBlocked","cancelToken","q","blocked","orderByDescending","dateUpdated","likeSearch","text","iLike","lastEmail","textBody","subject","name","senderName","toPagedList","raw","email","originalFileID","file","appFileID","rs","fetch","url","send","iterator","recipients","emailAddressText","trim","cloner","attachments","copy","save","deleteAttachment","create","$deleted","onFileDeleted","dispatchEvent","__decorate","_export"],"sources":["../../../../../src/web/page/mails/service/MailService.ts"],"sourcesContent":[null],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-client",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/common/controls/file-preview/FilePreview.tsx

@@ -12,6 +12,7 @@ import Command from "@web-atoms/core/dist/core/Command";
         margin: 5px;
         height: 150px;
         width: 180px;
+        contain: content;
         text-decoration: none;
         grid-template-columns: auto 1fr auto;
         grid-template-rows: 1fr auto;

package/src/common/events/CommonEvents.ts

@@ -1,9 +1,13 @@
 import EventScope from "@web-atoms/core/dist/core/EventScope";
-import { IMailboxContact, IMailboxContactEmail } from "../../model/model";
+import { IAppFile, IEmail, IMailboxContact, IMailboxContactEmail } from "../../model/model";
 
 export const CommonEvents = {
 
     onThreadMarkedAsRead: EventScope.create<IMailboxContactEmail>(),
 
-    onThreadMarkedAsBlocked: EventScope.create<IMailboxContact>()
+    onThreadMarkedAsBlocked: EventScope.create<IMailboxContact>(),
+
+    onDraftDeleted: EventScope.create<IEmail>(),
+
+    onFileDeleted: EventScope.create<IAppFile>()
 };

package/src/web/page/mails/ConversationPage.tsx

@@ -23,7 +23,7 @@ import SocialMailApp from "../../../common/SocialMailApp";
 import MailDetailPage from "./detail/MailDetailPage";
 import Checkbox from "@web-atoms/web-controls/dist/basic/Checkbox";
 import FilePreview from "../../../common/controls/file-preview/FilePreview";
-import MiniComposeBox from "./MiniComposeBox";
+import MiniComposeBox from "./mini-compose/MiniComposeBox";
 import { AncestorEnumerator } from "@web-atoms/core/dist/web/core/AtomUI";
 
 const itemCss = styled.css `
@@ -81,8 +81,6 @@ export default class ConversationPage extends ContentPage {
 
     private mails: IMailboxContactEmail[] = [];
 
-    private draft: IEmail = null;
-
     private search: string = "";
     private version = 1;
 
@@ -193,11 +191,9 @@ export default class ConversationPage extends ContentPage {
             </div>
         </PopupActionButton>;
 
-        this.draft = await this.conversationService.getDraft(this.parameters);
-
         this.footerRenderer = () => <MiniComposeBox
             mailboxContact={this.parameters}
-            draft={this.draft} />;
+            />;
     }
 
     @Action({ onEvent: "click"})
@@ -342,6 +338,5 @@ export default class ConversationPage extends ContentPage {
     async deleteDraft(mce: IMailboxContactEmail) {
         await this.conversationService.delete(mce.email);
         this.mails.remove(mce);
-        this.draft = null;
     }
 }

package/src/web/page/mails/mini-compose/MiniComposeBox.tsx

@@ -0,0 +1,198 @@
+import XNode from "@web-atoms/core/dist/core/XNode";
+import styled from "@web-atoms/core/dist/style/styled";
+import { AtomControl } from "@web-atoms/core/dist/web/controls/AtomControl";
+import { AppFile, Email, EmailRecipient, IAppFile, IEmail, IMailbox, IMailboxContact, MailboxEmail } from "../../../../model/model";
+import Bind from "@web-atoms/core/dist/core/Bind";
+import Action from "@web-atoms/core/dist/view-model/Action";
+import AudioRecorder from "../../../../common/controls/audio/AudioRecorder";
+import { Inject } from "@web-atoms/core/dist/di/Inject";
+import ConversationService from "../service/ConversationService";
+import { IUploadedFile } from "../../../../services/files/LocalFileService";
+import AtomRepeater from "@web-atoms/web-controls/dist/basic/AtomRepeater";
+import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
+import { AtomBinder } from "@web-atoms/core/dist/core/AtomBinder";
+import { CommonEvents } from "../../../../common/events/CommonEvents";
+import MailService from "../service/MailService";
+import DateTime from "@web-atoms/date-time/dist/DateTime";
+import SendFiles from "./SendFiles";
+import sleep from "@web-atoms/core/dist/core/sleep";
+
+const css = styled.css `
+    display: grid;
+    grid-template-columns: auto 1fr auto;
+    grid-template-rows: auto 1fr auto;
+
+    & > [data-element=add] {
+        grid-row: 1 / span 2;
+        grid-column: 1;
+        align-self: center;
+        font-size: larger;
+        padding: 10px;
+        background-color: white;
+        border-radius: 9999px;
+        cursor: pointer;
+    }
+
+    & > [data-element=send] {
+        grid-row: 2;
+        grid-column: 3;
+        border-radius: 10px;
+    }
+
+    & > [data-element=editor] {
+        grid-row: 2;
+        grid-column: 2;
+        margin-left: 5px;
+        margin-right: 5px;
+    }
+    & > [data-element=files] {
+        grid-row: 3;
+        grid-column: 2;
+    }
+`.installLocal();
+
+export default class MiniComposeBox extends AtomControl {
+
+    public mailboxContact: IMailboxContact = null;
+
+    public draft: IEmail = null;
+
+    public typedMessage: string = "";
+
+    @InjectProperty
+    private conversationService: ConversationService;
+
+    @InjectProperty
+    private mailService: MailService;
+
+    constructor(app, e) {
+        super(app, e);
+        this.element.className = css;
+        this.app.runAsync(() => this.init());
+    }
+
+    async init() {
+
+        await sleep(100);
+
+        this.draft = await this.conversationService.getDraft(this.mailboxContact);
+
+        this.draft.attachments ??= [];
+
+        this.render(<div>
+            <i
+                data-click-event="add-media"
+                data-element="add"
+                class="fa-solid fa-plus"
+                title="Attach media"/>
+            <textarea
+                data-element="editor"
+                value={Bind.twoWaysImmediate(() => this.typedMessage)}/>
+            <i
+                data-element="send"
+                class="fa-solid fa-microphone-lines mic"
+                event-click={() => this.sendAudioMessage()}
+                style-display={Bind.oneWay(() => !this.typedMessage)} />
+            <i
+                data-element="send"
+                class="fa-solid fa-angle-double-right send"
+                style-display={Bind.oneWay(() => !!this.typedMessage)}
+                data-click-event="send-email"
+            />
+            <AtomRepeater
+                data-element="files"
+                items={Bind.oneWay(() => this.draft?.attachments)}
+                style-display={Bind.oneWay(() => this.draft && this.draft.attachments && this.draft.attachments.length > 0)}
+                data-layout="flex-wrap-padding"
+                itemRenderer={(item: IAppFile) => <div
+                    data-layout="icon-button">
+                    <label text={item.name}/>
+                    <i
+                        data-click-event="delete-attachment"
+                        class="fas fa-times-circle"
+                        data-cursor="pointer"
+                        data-color="red"/>
+                </div>}
+                />
+        </div>);
+    }
+
+    @Action({ onEvent: "add-media"})
+    async addMedia() {
+        const files = await SendFiles.showModal<IUploadedFile[]>({});
+        this.draft ??= Email.create({
+            attachments: []
+        });
+        this.addFiles(... files);
+    }
+
+    @Action({
+        onEvent: "delete-attachment",
+        confirm: "Are you sure you want to delete this attachment?"
+    })
+    async deleteAttachment(file: IAppFile) {
+        await this.mailService.deleteAttachment(file);
+        this.draft?.attachments.remove(file);
+    }
+
+    @Action({ onEvent: CommonEvents.onDraftDeleted })
+    async refreshDraft() {
+        this.draft ??= Email.create({
+            attachments: []
+        });
+    }
+
+    @Action({ onEvent: "input", defer: 500, blockMultipleExecution: true })
+    async onChanged() {
+        if (!this.typedMessage) {
+            return;
+        }
+        this.draft ??= Email.create({
+            attachments: []
+        });
+        this.draft.mdBody = this.typedMessage;
+        await this.save();
+    }
+
+    @Action({
+        onEvent: "send-email"
+    })
+    async sendEmail() {
+        this.draft.status = "scheduled";
+        this.draft.dateSent = DateTime.now;
+        await this.mailService.send(this.draft);
+        this.draft ??= Email.create({
+            attachments: []
+        });
+    }
+
+    @Action({})
+    async sendAudioMessage() {
+        const uploadedFile = await AudioRecorder.show<IUploadedFile>();
+        this.draft ??= Email.create({
+            attachments: []
+        });
+        this.draft.mdBody = this.typedMessage;
+        this.addFiles(uploadedFile);
+        await this.save();
+    }
+
+    private addFiles(... files: IUploadedFile[]) {
+        const attachments = this.draft.attachments ??= [];
+        AtomBinder.refreshValue(this, "draft");
+        for (const { appFileID, url, file } of files) {
+            attachments.add(AppFile.create({
+                appFileID,
+                contentType: file.type,
+                name: file.name,
+                contentID: appFileID.toString(36),
+                url
+            }));
+        }
+    }
+
+    private async save() {
+        this.draft = await this.conversationService.draft({ ... this.mailboxContact, email: this.draft }, true);
+    }
+
+}

package/src/web/page/mails/mini-compose/SendFiles.tsx

@@ -0,0 +1,63 @@
+import XNode from "@web-atoms/core/dist/core/XNode";
+import Action from "@web-atoms/core/dist/view-model/Action";
+import { MenuItem } from "@web-atoms/web-controls/dist/basic/PopupButton";
+import UploadEvent from "@web-atoms/web-controls/dist/basic/UploadEvent";
+import BottomPopup from "@web-atoms/web-controls/dist/mobile-app/BottomPopup";
+import { IMailboxContact } from "../../../../model/model";
+
+export default class SendFiles extends BottomPopup {
+
+    async init() {
+        this.renderer = <div>
+            <div data-layout="vertical-flex-center-items">
+                <MenuItem
+                    { ... UploadEvent.AttachUploadAction({
+                        accept: "image/*",
+                        multiple: true,
+                        extra: {}
+                    })}
+                    data-click-event="send-photos"
+                    icon="fas fa-image"
+                    label="Send Photos"
+                    />
+                <MenuItem
+                    { ... UploadEvent.AttachUploadAction({
+                        accept: "image/*",
+                        capture: "user",
+                        extra: {}
+                    })}
+                    data-click-event="take-photo"
+                    icon="fa-duotone fa-video-plus"
+                    label="Take Photo"
+                    />
+                <MenuItem
+                    { ... UploadEvent.AttachUploadAction({
+                        accept: "video/*",
+                        multiple: false,
+                        extra: {}
+                    })}
+                    data-click-event="send-video"
+                    icon="fas fa-video"
+                    label="Send Video"
+                    />
+                <MenuItem
+                    { ... UploadEvent.AttachUploadAction({
+                        accept: "video/*",
+                        capture: "user",
+                        extra: {}
+                    })}
+                    data-click-event="record-video"
+                    icon="fa-duotone fa-video-plus"
+                    label="Record Video"
+                    />
+            </div>
+        </div>;
+    }
+
+    @Action({ onEvent: "filesAvailable"})
+    async filesAvailable({ files, extra }) {
+        this.close(files);
+        // send to compose...
+    }
+
+}

package/src/web/page/mails/service/ConversationService.tsx

@@ -231,10 +231,12 @@ export default class ConversationService {
         CommonEvents.onThreadMarkedAsBlocked.dispatchEvent(thread);
     }
 
-    async delete({ emailID }: IEmail) {
+    async delete(email: IEmail) {
+        const { emailID } = email;
         await this.entityService.delete(Email.create({
             emailID
         }));
+        CommonEvents.onDraftDeleted.dispatchEvent(email);
     }
 
 }

package/src/web/page/mails/service/MailService.ts

@@ -1,8 +1,9 @@
 import DISingleton from "@web-atoms/core/dist/di/DISingleton";
 import { Inject } from "@web-atoms/core/dist/di/Inject";
 import EntityService from "../../../../services/EntityService";
-import { AppFile, Email, EmailAddress, IEmail, Mailbox, MailboxContact } from "../../../../model/model";
+import { AppFile, Email, EmailAddress, IAppFile, IEmail, Mailbox, MailboxContact } from "../../../../model/model";
 import { Sql } from "../../../../common/Sql";
+import { CommonEvents } from "../../../../common/events/CommonEvents";
 
 @DISingleton()
 export default class MailService {
@@ -59,4 +60,13 @@ export default class MailService {
         const cloner = this.entityService.cloner(email).include((x) => x.recipients).include((x) => x.attachments).copy;
         await this.entityService.save(cloner);
     }
+
+    async deleteAttachment(file: IAppFile) {
+        const { appFileID } = file;
+        await this.entityService.save(AppFile.create({
+            $deleted: true,
+            appFileID
+        }));
+        CommonEvents.onFileDeleted.dispatchEvent(file);
+    }
 }

package/dist/web/page/mails/MiniComposeBox.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"MiniComposeBox.d.ts","sourceRoot":"","sources":["../../../../src/web/page/mails/MiniComposeBox.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAC5E,OAAO,EAA4C,MAAM,EAAY,eAAe,EAAgB,MAAM,sBAAsB,CAAC;AA8BjI,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,WAAW;IAE5C,cAAc,EAAE,eAAe,CAAQ;IAEvC,KAAK,EAAE,MAAM,CAAQ;IAErB,YAAY,EAAE,MAAM,CAAM;IAGjC,OAAO,CAAC,mBAAmB,CAAsB;gBAErC,GAAG,KAAA,EAAE,CAAC,KAAA;IAMZ,IAAI;IAyBJ,SAAS;IAWf,WAAW,IAAI,GAAG;YAKJ,gBAAgB;IAU9B,OAAO,CAAC,OAAO;YAYD,IAAI;CAIrB"}

package/dist/web/page/mails/MiniComposeBox.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["MiniComposeBox","css","_export","setters","_tslib","XNode","_webAtomsCoreDistCoreXNode","default","_webAtomsCoreDistStyleStyled","styled","_webAtomsCoreDistWebControlsAtomControl","AtomControl","_modelModel","AppFile","Email","_webAtomsCoreDistCoreBind","Bind","_webAtomsCoreDistViewModelAction","Action","_commonControlsAudioAudioRecorder","AudioRecorder","_serviceConversationService","ConversationService","_webAtomsWebControlsDistBasicAtomRepeater","AtomRepeater","_webAtomsCoreDistCoreInjectProperty","InjectProperty","_webAtomsCoreDistCoreAtomBinder","AtomBinder","execute","installLocal","constructor","app","e","mailboxContact","draft","typedMessage","element","className","runAsync","init","render","create","value","twoWaysImmediate","class","event-click","sendAudioMessage","oneWay","sendMessage","items","_a","attachments","itemRenderer","item","text","name","onChanged","mdBody","save","Error","uploadedFile","show","addFile","appFileID","url","file","_b","refreshValue","add","contentType","type","contentID","toString","conversationService","Object","assign","email","__decorate","onEvent","defer","blockMultipleExecution"],"sources":["../../../../src/web/page/mails/MiniComposeBox.tsx"],"sourcesContent":[null],"mappings":"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"}

package/src/web/page/mails/MiniComposeBox.tsx

@@ -1,118 +0,0 @@
-import XNode from "@web-atoms/core/dist/core/XNode";
-import styled from "@web-atoms/core/dist/style/styled";
-import { AtomControl } from "@web-atoms/core/dist/web/controls/AtomControl";
-import { AppFile, Email, EmailRecipient, IAppFile, IEmail, IMailbox, IMailboxContact, MailboxEmail } from "../../../model/model";
-import Bind from "@web-atoms/core/dist/core/Bind";
-import Action from "@web-atoms/core/dist/view-model/Action";
-import AudioRecorder from "../../../common/controls/audio/AudioRecorder";
-import { Inject } from "@web-atoms/core/dist/di/Inject";
-import ConversationService from "./service/ConversationService";
-import { IUploadedFile } from "../../../services/files/LocalFileService";
-import AtomRepeater from "@web-atoms/web-controls/dist/basic/AtomRepeater";
-import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
-import { AtomBinder } from "@web-atoms/core/dist/core/AtomBinder";
-
-const css = styled.css `
-    display: grid;
-    grid-template-columns: auto 1fr auto;
-    grid-template-rows: auto 1fr auto;
-
-    & > [data-element=send] {
-        grid-row: 2;
-        grid-column: 3;
-        border-radius: 10px;
-    }
-
-    & > [data-element=editor] {
-        grid-row: 2;
-        grid-column: 2;
-        margin-left: 5px;
-        margin-right: 5px;
-    }
-`.installLocal();
-
-export default class MiniComposeBox extends AtomControl {
-
-    public mailboxContact: IMailboxContact = null;
-
-    public draft: IEmail = null;
-
-    public typedMessage: string = "";
-
-    @InjectProperty
-    private conversationService: ConversationService;
-
-    constructor(app, e) {
-        super(app, e);
-        this.element.className = css;
-        this.app.runAsync(() => this.init());
-    }
-
-    async init() {
-        this.render(<div>
-            <textarea
-                data-element="editor"
-                value={Bind.twoWaysImmediate(() => this.typedMessage)}/>
-            <i
-                data-element="send"
-                class="fa-solid fa-microphone-lines mic"
-                event-click={() => this.sendAudioMessage()}
-                style-display={Bind.oneWay(() => !this.typedMessage)} />
-            <i
-                data-element="send"
-                class="fa-solid fa-angle-double-right send"
-                style-display={Bind.oneWay(() => !!this.typedMessage)}
-                event-click={() => this.sendMessage()}
-            />
-            <AtomRepeater
-                items={Bind.oneWay(() => this.draft?.attachments)}
-                data-layout="flex-wrap-padding"
-                itemRenderer={(item: IAppFile) => <div data-layout="row"><label text={item.name}/></div>}
-                />
-        </div>);
-    }
-
-    @Action({ onEvent: "input", defer: 500, blockMultipleExecution: true })
-    async onChanged() {
-        if (!this.typedMessage) {
-            return;
-        }
-        this.draft ??= Email.create({
-            attachments: []
-        });
-        this.draft.mdBody = this.typedMessage;
-        await this.save();
-    }
-
-    sendMessage(): any {
-        throw new Error("Method not implemented.");
-    }
-
-    @Action({})
-    private async sendAudioMessage() {
-        const uploadedFile = await AudioRecorder.show<IUploadedFile>();
-        this.draft ??= Email.create({
-            attachments: []
-        });
-        this.draft.mdBody = this.typedMessage;
-        this.addFile(uploadedFile);
-        await this.save();
-    }
-
-    private addFile({ appFileID, url, file }: IUploadedFile) {
-        this.draft.attachments ??= [];
-        AtomBinder.refreshValue(this, "draft");
-        this.draft.attachments.add(AppFile.create({
-            appFileID,
-            contentType: file.type,
-            name: file.name,
-            contentID: appFileID.toString(36),
-            url
-        }));
-    }
-
-    private async save() {
-        this.draft = await this.conversationService.draft({ ... this.mailboxContact, email: this.draft }, true);
-    }
-
-}