v0.12.43 minor protection added

backend/src/routes/groups.js

@@ -4,6 +4,11 @@ const router  = express.Router();
 const { query, queryOne, queryResult, exec } = require('../models/db');
 const { authMiddleware, adminMiddleware } = require('../middleware/auth');
 
+async function getLoginType(schema) {
+  const row = await queryOne(schema, "SELECT value FROM settings WHERE key='feature_login_type'");
+  return row?.value || 'all_ages';
+}
+
 function deleteImageFile(imageUrl) {
   if (!imageUrl) return;
   try { const fp = '/app' + imageUrl; if (fs.existsSync(fp)) fs.unlinkSync(fp); }
@@ -67,7 +72,7 @@ router.get('/', authMiddleware, async (req, res) => {
     `);
 
     const privateGroupsRaw = await query(req.schema, `
-      SELECT g.*, u.name AS owner_name,
+      SELECT g.*, u.name AS owner_name, ug.id AS source_user_group_id,
         (SELECT COUNT(*) FROM messages m WHERE m.group_id=g.id AND m.is_deleted=FALSE) AS message_count,
         (SELECT m.content  FROM messages m WHERE m.group_id=g.id AND m.is_deleted=FALSE ORDER BY m.created_at DESC LIMIT 1) AS last_message,
         (SELECT m.created_at FROM messages m WHERE m.group_id=g.id AND m.is_deleted=FALSE ORDER BY m.created_at DESC LIMIT 1) AS last_message_at,
@@ -80,7 +85,9 @@ router.get('/', authMiddleware, async (req, res) => {
           ORDER BY u2.name LIMIT 4
         ) t) AS member_previews
       FROM groups g JOIN group_members gm ON g.id=gm.group_id AND gm.user_id=$1
-      LEFT JOIN users u ON g.owner_id=u.id WHERE g.type='private'
+      LEFT JOIN users u ON g.owner_id=u.id
+      LEFT JOIN user_groups ug ON ug.dm_group_id=g.id AND g.is_managed=TRUE AND g.is_multi_group IS NOT TRUE
+      WHERE g.type='private'
       ORDER BY last_message_at DESC NULLS LAST
     `, [userId]);
 
@@ -182,8 +189,30 @@ router.post('/', authMiddleware, async (req, res) => {
       const groupId = r.rows[0].id;
       await exec(req.schema, 'INSERT INTO group_members (group_id,user_id) VALUES ($1,$2) ON CONFLICT DO NOTHING', [groupId, userId]);
       await exec(req.schema, 'INSERT INTO group_members (group_id,user_id) VALUES ($1,$2) ON CONFLICT DO NOTHING', [groupId, otherUserId]);
+
+      // Mixed Age: if the other user is a minor, auto-add their guardian
+      let guardianAdded = false, guardianName = null;
+      const loginType = await getLoginType(req.schema);
+      if (loginType === 'mixed_age') {
+        const otherUserFull = await queryOne(req.schema,
+          'SELECT is_minor, guardian_user_id FROM users WHERE id=$1', [otherUserId]);
+        if (otherUserFull?.is_minor && otherUserFull.guardian_user_id) {
+          const guardianId = otherUserFull.guardian_user_id;
+          if (guardianId !== userId) {
+            await exec(req.schema,
+              'INSERT INTO group_members (group_id,user_id) VALUES ($1,$2) ON CONFLICT DO NOTHING',
+              [groupId, guardianId]);
+            const guardian = await queryOne(req.schema,
+              'SELECT name, display_name FROM users WHERE id=$1', [guardianId]);
+            guardianAdded = true;
+            guardianName = guardian?.display_name || guardian?.name || null;
+          }
+        }
+      }
+
       await emitGroupNew(req.schema, io, groupId);
-      return res.json({ group: await queryOne(req.schema, 'SELECT * FROM groups WHERE id=$1', [groupId]) });
+      const group = await queryOne(req.schema, 'SELECT * FROM groups WHERE id=$1', [groupId]);
+      return res.json({ group, guardianAdded, guardianName });
     }
 
     // Check for duplicate private group