diff --git a/.env.example b/.env.example index fd1e2ea..25c0cc1 100644 --- a/.env.example +++ b/.env.example @@ -10,7 +10,7 @@ PROJECT_NAME=jama # Image version to run (set by build.sh, or use 'latest') -JAMA_VERSION=0.9.32 +JAMA_VERSION=0.9.33 # App port — the host port Docker maps to the container PORT=3000 diff --git a/backend/package.json b/backend/package.json index edaba44..27f98bf 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "jama-backend", - "version": "0.9.32", + "version": "0.9.33", "description": "TeamChat backend server", "main": "src/index.js", "scripts": { diff --git a/backend/src/models/db.js b/backend/src/models/db.js index 0262491..0d6ce0f 100644 --- a/backend/src/models/db.js +++ b/backend/src/models/db.js @@ -311,6 +311,12 @@ function initDb() { console.log('[DB] Migration: added is_managed column to groups'); } catch (e) { /* already exists */ } + // Migration: is_multi_group flag — distinguishes multi-group DMs from user-group DMs + try { + db.exec("ALTER TABLE groups ADD COLUMN is_multi_group INTEGER NOT NULL DEFAULT 0"); + console.log('[DB] Migration: added is_multi_group column to groups'); + } catch (e) { /* already exists */ } + // Migration: user_groups and user_group_members tables try { db.exec(` diff --git a/backend/src/routes/groups.js b/backend/src/routes/groups.js index a6332e3..672766d 100644 --- a/backend/src/routes/groups.js +++ b/backend/src/routes/groups.js @@ -383,6 +383,8 @@ router.delete('/:id/leave', authMiddleware, (req, res) => { // Admin take ownership router.post('/:id/take-ownership', authMiddleware, adminMiddleware, (req, res) => { const db = getDb(); + const group = db.prepare('SELECT * FROM groups WHERE id = ?').get(req.params.id); + if (group?.is_managed) return res.status(403).json({ error: 'Managed groups are administered via the Group Manager.' }); db.prepare("UPDATE groups SET owner_id = ?, updated_at = datetime('now') WHERE id = ?").run(req.user.id, req.params.id); db.prepare('INSERT OR IGNORE INTO group_members (group_id, user_id) VALUES (?, ?)').run(req.params.id, req.user.id); res.json({ success: true }); diff --git a/backend/src/routes/usergroups.js b/backend/src/routes/usergroups.js index 4655c71..62d0ece 100644 --- a/backend/src/routes/usergroups.js +++ b/backend/src/routes/usergroups.js @@ -231,32 +231,44 @@ router.patch('/:id', authMiddleware, adminMiddleware, (req, res) => { const newIds = new Set(memberIds.map(Number).filter(Boolean)); 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 addedUids = []; + const removedUids = []; + for (const uid of newIds) { if (!currentSet.has(uid)) { db.prepare("INSERT OR IGNORE INTO user_group_members (user_group_id, user_id) VALUES (?, ?)").run(ug.id, uid); + // Add to UG DM with individual notification addUser(db, ug.dm_group_id, uid, req.user.id); - // Also add to multi-group DMs that include this user group - 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)) { - if (mg.dm_group_id) addUser(db, mg.dm_group_id, uid, req.user.id); - } + addedUids.push(uid); } } for (const uid of currentSet) { if (!newIds.has(uid)) { db.prepare('DELETE FROM user_group_members WHERE user_group_id = ? AND user_id = ?').run(ug.id, uid); - // Only remove if not in another user group with access to the same DM 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); if (!stillHasAccess) { removeUser(db, ug.dm_group_id, uid, req.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)) { - if (mg.dm_group_id) { - 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 (!stillInMg) removeUser(db, mg.dm_group_id, uid, req.user.id); - } - } + removedUids.push(uid); } } } + + // For multi-group DMs: add/remove users silently, post group-level notification once + const mgDms = db.prepare('SELECT mgd.id, 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) continue; + for (const uid of addedUids) addUserSilent(db, mg.dm_group_id, uid); + for (const uid of removedUids) { + 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 = ? AND ugm.user_id = ?').get(mg.id, uid); + if (!stillInMg) { + db.prepare('DELETE FROM group_members WHERE group_id = ? AND user_id = ?').run(mg.dm_group_id, uid); + io.in(`user:${uid}`).socketsLeave(`group:${mg.dm_group_id}`); + io.to(`user:${uid}`).emit('group:deleted', { groupId: mg.dm_group_id }); + } + } + if (addedUids.length > 0) postSysMsg(db, mg.dm_group_id, req.user.id, `Members were added to group "${ug.name}" and have joined this conversation.`); + if (removedUids.length > 0) postSysMsg(db, mg.dm_group_id, req.user.id, `Members were removed from group "${ug.name}" and have left this conversation.`); + } } const updated = db.prepare('SELECT * FROM user_groups WHERE id = ?').get(req.params.id); diff --git a/build.sh b/build.sh index 118d61b..dde1224 100644 --- a/build.sh +++ b/build.sh @@ -13,7 +13,7 @@ # ───────────────────────────────────────────────────────────── set -euo pipefail -VERSION="${1:-0.9.32}" +VERSION="${1:-0.9.33}" ACTION="${2:-}" REGISTRY="${REGISTRY:-}" IMAGE_NAME="jama" diff --git a/frontend/package.json b/frontend/package.json index 4e9019c..a63222c 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "jama-frontend", - "version": "0.9.32", + "version": "0.9.33", "private": true, "scripts": { "dev": "vite", diff --git a/frontend/src/components/ChatWindow.jsx b/frontend/src/components/ChatWindow.jsx index d816467..f49373b 100644 --- a/frontend/src/components/ChatWindow.jsx +++ b/frontend/src/components/ChatWindow.jsx @@ -225,11 +225,15 @@ export default function ChatWindow({ group, onBack, onGroupUpdated, onDirectMess )} - {isDirect && group.peer_avatar ? ( + {isDirect && group.peer_avatar && !group.is_managed ? (
{group.name} {isOnline && }
+ ) : group.is_managed ? ( +
+ {group.is_multi_group ? 'MG' : 'UG'} +
) : (
{group.type === 'public' ? '#' : isDirect ? (group.peer_real_name || group.name)[0]?.toUpperCase() : group.name[0]?.toUpperCase()} diff --git a/frontend/src/components/NavDrawer.jsx b/frontend/src/components/NavDrawer.jsx index 3e373ec..a1ccfd9 100644 --- a/frontend/src/components/NavDrawer.jsx +++ b/frontend/src/components/NavDrawer.jsx @@ -66,7 +66,7 @@ export default function NavDrawer({ open, onClose, onMessages, onGroupManager, o
{item(NAV_ICON.messages, 'Messages', onMessages)} - {!isMobile && item(NAV_ICON.schedules, 'Schedules', () => {}, true)} + {item(NAV_ICON.schedules, 'Schedules', () => {}, true)} {isAdmin && ( <> diff --git a/frontend/src/components/Sidebar.jsx b/frontend/src/components/Sidebar.jsx index 70844b3..fbf269f 100644 --- a/frontend/src/components/Sidebar.jsx +++ b/frontend/src/components/Sidebar.jsx @@ -109,8 +109,10 @@ export default function Sidebar({ groups, activeGroupId, onSelectGroup, notifica
{group.is_direct && group.peer_avatar && !group.is_managed ? ( {group.name} - ) : group.is_managed ? ( + ) : group.is_managed && group.is_multi_group ? (
MG
+ ) : group.is_managed ? ( +
UG
) : (
{group.type === 'public' ? '#' : group.is_direct ? (group.peer_real_name || group.name)[0]?.toUpperCase() : group.name[0]?.toUpperCase()}