Save room users and avatars to encrypted db

Author: n9lsjr

src/backend/account.cjs

@@ -7,7 +7,7 @@ const file = join(userDataDir, 'misc.db')
 const adapter = new JSONFile(file)
 const db = new Low(adapter)
 const dbPath = userDataDir + '/SQLmessages.db'
-const { getGroups, loadBlockList, loadKeys, loadDB } = require('./database.cjs')
+const { getGroups, loadBlockList, loadKeys, loadDB, saveRoomUser, loadRoomUsers } = require('./database.cjs')
 const fs = require('fs')
 
 const Store = require('electron-store')
@@ -23,26 +23,16 @@ ipcMain.on('set-avatar', (e, data) => {
 })
 
 
-ipcMain.on('save-avatar', (e, data) => {
-  // let list = store.get('avatars') ?? []
-  // if (list.some(a => a.address === data.address)) {
-  //   const update = list.filter(a => a.address !== data.address)
-  //   list = update
-  // }
-  // list.push({avatar: data.avatar.toString('base64'), address: data.address})
-  // store.set({
-  //   avatars: list
-  // })
+ipcMain.on('save-room-user', (e, data) => {
+  saveRoomUser(data)
 })
 
-function get_room_avatars() {
-  const list = store.get('avatars') ?? []
-  const avatars = []
-  // for (const a of list) {
-  //   const item = {avatar: Buffer.from(a.avatar, 'base64'), address: a.address}
-  //   avatars.push(item)
-  // }
-  return avatars
+ipcMain.handle('get-room-users', async (e, key) => {
+  return await get_room_users(key)
+})
+
+async function get_room_users(key) {
+  return await loadRoomUsers(key)
 };
 
 ipcMain.handle('get-avatar', () => {
@@ -143,7 +133,7 @@ class Account {
       const banned = store.get('banned') ?? []
       const usersBanned = store.get('bannedUsers') ?? []
       const files = store.get('files') ?? []
-      const avatars = get_room_avatars()
+      const avatars = []
 
       this.sender('wallet-started', [
         this.node,

src/backend/database.cjs

@@ -74,6 +74,7 @@ const createTables = () => {
     blockListTable()
     groupChannelsMessagesTable()
     roomKeysTable()
+    roomUserTable()
 }
 
 const welcomeAddress =
@@ -285,30 +286,75 @@ const roomKeysTable = () => {
     })
 }
 
+const roomUserTable = () => {
+
+    const roomUsers =  `CREATE TABLE IF NOT EXISTS roomusers (
+        name TEXT NOT NULL,
+        address TEXT NOT NULL,
+        room TEXT NOT NULL,
+        avatar TEXT,
+        lastseen INT DEFAULT 0,
+        PRIMARY KEY (address, room)
+    )`;
+
+   return new Promise(
+    (resolve, reject) => {
+        database.prepare(roomUsers).run()
+    },
+    () => {
+        resolve()
+    })
+
+}
+
 
 
 //DATABASE REQUESTS
 
 const loadGroups = () => {
     const rows = []
-        const getAllGroups = `SELECT * FROM pgroups`
-        const groups = database.prepare(getAllGroups).all()
+    const getAllGroups = `SELECT * FROM pgroups`
+    const groups = database.prepare(getAllGroups).all()
 
-        for(const group of groups) {
-            rows.push(group)
-        }
-        return rows
+    for(const group of groups) {
+        rows.push(group)
+    }
+    return rows
 }
 
 const loadRooms = () => {
     const rows = []
-        const getAllRooms = `SELECT * FROM rooms`
-        const rooms = database.prepare(getAllRooms).all()
+    const getAllRooms = `SELECT * FROM rooms`
+    const rooms = database.prepare(getAllRooms).all()
 
-        for(const room of rooms) {
-            rows.push(room)
-        }
-        return rows
+    for(const room of rooms) {
+        rows.push(room)
+    }
+    return rows
+}
+
+const loadRoomUsers = async (key) => {
+    const rows = []
+    const getAllUsers = `
+        SELECT *
+        FROM roomusers
+        WHERE room = ?
+`
+    const users = database.prepare(getAllUsers)
+    for(const user of users.iterate(key)) {
+        rows.push(user)
+    }
+    return rows
+}
+
+const saveRoomUser = (user) => {
+    console.log("Save this user", user.name)
+    try {
+        database.prepare('REPLACE INTO roomusers (name, address, room, avatar, lastseen) VALUES (?, ?, ?, ?, ?)')
+        .run(user.name, user.address, user.room,user.avatar.toString('base64'), Date.now())
+    }catch (e) {
+        console.log("Error saving user:", e)
+    }
 }
 
 const loadRoomKeys = () => {
@@ -937,4 +983,4 @@ process.on('SIGINT', async () => process.exit(128 + 2));
 process.on('SIGTERM', async () => process.exit(128 + 15));
 
 
-module.exports = {saveHash, roomMessageExists,  getLatestRoomHashes, loadRoomKeys, removeRoom, getRooms ,addRoomKeys, firstContact, welcomeMessage, loadDB, loadGroups, loadRooms, loadKeys, getGroups, saveGroupMsg, unBlockContact, blockContact, removeMessages, removeContact, removeGroup, addGroup, loadBlockList, getConversation, getConversations, loadKnownTxs, getMessages, getGroupReply, printGroup, saveMsg, saveThisContact, groupMessageExists, messageExists, getContacts, getChannels, deleteMessage, addRoom}
+module.exports = {loadRoomUsers, saveRoomUser, saveHash, roomMessageExists,  getLatestRoomHashes, loadRoomKeys, removeRoom, getRooms ,addRoomKeys, firstContact, welcomeMessage, loadDB, loadGroups, loadRooms, loadKeys, getGroups, saveGroupMsg, unBlockContact, blockContact, removeMessages, removeContact, removeGroup, addGroup, loadBlockList, getConversation, getConversations, loadKnownTxs, getMessages, getGroupReply, printGroup, saveMsg, saveThisContact, groupMessageExists, messageExists, getContacts, getChannels, deleteMessage, addRoom}

src/backend/preload.cjs

@@ -53,6 +53,9 @@ const WINDOW_API = {
     getRooms: async () => {
         return await ipcRenderer.invoke('get-rooms')
     },
+    getRoomUsers: async (key) => {
+        return await ipcRenderer.invoke('get-room-users', key)
+    },
     printRoom: async (room, page) => {
         return await ipcRenderer.invoke('print-group', room, page)
     },

src/lib/stores/storeFunctions.svelte

@@ -1,6 +1,6 @@
 <script>
      import {boards, groups, notify, user, webRTC, messageWallet, beam, misc, swarm, rooms} from '$lib/stores/user.js'
-import { roomMessages } from './roommsgs'
+    import { roomMessages } from './roommsgs'
 
      window.api.receive('peer-disconnected', async (data)  => { 
         peer_disconnected(data)
@@ -64,18 +64,24 @@ import { roomMessages } from './roommsgs'
         add_user(data, joined)
     }
 
-    const make_avatar = async (data, address) => {
+    const make_avatar = async (data, address, key, name) => {
         if (!data || data.length === 0) return false
         const blob = new Blob( [ data ]);
         const avatar = URL.createObjectURL( blob );
         const user = {avatar, address}
+
+        //Replace with updated avatar.
+        if ($rooms.avatars.some(a => a.address === address)) {
+            $rooms.avatars = $rooms.avatars.filter(a => a.address !== address)
+        }
+
         $rooms.avatars.push(user)
         $rooms.avatars = $rooms.avatars
-        window.api.send('save-avatar', {address, avatar: data})
+        window.api.send('save-room-user', {address, avatar: data, room: key, name})
     }
 
     async function add_user(data, joined) {
-        const avatar = await make_avatar(data.avatar, data.address)
+        const avatar = await make_avatar(data.avatar, data.address, joined.key, data.name)
         const user = {
             message: "Joined the lobby",
             grp: joined.key,

src/routes/rooms/components/RoomList.svelte

@@ -89,14 +89,30 @@ const printRoom = async (room) => {
     readMessage(room)
 }
 
-//Function to filer array of active users on board.
-function filterActiveHugins() {
-    let uniq = {}
-    const arr = $roomMessages
-    $rooms.activeHugins = arr.filter((obj) => !uniq[obj.address] && (uniq[obj.address] = true))
+//Function to get all users in a room.
+async function filterActiveHugins() {
+   const users = await window.api.getRoomUsers($swarm.activeSwarm.key)
+   console.log("getRoomUsers", users)
+   const all = []
+    for (const u of users) {
+        const user = {address: u.address, room: u.room, name: u.name}
+        make_avatar(u.avatar, u.address)
+        all.push(user)
+    }
+    $rooms.activeHugins = all
     
+
 }
 
+const make_avatar = (data, address) => {
+    if (!data || data.length === 0) return
+    if ($rooms.avatar.some(a => a.address === address)) return
+    const blob = new Blob( [ data ]);
+    const avatar = URL.createObjectURL( blob );
+    const usr = {avatar, address}
+    $rooms.avatars.push(usr)
+    $rooms.avatars = $rooms.avatars
+}
 //Print our conversations from DBs
 async function printRooms() {
     roomList = await window.api.getRooms()