普通用户也支持新建群聊

server/routes/rooms.js

@@ -15,7 +15,7 @@ router.get('/', authMiddleware, (req, res) => {
   if (isAdmin) {
     rooms = db.prepare('SELECT * FROM rooms').all();
   } else {
-    rooms = db.prepare("SELECT * FROM rooms WHERE white_list = '' OR (',' || white_list || ',' LIKE ?)").all(`%,${username},%`);
+    rooms = db.prepare("SELECT * FROM rooms WHERE white_list = '' OR (',' || white_list || ',' LIKE ?)").all('%,' + username + ',%');
   }
   const result = rooms.map(room => {
     const lastMsg = db.prepare('SELECT text, timestamp FROM messages WHERE room_id = ? ORDER BY id DESC LIMIT 1').get(room.id);
@@ -24,22 +24,28 @@ router.get('/', authMiddleware, (req, res) => {
   res.json(result);
 });
 
-router.post('/', authMiddleware, adminOnly, (req, res) => {
+// 普通用户可新建，白名单自动设为用户名
+router.post('/', authMiddleware, (req, res) => {
   const { name, whiteList } = req.body;
+  const isAdmin = req.user.isAdmin;
+  const finalWhiteList = isAdmin ? (whiteList || '') : req.user.username;
   const id = uuidv4();
   const now = timestamp();
-  db.prepare('INSERT INTO rooms (id, name, created_by, white_list, created_at) VALUES (?,?,?,?,?)').run(id, name, req.user.username, whiteList || '', now);
-  broadcast({ type: 'room_created', room: { id, name, white_list: whiteList || '' } });
+  db.prepare('INSERT INTO rooms (id, name, created_by, white_list, created_at) VALUES (?,?,?,?,?)').run(id, name, req.user.username, finalWhiteList, now);
+  broadcast({ type: 'room_created', room: { id, name, white_list: finalWhiteList } });
   res.json({ id, name });
 });
 
-router.put('/:roomId', authMiddleware, adminOnly, (req, res) => {
+// 普通用户可编辑名称，白名单不变
+router.put('/:roomId', authMiddleware, (req, res) => {
   const { name, whiteList } = req.body;
   const roomId = req.params.roomId;
+  const isAdmin = req.user.isAdmin;
   const room = db.prepare('SELECT * FROM rooms WHERE id = ?').get(roomId);
   if (!room) return res.status(404).json({ error: '群聊不存在' });
-  db.prepare('UPDATE rooms SET name = ?, white_list = ? WHERE id = ?').run(name, whiteList || '', roomId);
-  broadcast({ type: 'room_updated', room: { id: roomId, name, white_list: whiteList || '' } });
+  const finalWhiteList = isAdmin ? (whiteList !== undefined ? whiteList : room.white_list) : room.white_list;
+  db.prepare('UPDATE rooms SET name = ?, white_list = ? WHERE id = ?').run(name, finalWhiteList, roomId);
+  broadcast({ type: 'room_updated', room: { id: roomId, name, white_list: finalWhiteList } });
   res.json({ success: true });
 });