From 4a4adb161864d1d774828fc85aa5f48d08357abf Mon Sep 17 00:00:00 2001 From: moonrailgun Date: Sat, 5 Oct 2024 12:58:05 +0800 Subject: [PATCH] refactor(admin): only show chat image feature will exclude group avatar and background --- server/.env.example | 1 + server/admin/src/server/router/api.ts | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/server/.env.example b/server/.env.example index a6ff3f5a..96966a09 100644 --- a/server/.env.example +++ b/server/.env.example @@ -27,6 +27,7 @@ SMTP_URI= TAILCHAT_MEETING_URL= # Admin 后台密码 +ADMIN_USER=tailchat ADMIN_PASS=com.msgbyte.tailchat # GETUI Push diff --git a/server/admin/src/server/router/api.ts b/server/admin/src/server/router/api.ts index bbc2a3ae..21a6494b 100644 --- a/server/admin/src/server/router/api.ts +++ b/server/admin/src/server/router/api.ts @@ -42,7 +42,7 @@ router.post('/login', (req, res) => { } ); - res.json({ + res.status(200).json({ username, token: token, expiredAt: new Date().valueOf() + 2 * 60 * 60 * 1000, @@ -312,11 +312,27 @@ router.use( foreignField: 'avatar', as: 'avatarMatchedUser', }) + .lookup({ + from: 'groups', + localField: 'url', + foreignField: 'avatar', + as: 'avatarMatchedGroup', + }) + .lookup({ + from: 'groups', + localField: 'url', + foreignField: 'config.groupBackgroundImage', + as: 'backgroundMatchedGroup', + }) .match({ 'avatarMatchedUser.0': { $exists: false }, + 'avatarMatchedGroup.0': { $exists: false }, + 'backgroundMatchedGroup.0': { $exists: false }, }) .project({ avatarMatchedUser: 0, + avatarMatchedGroup: 0, + backgroundMatchedGroup: 0, }) .facet({ metadata: [{ $count: 'total' }],