refactor: 调整机器人头像

3 years ago · 2df1380a45
parent 4f84e99cba
commit 2df1380a45
8 changed files with 65 additions and 16 deletions
--- a/client/web/assets/images/avatar/github-color.webp
+++ b/client/web/assets/images/avatar/github-color.webp
--- a/client/web/assets/images/avatar/github-dark.svg
+++ b/client/web/assets/images/avatar/github-dark.svg
@ -0,0 +1,12 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_604_8)">
+<rect width="512" height="512" fill="white"/>
+<rect width="512" height="512" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M255.5 0C114.336 0 0 117.458 0 262.475C0 378.62 73.1369 476.721 174.698 511.499C187.473 513.795 192.264 505.921 192.264 499.031C192.264 492.797 191.944 472.127 191.944 450.145C127.75 462.284 111.142 434.068 106.032 419.304C103.158 411.758 90.7025 388.463 79.8437 382.23C70.9012 377.308 58.1262 365.169 79.5244 364.841C99.645 364.512 114.017 383.87 118.807 391.744C141.802 431.444 178.531 420.288 193.222 413.398C195.457 396.338 202.164 384.854 209.51 378.292C152.661 371.731 93.2575 349.092 93.2575 248.695C93.2575 220.151 103.158 196.528 119.446 178.155C116.891 171.593 107.949 144.689 122.001 108.599C122.001 108.599 143.399 101.709 192.264 135.503C212.704 129.597 234.421 126.644 256.139 126.644C277.856 126.644 299.574 129.597 320.014 135.503C368.878 101.381 390.276 108.599 390.276 108.599C404.329 144.689 395.386 171.593 392.831 178.155C409.119 196.528 419.02 219.823 419.02 248.695C419.02 349.42 359.297 371.731 302.448 378.292C311.71 386.495 319.694 402.243 319.694 426.85C319.694 461.956 319.375 490.172 319.375 499.031C319.375 505.921 324.166 514.123 336.941 511.499C387.661 493.907 431.735 460.418 462.959 415.747C494.183 371.075 510.985 317.47 511 262.475C511 117.458 396.664 0 255.5 0Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_604_8">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
--- a/client/web/assets/images/avatar/github.svg
+++ b/client/web/assets/images/avatar/github.svg
@ -0,0 +1,12 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_604_2)">
+<rect width="512" height="512" fill="white"/>
+<rect width="512" height="512" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M256.5 0C115.336 0 1 117.458 1 262.475C1 378.62 74.1369 476.721 175.698 511.499C188.473 513.795 193.264 505.921 193.264 499.031C193.264 492.797 192.944 472.127 192.944 450.145C128.75 462.284 112.142 434.068 107.032 419.304C104.158 411.758 91.7025 388.463 80.8437 382.23C71.9012 377.308 59.1262 365.169 80.5244 364.841C100.645 364.512 115.017 383.87 119.807 391.744C142.802 431.444 179.531 420.288 194.222 413.398C196.457 396.338 203.164 384.854 210.51 378.292C153.661 371.731 94.2575 349.092 94.2575 248.695C94.2575 220.151 104.158 196.528 120.446 178.155C117.891 171.593 108.949 144.689 123.001 108.599C123.001 108.599 144.399 101.709 193.264 135.503C213.704 129.597 235.421 126.644 257.139 126.644C278.856 126.644 300.574 129.597 321.014 135.503C369.878 101.381 391.276 108.599 391.276 108.599C405.329 144.689 396.386 171.593 393.831 178.155C410.119 196.528 420.02 219.823 420.02 248.695C420.02 349.42 360.297 371.731 303.448 378.292C312.71 386.495 320.694 402.243 320.694 426.85C320.694 461.956 320.375 490.172 320.375 499.031C320.375 505.921 325.166 514.123 337.941 511.499C388.661 493.907 432.735 460.418 463.959 415.747C495.183 371.075 511.985 317.47 512 262.475C512 117.458 397.664 0 256.5 0Z" fill="black"/>
+</g>
+<defs>
+<clipPath id="clip0_604_2">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
--- a/client/web/assets/images/avatar/robot.webp
+++ b/client/web/assets/images/avatar/robot.webp
--- a/client/web/build/webpack.config.ts
+++ b/client/web/build/webpack.config.ts
@ -83,6 +83,10 @@ const plugins: Configuration['plugins'] = [
        from: path.resolve(ROOT_PATH, './assets/images/logo/'),
        to: 'images/logo/',
      },
+      {
+        from: path.resolve(ROOT_PATH, './assets/images/avatar/'),
+        to: 'images/avatar/',
+      },
      {
        from: path.resolve(ROOT_PATH, '../../vercel.json'),
        to: 'vercel.json',
--- a/server/plugins/com.msgbyte.github/services/subscribe.service.ts
+++ b/server/plugins/com.msgbyte.github/services/subscribe.service.ts
@ -60,7 +60,7 @@ class GithubSubscribeService extends TcService {
        const botUserId = await this.broker.call('user.ensurePluginBot', {
          botId: 'github-bot',
          nickname: 'Github Bot',
-          avatar: 'https://api.iconify.design/akar-icons/github-fill.svg',
+          avatar: 'https://api.iconify.design/entypo-social/github.svg',
        });

        this.logger.info('Github Bot Id:', botUserId);
--- a/server/plugins/com.msgbyte.simplenotify/services/simplenotify.service.ts
+++ b/server/plugins/com.msgbyte.simplenotify/services/simplenotify.service.ts
@ -70,8 +70,7 @@ class SimpleNotifyService extends TcService {
        const botUserId = await this.broker.call('user.ensurePluginBot', {
          botId: 'simple-notify-bot',
          nickname: 'Notify Bot',
-          avatar:
-            'https://api.iconify.design/icon-park-outline/volume-notice.svg',
+          avatar: '/images/avatar/robot.webp',
        });

        this.logger.info('Simple Notify Bot Id:', botUserId);
--- a/server/services/core/user/user.service.ts
+++ b/server/services/core/user/user.service.ts
@ -602,24 +602,34 @@ class UserService extends TcService {

  async ensurePluginBot(
    ctx: TcContext<{
-      botId: 'string';
-      nickname: 'string';
-      avatar: { type: 'string'; optional: true };
+      botId: string;
+      nickname: string;
+      avatar: string;
    }>
  ): Promise<string> {
    const { botId, nickname, avatar } = ctx.params;
    const email = this.buildPluginBotEmail(botId);

-    const bot = await this.adapter.model.findOne(
-      {
-        email,
-      },
-      {
-        _id: 1,
-      }
-    );
+    const bot = await this.adapter.model.findOne({
+      email,
+    });

    if (bot) {
+      if (bot.nickname !== nickname || bot.avatar !== avatar) {
+        /**
+         * 如果信息不匹配，则更新
+         */
+        this.logger.info('检查到插件机器人信息不匹配, 更新机器人信息:', {
+          nickname,
+          avatar,
+        });
+        await bot.updateOne({
+          nickname,
+          avatar,
+        });
+        await this.cleanUserInfoCache(String(bot._id));
+      }
+
      return String(bot._id);
    }

@ -634,10 +644,22 @@ class UserService extends TcService {
    return String(newBot._id);
  }

+  /**
+   * 清理当前用户的缓存信息
+   */
  private async cleanCurrentUserCache(ctx: TcContext) {
    const { token, userId } = ctx.meta;
-    this.cleanActionCache('resolveToken', [token]);
-    this.cleanActionCache('getUserInfo', [userId]);
+    await Promise.all([
+      this.cleanActionCache('resolveToken', [token]),
+      this.cleanActionCache('getUserInfo', [userId]),
+    ]);
+  }
+
+  /**
+   * 根据用户ID清理缓存信息
+   */
+  private async cleanUserInfoCache(userId: string) {
+    await this.cleanActionCache('getUserInfo', [String(userId)]);
  }

  /**