rick/rosterchirp-dev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.9.30 more bugfixes

Browse Source
This commit is contained in:
Ricky Stretch
2026-03-15 22:47:46 -04:00
parent d3f6dcecd5
commit 5728fd294e
5 changed files with 54 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.example
View File

@@ -10,7 +10,7 @@
PROJECT_NAME=jama PROJECT_NAME=jama
# Image version to run (set by build.sh, or use 'latest') # Image version to run (set by build.sh, or use 'latest')
JAMA_VERSION=0.9.29 JAMA_VERSION=0.9.30
# App port — the host port Docker maps to the container # App port — the host port Docker maps to the container
PORT=3000 PORT=3000

2
backend/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "jama-backend", "name": "jama-backend",
"version": "0.9.29", "version": "0.9.30",
"description": "TeamChat backend server", "description": "TeamChat backend server",
"main": "src/index.js", "main": "src/index.js",
"scripts": { "scripts": {

123
backend/src/routes/usergroups.js
View File

@@ -7,8 +7,8 @@ module.exports = function(io) {
// ── Helpers ─────────────────────────────────────────────────────────────────── // ── Helpers ───────────────────────────────────────────────────────────────────
function postSysMsg(db, groupId, userId, content) { function postSysMsg(db, groupId, actorId, content) {
const r = db.prepare(`INSERT INTO messages (group_id, user_id, content, type) VALUES (?, ?, ?, 'system')`).run(groupId, userId, content); const r = db.prepare(`INSERT INTO messages (group_id, user_id, content, type) VALUES (?, ?, ?, 'system')`).run(groupId, actorId, content);
const msg = db.prepare(` const msg = db.prepare(`
SELECT m.*, u.name as user_name, u.display_name as user_display_name, SELECT m.*, u.name as user_name, u.display_name as user_display_name,
u.avatar as user_avatar, u.role as user_role, u.status as user_status, u.avatar as user_avatar, u.role as user_role, u.status as user_status,
@@ -18,22 +18,23 @@ function postSysMsg(db, groupId, userId, content) {
if (msg) { msg.reactions = []; io.to(`group:${groupId}`).emit('message:new', msg); } if (msg) { msg.reactions = []; io.to(`group:${groupId}`).emit('message:new', msg); }
} }
// Add user silently (no system message) — used during initial group creation // Add user silently — no system message (used during initial creation)
function addUserToDmGroupSilent(db, dmGroupId, userId) { function addUserSilent(db, dmGroupId, userId) {
db.prepare("INSERT OR IGNORE INTO group_members (group_id, user_id, joined_at) VALUES (?, ?, datetime('now'))").run(dmGroupId, userId); db.prepare("INSERT OR IGNORE INTO group_members (group_id, user_id, joined_at) VALUES (?, ?, datetime('now'))").run(dmGroupId, userId);
io.in(`user:${userId}`).socketsJoin(`group:${dmGroupId}`); io.in(`user:${userId}`).socketsJoin(`group:${dmGroupId}`);
const dmGroup = db.prepare('SELECT * FROM groups WHERE id = ?').get(dmGroupId); const dmGroup = db.prepare('SELECT * FROM groups WHERE id = ?').get(dmGroupId);
io.to(`user:${userId}`).emit('group:new', { group: dmGroup }); if (dmGroup) io.to(`user:${userId}`).emit('group:new', { group: dmGroup });
} }
// Add user with system message — used when adding to existing group // Add user with system message (used when editing existing group)
function addUserToDmGroup(db, dmGroupId, userId, actorId) { function addUser(db, dmGroupId, userId, actorId) {
addUserToDmGroupSilent(db, dmGroupId, userId); addUserSilent(db, dmGroupId, userId);
const u = db.prepare('SELECT name, display_name FROM users WHERE id = ?').get(userId); const u = db.prepare('SELECT name, display_name FROM users WHERE id = ?').get(userId);
postSysMsg(db, dmGroupId, actorId, `${u?.display_name || u?.name || 'A user'} has joined the conversation.`); postSysMsg(db, dmGroupId, actorId, `${u?.display_name || u?.name || 'A user'} has joined the conversation.`);
} }
function removeUserFromDmGroup(db, dmGroupId, userId, actorId) { // Remove user with system message
function removeUser(db, dmGroupId, userId, actorId) {
db.prepare('DELETE FROM group_members WHERE group_id = ? AND user_id = ?').run(dmGroupId, userId); db.prepare('DELETE FROM group_members WHERE group_id = ? AND user_id = ?').run(dmGroupId, userId);
io.in(`user:${userId}`).socketsLeave(`group:${dmGroupId}`); io.in(`user:${userId}`).socketsLeave(`group:${dmGroupId}`);
io.to(`user:${userId}`).emit('group:deleted', { groupId: dmGroupId }); io.to(`user:${userId}`).emit('group:deleted', { groupId: dmGroupId });
@@ -41,24 +42,11 @@ function removeUserFromDmGroup(db, dmGroupId, userId, actorId) {
postSysMsg(db, dmGroupId, actorId, `${u?.display_name || u?.name || 'A user'} has been removed from the conversation.`); postSysMsg(db, dmGroupId, actorId, `${u?.display_name || u?.name || 'A user'} has been removed from the conversation.`);
} }
// Get all user_ids for a user group
function getUserIdsForGroup(db, userGroupId) { function getUserIdsForGroup(db, userGroupId) {
return db.prepare('SELECT user_id FROM user_group_members WHERE user_group_id = ?').all(userGroupId).map(r => r.user_id); return db.prepare('SELECT user_id FROM user_group_members WHERE user_group_id = ?').all(userGroupId).map(r => r.user_id);
} }
// ── USER GROUPS ─────────────────────────────────────────────────────────────── // ── MULTI-GROUP DMs — must come before /:id ───────────────────────────────────
router.get('/', authMiddleware, adminMiddleware, (req, res) => {
const db = getDb();
const groups = db.prepare(`
SELECT ug.*,
(SELECT COUNT(*) FROM user_group_members WHERE user_group_id = ug.id) as member_count
FROM user_groups ug ORDER BY ug.name ASC
`).all();
res.json({ groups });
});
// ── MULTI-GROUP DMs ───────────────────────────────────────────────────────────
router.get('/multigroup', authMiddleware, adminMiddleware, (req, res) => { router.get('/multigroup', authMiddleware, adminMiddleware, (req, res) => {
const db = getDb(); const db = getDb();
@@ -67,7 +55,6 @@ router.get('/multigroup', authMiddleware, adminMiddleware, (req, res) => {
(SELECT COUNT(*) FROM multi_group_dm_members WHERE multi_group_dm_id = mgd.id) as group_count (SELECT COUNT(*) FROM multi_group_dm_members WHERE multi_group_dm_id = mgd.id) as group_count
FROM multi_group_dms mgd ORDER BY mgd.name ASC FROM multi_group_dms mgd ORDER BY mgd.name ASC
`).all(); `).all();
// Attach member user group IDs
for (const dm of dms) { for (const dm of dms) {
dm.memberGroupIds = db.prepare('SELECT user_group_id FROM multi_group_dm_members WHERE multi_group_dm_id = ?').all(dm.id).map(r => r.user_group_id); dm.memberGroupIds = db.prepare('SELECT user_group_id FROM multi_group_dm_members WHERE multi_group_dm_id = ?').all(dm.id).map(r => r.user_group_id);
} }
@@ -92,17 +79,14 @@ router.post('/multigroup', authMiddleware, adminMiddleware, (req, res) => {
const addedUsers = new Set(); const addedUsers = new Set();
for (const ugId of validGroupIds) { for (const ugId of validGroupIds) {
db.prepare('INSERT OR IGNORE INTO multi_group_dm_members (multi_group_dm_id, user_group_id) VALUES (?, ?)').run(mgId, ugId); db.prepare('INSERT OR IGNORE INTO multi_group_dm_members (multi_group_dm_id, user_group_id) VALUES (?, ?)').run(mgId, ugId);
const uids = getUserIdsForGroup(db, ugId); for (const uid of getUserIdsForGroup(db, ugId)) {
for (const uid of uids) { if (!addedUsers.has(uid)) { addedUsers.add(uid); addUserSilent(db, dmGroupId, uid); }
if (!addedUsers.has(uid)) {
addedUsers.add(uid);
addUserToDmGroupSilent(db, dmGroupId, uid);
}
} }
} }
const dm = db.prepare('SELECT * FROM multi_group_dms WHERE id = ?').get(mgId); const dm = db.prepare('SELECT * FROM multi_group_dms WHERE id = ?').get(mgId);
dm.memberGroupIds = validGroupIds; dm.memberGroupIds = validGroupIds;
dm.group_count = validGroupIds.length;
res.json({ dm }); res.json({ dm });
}); });
@@ -117,33 +101,27 @@ router.patch('/multigroup/:id', authMiddleware, adminMiddleware, (req, res) => {
return res.status(400).json({ error: 'Name already in use' }); return res.status(400).json({ error: 'Name already in use' });
} }
db.prepare("UPDATE multi_group_dms SET name = ?, updated_at = datetime('now') WHERE id = ?").run(name.trim(), mg.id); db.prepare("UPDATE multi_group_dms SET name = ?, updated_at = datetime('now') WHERE id = ?").run(name.trim(), mg.id);
if (mg.dm_group_id) { if (mg.dm_group_id) db.prepare("UPDATE groups SET name = ?, updated_at = datetime('now') WHERE id = ?").run(name.trim(), mg.dm_group_id);
db.prepare("UPDATE groups SET name = ?, updated_at = datetime('now') WHERE id = ?").run(name.trim(), mg.dm_group_id);
}
} }
if (Array.isArray(userGroupIds) && mg.dm_group_id) { if (Array.isArray(userGroupIds) && mg.dm_group_id) {
const newGroupIds = new Set(userGroupIds.map(Number).filter(Boolean)); const newGroupIds = new Set(userGroupIds.map(Number).filter(Boolean));
const currentGroupIds = new Set(db.prepare('SELECT user_group_id FROM multi_group_dm_members WHERE multi_group_dm_id = ?').all(mg.id).map(r => r.user_group_id)); const currentGroupIds = new Set(db.prepare('SELECT user_group_id FROM multi_group_dm_members WHERE multi_group_dm_id = ?').all(mg.id).map(r => r.user_group_id));
// Add new user groups
for (const ugId of newGroupIds) { for (const ugId of newGroupIds) {
if (!currentGroupIds.has(ugId)) { if (!currentGroupIds.has(ugId)) {
db.prepare("INSERT OR IGNORE INTO multi_group_dm_members (multi_group_dm_id, user_group_id) VALUES (?, ?)").run(mg.id, ugId); db.prepare("INSERT OR IGNORE INTO multi_group_dm_members (multi_group_dm_id, user_group_id) VALUES (?, ?)").run(mg.id, ugId);
const uids = getUserIdsForGroup(db, ugId); for (const uid of getUserIdsForGroup(db, ugId)) addUser(db, mg.dm_group_id, uid, req.user.id);
for (const uid of uids) addUserToDmGroup(db, mg.dm_group_id, uid, req.user.id);
const ug = db.prepare('SELECT name FROM user_groups WHERE id = ?').get(ugId); const ug = db.prepare('SELECT name FROM user_groups WHERE id = ?').get(ugId);
if (ug) postSysMsg(db, mg.dm_group_id, req.user.id, `Group "${ug.name}" has been added to this conversation.`); if (ug) postSysMsg(db, mg.dm_group_id, req.user.id, `Group "${ug.name}" has been added to this conversation.`);
} }
} }
// Remove dropped user groups
for (const ugId of currentGroupIds) { for (const ugId of currentGroupIds) {
if (!newGroupIds.has(ugId)) { if (!newGroupIds.has(ugId)) {
db.prepare('DELETE FROM multi_group_dm_members WHERE multi_group_dm_id = ? AND user_group_id = ?').run(mg.id, ugId); db.prepare('DELETE FROM multi_group_dm_members WHERE multi_group_dm_id = ? AND user_group_id = ?').run(mg.id, ugId);
const uids = getUserIdsForGroup(db, ugId); for (const uid of getUserIdsForGroup(db, ugId)) {
for (const uid of uids) { const stillIn = db.prepare('SELECT 1 FROM multi_group_dm_members mgdm JOIN user_group_members ugm ON ugm.user_group_id = mgdm.user_group_id WHERE mgdm.multi_group_dm_id = ? AND ugm.user_id = ?').get(mg.id, uid);
const stillInOtherGroup = db.prepare('SELECT 1 FROM multi_group_dm_members mgdm JOIN user_group_members ugm ON ugm.user_group_id = mgdm.user_group_id WHERE mgdm.multi_group_dm_id = ? AND ugm.user_id = ?').get(mg.id, uid); if (!stillIn) removeUser(db, mg.dm_group_id, uid, req.user.id);
if (!stillInOtherGroup) removeUserFromDmGroup(db, mg.dm_group_id, uid, req.user.id);
} }
const ug = db.prepare('SELECT name FROM user_groups WHERE id = ?').get(ugId); const ug = db.prepare('SELECT name FROM user_groups WHERE id = ?').get(ugId);
if (ug) postSysMsg(db, mg.dm_group_id, req.user.id, `Group "${ug.name}" has been removed from this conversation.`); if (ug) postSysMsg(db, mg.dm_group_id, req.user.id, `Group "${ug.name}" has been removed from this conversation.`);
@@ -153,6 +131,7 @@ router.patch('/multigroup/:id', authMiddleware, adminMiddleware, (req, res) => {
const updated = db.prepare('SELECT * FROM multi_group_dms WHERE id = ?').get(req.params.id); const updated = db.prepare('SELECT * FROM multi_group_dms WHERE id = ?').get(req.params.id);
updated.memberGroupIds = db.prepare('SELECT user_group_id FROM multi_group_dm_members WHERE multi_group_dm_id = ?').all(mg.id).map(r => r.user_group_id); updated.memberGroupIds = db.prepare('SELECT user_group_id FROM multi_group_dm_members WHERE multi_group_dm_id = ?').all(mg.id).map(r => r.user_group_id);
updated.group_count = updated.memberGroupIds.length;
res.json({ dm: updated }); res.json({ dm: updated });
}); });
@@ -169,8 +148,17 @@ router.delete('/multigroup/:id', authMiddleware, adminMiddleware, (req, res) =>
res.json({ success: true }); res.json({ success: true });
}); });
return router; // ── USER GROUPS ───────────────────────────────────────────────────────────────
};
router.get('/', authMiddleware, adminMiddleware, (req, res) => {
const db = getDb();
const groups = db.prepare(`
SELECT ug.*,
(SELECT COUNT(*) FROM user_group_members WHERE user_group_id = ug.id) as member_count
FROM user_groups ug ORDER BY ug.name ASC
`).all();
res.json({ groups });
});
router.get('/:id', authMiddleware, adminMiddleware, (req, res) => { router.get('/:id', authMiddleware, adminMiddleware, (req, res) => {
const db = getDb(); const db = getDb();
@@ -192,18 +180,14 @@ router.post('/', authMiddleware, adminMiddleware, (req, res) => {
return res.status(400).json({ error: 'A group with that name already exists' }); return res.status(400).json({ error: 'A group with that name already exists' });
} }
const admin = db.prepare('SELECT id FROM users WHERE is_default_admin = 1').get(); const admin = db.prepare('SELECT id FROM users WHERE is_default_admin = 1').get();
const dmResult = db.prepare(` const dmResult = db.prepare(`INSERT INTO groups (name, type, owner_id, is_readonly, is_direct, is_managed) VALUES (?, 'private', ?, 0, 0, 1)`).run(name.trim(), admin?.id || req.user.id);
INSERT INTO groups (name, type, owner_id, is_readonly, is_direct, is_managed)
VALUES (?, 'private', ?, 0, 0, 1)
`).run(name.trim(), admin?.id || req.user.id);
const dmGroupId = dmResult.lastInsertRowid; const dmGroupId = dmResult.lastInsertRowid;
const ugResult = db.prepare(`INSERT INTO user_groups (name, dm_group_id) VALUES (?, ?)`).run(name.trim(), dmGroupId); const ugResult = db.prepare(`INSERT INTO user_groups (name, dm_group_id) VALUES (?, ?)`).run(name.trim(), dmGroupId);
const ugId = ugResult.lastInsertRowid; const ugId = ugResult.lastInsertRowid;
const validIds = Array.isArray(memberIds) ? memberIds.map(Number).filter(Boolean) : []; for (const uid of (Array.isArray(memberIds) ? memberIds.map(Number).filter(Boolean) : [])) {
for (const uid of validIds) {
db.prepare("INSERT OR IGNORE INTO user_group_members (user_group_id, user_id) VALUES (?, ?)").run(ugId, uid); db.prepare("INSERT OR IGNORE INTO user_group_members (user_group_id, user_id) VALUES (?, ?)").run(ugId, uid);
addUserToDmGroupSilent(db, dmGroupId, uid); addUserSilent(db, dmGroupId, uid);
} }
const group = db.prepare('SELECT * FROM user_groups WHERE id = ?').get(ugId); const group = db.prepare('SELECT * FROM user_groups WHERE id = ?').get(ugId);
res.json({ group }); res.json({ group });
@@ -220,43 +204,34 @@ router.patch('/:id', authMiddleware, adminMiddleware, (req, res) => {
return res.status(400).json({ error: 'Name already in use' }); return res.status(400).json({ error: 'Name already in use' });
} }
db.prepare("UPDATE user_groups SET name = ?, updated_at = datetime('now') WHERE id = ?").run(name.trim(), ug.id); db.prepare("UPDATE user_groups SET name = ?, updated_at = datetime('now') WHERE id = ?").run(name.trim(), ug.id);
if (ug.dm_group_id) { if (ug.dm_group_id) db.prepare("UPDATE groups SET name = ?, updated_at = datetime('now') WHERE id = ?").run(name.trim(), ug.dm_group_id);
db.prepare("UPDATE groups SET name = ?, updated_at = datetime('now') WHERE id = ?").run(name.trim(), ug.dm_group_id);
}
} }
if (Array.isArray(memberIds) && ug.dm_group_id) { if (Array.isArray(memberIds) && ug.dm_group_id) {
const newIds = new Set(memberIds.map(Number).filter(Boolean)); const newIds = new Set(memberIds.map(Number).filter(Boolean));
const current = db.prepare('SELECT user_id FROM user_group_members WHERE user_group_id = ?').all(ug.id).map(r => r.user_id); const currentSet = new Set(db.prepare('SELECT user_id FROM user_group_members WHERE user_group_id = ?').all(ug.id).map(r => r.user_id));
const currentSet = new Set(current);
for (const uid of newIds) { for (const uid of newIds) {
if (!currentSet.has(uid)) { if (!currentSet.has(uid)) {
db.prepare("INSERT OR IGNORE INTO user_group_members (user_group_id, user_id) VALUES (?, ?)").run(ug.id, uid); db.prepare("INSERT OR IGNORE INTO user_group_members (user_group_id, user_id) VALUES (?, ?)").run(ug.id, uid);
addUserToDmGroup(db, ug.dm_group_id, uid, req.user.id); addUser(db, ug.dm_group_id, uid, req.user.id);
// Also add to any multi-group DMs that include this user group // Also add to multi-group DMs that include this user group
const mgDms = db.prepare('SELECT mgd.dm_group_id FROM multi_group_dm_members mgdm JOIN multi_group_dms mgd ON mgd.id = mgdm.multi_group_dm_id WHERE mgdm.user_group_id = ?').all(ug.id); for (const mg of db.prepare('SELECT mgd.dm_group_id FROM multi_group_dm_members mgdm JOIN multi_group_dms mgd ON mgd.id = mgdm.multi_group_dm_id WHERE mgdm.user_group_id = ?').all(ug.id)) {
for (const mg of mgDms) { if (mg.dm_group_id) addUser(db, mg.dm_group_id, uid, req.user.id);
if (mg.dm_group_id) addUserToDmGroup(db, mg.dm_group_id, uid, req.user.id);
} }
} }
} }
for (const uid of currentSet) { for (const uid of currentSet) {
if (!newIds.has(uid)) { if (!newIds.has(uid)) {
db.prepare('DELETE FROM user_group_members WHERE user_group_id = ? AND user_id = ?').run(ug.id, uid); db.prepare('DELETE FROM user_group_members WHERE user_group_id = ? AND user_id = ?').run(ug.id, uid);
// Only remove from DM group if user isn't in another user group that also has access // Only remove if not in another user group with access to the same DM
const otherUgMemberships = db.prepare(` const stillHasAccess = db.prepare(`SELECT 1 FROM user_group_members ugm WHERE ugm.user_id = ? AND ugm.user_group_id != ? AND EXISTS (SELECT 1 FROM group_members gm WHERE gm.group_id = ? AND gm.user_id = ?)`).get(uid, ug.id, ug.dm_group_id, uid);
SELECT ugm.user_group_id FROM user_group_members ugm if (!stillHasAccess) {
WHERE ugm.user_id = ? AND ugm.user_group_id != ? removeUser(db, ug.dm_group_id, uid, req.user.id);
AND EXISTS (SELECT 1 FROM group_members gm WHERE gm.group_id = ? AND gm.user_id = ?) for (const mg of db.prepare('SELECT mgd.dm_group_id FROM multi_group_dm_members mgdm JOIN multi_group_dms mgd ON mgd.id = mgdm.multi_group_dm_id WHERE mgdm.user_group_id = ?').all(ug.id)) {
`).all(uid, ug.id, ug.dm_group_id, uid);
if (otherUgMemberships.length === 0) {
removeUserFromDmGroup(db, ug.dm_group_id, uid, req.user.id);
// Remove from multi-group DMs they got access through this group
const mgDms = db.prepare('SELECT mgd.dm_group_id FROM multi_group_dm_members mgdm JOIN multi_group_dms mgd ON mgd.id = mgdm.multi_group_dm_id WHERE mgdm.user_group_id = ?').all(ug.id);
for (const mg of mgDms) {
if (mg.dm_group_id) { if (mg.dm_group_id) {
const stillMember = db.prepare('SELECT 1 FROM group_members WHERE group_id = ? AND user_id = ?').get(mg.dm_group_id, uid); const stillInMg = db.prepare('SELECT 1 FROM multi_group_dm_members mgdm JOIN user_group_members ugm ON ugm.user_group_id = mgdm.user_group_id WHERE mgdm.multi_group_dm_id = (SELECT id FROM multi_group_dms WHERE dm_group_id = ?) AND ugm.user_id = ?').get(mg.dm_group_id, uid);
if (stillMember) removeUserFromDmGroup(db, mg.dm_group_id, uid, req.user.id); if (!stillInMg) removeUser(db, mg.dm_group_id, uid, req.user.id);
} }
} }
} }
@@ -281,3 +256,5 @@ router.delete('/:id', authMiddleware, adminMiddleware, (req, res) => {
res.json({ success: true }); res.json({ success: true });
}); });
return router;
};

2
build.sh
View File

@@ -13,7 +13,7 @@
# ───────────────────────────────────────────────────────────── # ─────────────────────────────────────────────────────────────
set -euo pipefail set -euo pipefail
VERSION="${1:-0.9.29}" VERSION="${1:-0.9.30}"
ACTION="${2:-}" ACTION="${2:-}"
REGISTRY="${REGISTRY:-}" REGISTRY="${REGISTRY:-}"
IMAGE_NAME="jama" IMAGE_NAME="jama"

2
frontend/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "jama-frontend", "name": "jama-frontend",
"version": "0.9.29", "version": "0.9.30",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",