3.0 Beta 2

src/app/chat/dm/dm.html

@@ -13,13 +13,13 @@
     </div>
 
     <div class="items-right">
-      <button tuiButton appearance="flat">
+      <button tuiButton appearance="flat" disabled>
         <tui-icon icon="@tui.phone"/>
       </button>
     </div>
   </navbar>
 
-  <messages [messages]="store.messages()"/>
+  <messages [messageBoxViewModel]="store.messageBox" [messages]="store.messages()" id="scrollContainer" (onDelete)="deleteMessage($event)"/>
 
   <message-box [viewModel]="store.messageBox"/>
 }

src/app/chat/dm/dm.ts

@@ -40,8 +40,31 @@ export class Dm implements OnInit {
   }
 
   async sendMessage(message: string, files: FileDataWithPreview[] | null) {
+    if (!files && message.trim() == "") return
+
     const session = this.serviceManager.currentSession();
     if (session != null) {
+      const editedMessage = this.store.messageBox.editingMessage()
+      if (editedMessage) {
+        const storedMsg = this.store.messages().find(m => m.msgid == editedMessage.messageId)
+        const originalMessage: Message = JSON.parse(JSON.stringify(storedMsg))
+        if (storedMsg) {
+          storedMsg.message = message
+        }
+
+        try {
+          await this.store.service.editMessage(editedMessage.messageId, message)
+        } catch (e) {
+          if (storedMsg) {
+            storedMsg.message = originalMessage.message
+          }
+        }
+
+        this.store.messageBox.editingMessage.set(null)
+        this.store.messageBox.message.set("")
+        return
+      }
+
       let attachments: Attachment[] = []
       files?.forEach(file => {
         const extraMetaData: Record<string, string> = {}
@@ -74,12 +97,40 @@ export class Dm implements OnInit {
         forwardedFromName: ""
       }])
 
+      this.scrollToBottom("smooth")
+
       await this.store.service.sendMessage("", message, null, null, files, <FileUploadProgressListener>{
         fileProgressUpdate: (tempMsgId, fileId, allChunks, chunksDone) => {
           this.uploadProgressUpdate(tempMsgId, fileId, allChunks, chunksDone)
         }
       })
     }
+
+    this.store.messageBox.message.set("")
+  }
+
+  async deleteMessage(messageId: string) {
+    const i = this.store.messages().findIndex(m => m.msgid == messageId)
+    if (i != -1) {
+      const originalMessage: Message = JSON.parse(JSON.stringify(this.store.messages()[i]))
+      this.store.messages().splice(i, 1)
+      try {
+        await this.store.service.deleteMessages([messageId])
+      } catch (e) {
+        this.store.messages().splice(i, 0, originalMessage)
+      }
+    }
+  }
+
+  scrollToBottom(anim: 'instant' | 'smooth'): void {
+    setTimeout(() => {
+      const scrollContainer = <HTMLDivElement>document.querySelector("#scrollContainer")
+      scrollContainer.scroll({
+        top: scrollContainer.scrollHeight,
+        left: 0,
+        behavior: anim
+      });
+    }, 0)
   }
 
   uploadProgressUpdate(tempMsgId: string, fileId: string, allChunks: number, chunksDone: number) {
@@ -95,6 +146,7 @@ export class Dm implements OnInit {
         switch (action) {
           case "newMessage":
             targetStore.messages.update(messages => [...messages, data]);
+            this.scrollToBottom("smooth")
             break;
         }
       }
@@ -135,6 +187,7 @@ export class Dm implements OnInit {
         const currentStore = this.serviceManager.dmServices()[chatid];
         const history = await currentStore.service.get();
         currentStore.messages.set(history);
+        this.scrollToBottom("instant")
 
         await currentStore.service.joinWebSocketRoom();
       }