message attachments

targoninc · Jun 29, 2024 · 8149071 · 8149071
1 parent 79c145b
commit 8149071
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 39 deletions.
diff --git a/.idea/venel-api.iml b/.idea/venel-api.iml
diff --git a/src/features/database/mariaDbDatabase.ts b/src/features/database/mariaDbDatabase.ts
@@ -1,6 +1,7 @@
 import mariadb from 'mariadb';
 import {CLI} from "../../tooling/CLI";
 import {
+    Attachment,
     BridgeInstance,
     Channel,
     ChannelMember,
@@ -177,6 +178,10 @@ WHERE ur.userId = ?`, [userId]);
         return await this.query("SELECT * FROM venel.messages m WHERE channelId = ? ORDER BY createdAt DESC LIMIT 100 OFFSET ?", [channelId, offset]);
     }
 
+    async getAttachmentsForMessage(messageId: Id): Promise<Attachment[]> {
+        return await this.query("SELECT * FROM venel.attachments WHERE messageId = ?", [messageId]) ?? [];
+    }
+
     async deleteUser(id: Id) {
         await this.query("DELETE FROM venel.users WHERE id = ?", [id]);
     }
@@ -325,4 +330,8 @@ WHERE ur.userId = ?`, [userId]);
     async getUserSettings(id: Id): Promise<UserSetting[] | null> {
         return await this.query("SELECT * FROM venel.userSettings WHERE userId = ?", [id]);
     }
+
+    async createAttachment(id: Id, type: string, data: Buffer | null) {
+        await this.query("INSERT INTO venel.attachments (messageId, type, data) VALUES (?, ?, ?)", [id, type, data]);
+    }
 }
diff --git a/src/features/database/models.ts b/src/features/database/models.ts
@@ -4,10 +4,11 @@
 */
 export type Id = number;
 
-export interface AudioAttachment {
-  'binaryContent': Buffer | null;
+export interface Attachment {
+  'data': Buffer | null;
   'id': Id;
   'messageId': Id | null;
+  'type': string;
 }
 
 export interface BridgedUser {
@@ -39,16 +40,10 @@ export interface Channel {
   'updatedAt': Date;
 }
 
-export interface ImageAttachment {
-  'binaryContent': Buffer | null;
-  'id': Id;
-  'messageId': Id | null;
-}
-
 export interface MessageReaction {
   'messageId': Id;
   'reactionId': Id;
-    'userId': Id;
+  'userId': Id;
 }
 
 export interface Message {
@@ -113,10 +108,10 @@ export interface User {
 }
 
 export interface UserSetting {
-    'createdAt': Date;
-    'settingKey': string;
-    'updatedAt': Date;
-    'userId': Id;
-    'value': string;
+  'createdAt': Date;
+  'settingKey': string;
+  'updatedAt': Date;
+  'userId': Id;
+  'value': string;
 }
 
diff --git a/src/features/liveFeature.ts b/src/features/liveFeature.ts
@@ -2,7 +2,7 @@ import {MariaDbDatabase} from "./database/mariaDbDatabase";
 import {ServerOptions, WebSocketServer} from "ws";
 import {MessagingEndpoints} from "./messaging/endpoints";
 import {CLI} from "../tooling/CLI";
-import {User} from "./database/models";
+import {Attachment, User} from "./database/models";
 import {Application} from "express";
 import {createServer} from "http";
 import {UserWebSocket} from "./live/UserWebSocket";
@@ -47,9 +47,6 @@ export class LiveFeature {
 
             ws.on("message", async (message: any) => {
                 const data = JSON.parse(message.toString());
-                if (data.type !== "ping") {
-                    CLI.debug("Received message: " + JSON.stringify(data, null, 2));
-                }
                 switch (data.type) {
                     case "message":
                         await LiveFeature.sendMessage(data, ws.user, clients, ws, db);
@@ -78,6 +75,12 @@ export class LiveFeature {
                     case "createChannelDm":
                         await LiveFeature.createChannelDm(data, ws.user, clients, ws, db);
                         break;
+                    case "ping":
+                        CLI.debug("Received ping");
+                        break;
+                    default:
+                        CLI.debug("Received unknown message: " + JSON.stringify(data, null, 2));
+                        break;
                 }
             });
         });
@@ -144,13 +147,42 @@ export class LiveFeature {
             client.send(JSON.stringify({error: "Message not found"}));
             return;
         }
+
+        let attachments: Attachment[] = [];
+        if (data.attachments) {
+            for (const attachment of data.attachments) {
+                if (!attachment.type) {
+                    client.send(JSON.stringify({error: "Attachment type is required"}));
+                    return;
+                }
+                if (!attachment.data) {
+                    client.send(JSON.stringify({error: "Attachment data is required"}));
+                    return;
+                }
+                attachments.push({
+                    messageId: message.id,
+                    id: -1,
+                    type: attachment.type,
+                    data: Buffer.from(attachment.data, "base64")
+                });
+            }
+
+            CLI.debug(`Creating ${attachments.length} attachments`);
+            for (const attachment of attachments) {
+                CLI.debug(`Creating attachment with length ${attachment.data?.length} of type ${attachment.type}`);
+                await db.createAttachment(message.id, attachment.type, attachment.data);
+            }
+        }
+
         const sender = await db.getUserById(user.id);
         if (!sender) {
             client.send(JSON.stringify({error: "Sender not found"}));
             return;
         }
+
         message.sender = safeUser(sender);
-        message.reactions = await db.getReactionsForMessage(message.id);
+        message.reactions = [];
+        message.attachments = attachments;
 
         const payload = JSON.stringify({
             type: "message",

diff --git a/src/features/messaging/endpoints.ts b/src/features/messaging/endpoints.ts
@@ -205,6 +205,7 @@ export class MessagingEndpoints {
                 const sender = users.get(message.senderId);
                 message.sender = safeUser(sender as User);
                 message.reactions = await db.getReactionsForMessage(message.id);
+                message.attachments = await db.getAttachmentsForMessage(message.id);
             }
             res.json(messages);
         }

diff --git a/src/models/receivableMessage.ts b/src/models/receivableMessage.ts
@@ -1,8 +1,9 @@
-import {Message, Reaction} from "../features/database/models";
+import {Attachment, Message, Reaction} from "../features/database/models";
 
 import {SafeUser} from "./safeUser";
 
 export interface ReceivableMessage extends Message {
     sender: SafeUser;
     reactions: Reaction[];
+    attachments: Attachment[];
 }
diff --git a/updateDb.sql b/updateDb.sql
@@ -154,33 +154,20 @@ create table if not exists venel.messages
             on delete cascade
 );
 
-create table if not exists venel.audioAttachments
+create table if not exists venel.attachments
 (
     id            bigint auto_increment
         primary key,
-    messageId     bigint     null,
-    binaryContent mediumblob null,
-    constraint audioAttachments_ibfk_1
+    messageId     bigint                     null,
+    type          varchar(16) default 'file' not null,
+    data          mediumblob                 null,
+    constraint attachments_ibfk_1
         foreign key (messageId) references venel.messages (id)
             on delete cascade
 );
 
 create index if not exists messageId
-    on venel.audioAttachments (messageId);
-
-create table if not exists venel.imageAttachments
-(
-    id            bigint auto_increment
-        primary key,
-    messageId     bigint     null,
-    binaryContent mediumblob null,
-    constraint imageAttachments_ibfk_1
-        foreign key (messageId) references venel.messages (id)
-            on delete cascade
-);
-
-create index if not exists messageId
-    on venel.imageAttachments (messageId);
+    on venel.attachments (messageId);
 
 create table if not exists venel.messageReactions
 (