Skip to content

Commit bf35568

Browse files
committed
Save users with no avatar, add undefined checks
1 parent c877174 commit bf35568

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

src/backend/account.cjs

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ ipcMain.on('save-room-user', (e, data) => {
2828
})
2929

3030
ipcMain.handle('get-room-users', async (e, key) => {
31+
if (!key) return []
3132
return await get_room_users(key)
3233
})
3334

src/lib/stores/storeFunctions.svelte

+12-11
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,19 @@
6565
}
6666
6767
const make_avatar = async (data, address, key, name) => {
68-
if (!data || data.length === 0) return false
69-
const blob = new Blob( [ data ]);
70-
const avatar = URL.createObjectURL( blob );
71-
const user = {avatar, address}
72-
73-
//Replace with updated avatar.
74-
if ($rooms.avatars.some(a => a.address === address)) {
75-
$rooms.avatars = $rooms.avatars.filter(a => a.address !== address)
76-
}
68+
if (data || data.length > 0) {
69+
const blob = new Blob( [ data ]);
70+
const avatar = URL.createObjectURL( blob );
71+
const user = {avatar, address}
72+
73+
//Replace with updated avatar.
74+
if ($rooms.avatars.some(a => a.address === address)) {
75+
$rooms.avatars = $rooms.avatars.filter(a => a.address !== address)
76+
}
7777
78-
$rooms.avatars.push(user)
79-
$rooms.avatars = $rooms.avatars
78+
$rooms.avatars.push(user)
79+
$rooms.avatars = $rooms.avatars
80+
}
8081
window.api.send('save-room-user', {address, avatar: data, room: key, name})
8182
}
8283

src/routes/rooms/components/RoomList.svelte

+1-2
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ const printRoom = async (room) => {
9191
9292
//Function to get all users in a room.
9393
async function filterActiveHugins() {
94-
const users = await window.api.getRoomUsers($swarm.activeSwarm.key)
95-
console.log("getRoomUsers", users)
94+
const users = await window.api.getRoomUsers($swarm.activeSwarm?.key)
9695
const all = []
9796
for (const u of users) {
9897
const user = {address: u.address, room: u.room, name: u.name}

0 commit comments

Comments
 (0)