Fix display of user remark

Author: xingrz

src/mods/user_remark.ts

@@ -1,12 +1,13 @@
 import { registerModule } from '@/module';
 import { onMounted } from '@/hooks';
-import { $, append, create, html } from '@/utils/dom';
+import { $, $H, append, create, html } from '@/utils/dom';
 
 interface IFeedUser {
   remark: string;
   screen_name: string;
   follow_me: boolean;
   following: boolean;
+  verified: boolean;
 }
 
 interface IFeedData {
@@ -21,39 +22,83 @@ registerModule({
   name: '优化用户备注显示',
   defaultEnabled: true,
   setup() {
+    // 信息流一级作者
     onMounted('Feed', (instance) => {
       const el = instance.vnode.el as HTMLElement | null;
       if (!el) return;
 
       const data = (instance.props as { data: IFeedData }).data;
       if (!data?.user) return;
 
-      const nick = $<HTMLElement>(el, '[class*="_nick_"]');
-      if (!nick || nick.querySelector('.awsl-remark')) return;
+      const ctx = $H<{
+        nick: HTMLElement;
+        name: HTMLElement;
+      }>(el, {
+        nick: '[class*="_nick_"]',
+        name: '[class*="_nick_"] > [class*="_name_"] > span',
+      });
+      if (!ctx || $(ctx.nick, '.awsl-remark')) return;
 
-      const nameLink = $<HTMLElement>(nick, 'a[class*="_name_"]');
-      const nameSpan = nameLink?.querySelector('span');
-
-      const info: string[] = [];
-      if (data.user.remark && nameSpan) {
-        html(nameSpan, data.user.screen_name);
-        info.push(`备注：${data.user.remark}`);
+      if (data.user.remark) {
+        html(ctx.name, data.user.screen_name);
       }
-      if (data.user.follow_me) {
-        info.push(data.user.following ? '互相关注' : '关注了我');
+
+      buildRemark(ctx.nick, data.user);
+    });
+
+    // 转发内容的原作者
+    onMounted('FeedContent', (instance) => {
+      const el = instance.vnode.el as HTMLElement | null;
+      if (!el || !el.classList.contains('retweet')) return;
+
+      const data = (instance.props as { data: IFeedData }).data;
+      if (!data?.user) return;
+
+      const ctx = $H<{
+        link: HTMLElement;
+        name: HTMLElement;
+      }>(el, {
+        link: '.wbpro-feed-reText [usercard]',
+        name: '.wbpro-feed-reText [usercard] > [class*="_nick_"]',
+      });
+      if (!ctx) return;
+
+      const container = ctx.link.parentElement!;
+      const verify = $(container, '[class*="_verify_"]');
+
+      if ($(container, '.awsl-remark')) return;
+
+      if (!data.user.verified && verify) {
+        verify.remove();
       }
 
-      if (info.length > 0) {
-        append(nick, () => create('div', ['awsl-remark'], {
-          style: {
-            'color': 'var(--w-sub)',
-            'font-size': '80%',
-            'font-weight': 'normal',
-            'margin-left': '0.5em',
-          },
-          html: info.join(SPLITTER),
-        }));
+      if (data.user.remark) {
+        html(ctx.name, data.user.screen_name);
       }
+
+      buildRemark(container, data.user);
     });
   },
 });
+
+function buildRemark(container: HTMLElement, user: IFeedUser): void {
+  const info: string[] = [];
+  if (user.remark) {
+    info.push(`备注：${user.remark}`);
+  }
+  if (user.follow_me) {
+    info.push(user.following ? '互相关注' : '关注了我');
+  }
+
+  if (info.length > 0) {
+    append(container, () => create('div', ['awsl-remark'], {
+      style: {
+        'color': 'var(--w-sub)',
+        'font-size': '80%',
+        'font-weight': 'normal',
+        'margin-left': '0.5em',
+      },
+      html: info.join(SPLITTER),
+    }));
+  }
+}