diff --git a/.env.example b/.env.example index 3f6ac1d..db8fcbb 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.10 +JAMA_VERSION=0.9.11 # App port — the host port Docker maps to the container PORT=3000 diff --git a/backend/package.json b/backend/package.json index a20e1c0..c631dc1 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "jama-backend", - "version": "0.9.10", + "version": "0.9.11", "description": "TeamChat backend server", "main": "src/index.js", "scripts": { diff --git a/backend/src/routes/messages.js b/backend/src/routes/messages.js index eff426a..d8f90f7 100644 --- a/backend/src/routes/messages.js +++ b/backend/src/routes/messages.js @@ -151,6 +151,7 @@ router.delete('/:id', authMiddleware, (req, res) => { if (!canDelete) return res.status(403).json({ error: 'Cannot delete this message' }); db.prepare("UPDATE messages SET is_deleted = 1, content = null, image_url = null WHERE id = ?").run(message.id); + io.to(`group:${message.group_id}`).emit('message:deleted', { messageId: message.id, groupId: message.group_id }); res.json({ success: true, messageId: message.id }); }); @@ -169,11 +170,17 @@ router.post('/:id/reactions', authMiddleware, (req, res) => { if (existing) { db.prepare('DELETE FROM reactions WHERE id = ?').run(existing.id); - res.json({ removed: true, emoji }); } else { db.prepare('INSERT INTO reactions (message_id, user_id, emoji) VALUES (?, ?, ?)').run(message.id, req.user.id, emoji); - res.json({ added: true, emoji }); } + + const reactions = db.prepare(` + SELECT r.emoji, r.user_id, u.name as user_name + FROM reactions r JOIN users u ON r.user_id = u.id + WHERE r.message_id = ? + `).all(message.id); + io.to(`group:${message.group_id}`).emit('reaction:updated', { messageId: message.id, reactions }); + res.json({ reactions }); }); diff --git a/build.sh b/build.sh index 9e684e2..f18c9c0 100644 --- a/build.sh +++ b/build.sh @@ -13,7 +13,7 @@ # ───────────────────────────────────────────────────────────── set -euo pipefail -VERSION="${1:-0.9.10}" +VERSION="${1:-0.9.11}" ACTION="${2:-}" REGISTRY="${REGISTRY:-}" IMAGE_NAME="jama" diff --git a/frontend/package.json b/frontend/package.json index c998911..24ff3a1 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "jama-frontend", - "version": "0.9.10", + "version": "0.9.11", "private": true, "scripts": { "dev": "vite",