fix(profile): move the now-playing channel description with the bot (#159)

When the bot was moved to another channel, the channel it left kept the
now-playing description forever: updateChannelDescription always targeted
getChannelId(), which by then already reported the new channel.

Remember which channel we last wrote to. On a self clientMoved event,
clear that channel and, if a song is playing, write the description to
the new one. Stop now clears the channel we actually wrote to, so a
missed move event can't leave a stale description behind either.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>

README.md

@@ -42,7 +42,7 @@
 - **完整播放控制** — 播放/暂停/上一首/下一首/进度跳转/音量调节
 - **四种播放模式** — 顺序播放/循环播放/随机播放/随机循环
 - **实时歌词同步** — 歌词滚动显示，支持翻译歌词，服务端帧计数精确同步
-- **歌单管理** — 推荐歌单/我的歌单/每日推荐/私人FM，点击播放全部；私人 FM 支持网易云、**QQ 音乐雷达推荐**（`!fm -q`）与**酷狗私人电台**（`!fm -k`）。网易云、QQ、酷狗均提供登录后的推荐歌单 / 每日推荐 / 我的歌单。多人共用时，每个网页端用户可在 **设置 → 账户** 扫码绑定**自己的网易云账号**，之后他在网页端开启的网易云私人 FM 按他自己的口味推荐（未绑定则用机器人的共享账号；TS 聊天里的 `!fm` 仍用共享账号）
+- **歌单管理** — 推荐歌单/我的歌单/每日推荐/私人FM，点击播放全部；私人 FM 支持网易云、**QQ 音乐雷达推荐**（`!fm -q`）与**酷狗私人电台**（`!fm -k`）。网易云、QQ、酷狗均提供登录后的推荐歌单 / 每日推荐 / 我的歌单
 - **音质选择** — 标准(128k) / 较高(192k) / 极高(320k) / 无损(FLAC) / Hi-Res / 超清母带
 - **B站视频音频提取** — 搜索B站视频，自动提取DASH最高码率音频流播放
 - **B站热门推荐** — 首页展示B站热门视频和个性化推荐（登录后更准确）

src/bot/instance.ts

@@ -456,11 +456,16 @@ export class BotInstance extends EventEmitter {
       this.voiceDucking.removeSpeaker(event.id);
       void this.refreshOccupancy();
     });
-    this.tsClient.on("clientMoved", (event: { id: number }) => {
+    this.tsClient.on("clientMoved", (event: { id: number; targetChannelID: bigint }) => {
       if (event.id === this.tsClient.getClientId()) {
         // Moving the bot invalidates every activity deadline from its old
         // channel even if no individual leave events arrive.
         this.voiceDucking.reset(false);
+        // Carry the now-playing channel description over to the new
+        // channel instead of leaving it stale in the old one (#159).
+        this.profileManager.onChannelMoved(event.targetChannelID).catch((err) => {
+          this.logger.warn({ err }, "Channel description move update failed");
+        });
       } else {
         this.voiceDucking.removeSpeaker(event.id);
       }

src/bot/profile.test.ts

@@ -202,3 +202,65 @@ describe("BotProfileManager loadCustomAvatar (pre-connect load, #148)", () => {
     expect(ts.uploadCalls[0].equals(Buffer.from([2, 2]))).toBe(true);
   });
 });
+
+describe("BotProfileManager channel description follows the bot (#159)", () => {
+  const cfgChannelDesc = { ...cfgOff, channelDescEnabled: true };
+  let ts: ReturnType<typeof makeMockTs> & { cid: bigint };
+  let channelEdits: () => string[];
+
+  beforeEach(() => {
+    ts = makeMockTs() as any;
+    ts.cid = 5n;
+    (ts as any).getChannelId = () => ts.cid;
+    channelEdits = () =>
+      (ts.sendCommandNoWait as any).mock.calls
+        .map((c: any[]) => c[0] as string)
+        .filter((cmd: string) => cmd.startsWith("channeledit"));
+  });
+
+  it("clears the old channel and fills the new one when moved while playing", async () => {
+    const pm = new BotProfileManager(ts as any, noopLogger, cfgChannelDesc, "Bot");
+    await pm.onSongChange(fakeSong);
+    expect(channelEdits()).toEqual([
+      expect.stringMatching(/^channeledit cid=5 channel_description=\S+/),
+    ]);
+
+    ts.cid = 9n;
+    await pm.onChannelMoved(9n);
+
+    const edits = channelEdits();
+    expect(edits[1]).toBe("channeledit cid=5 channel_description=");
+    expect(edits[2]).toMatch(/^channeledit cid=9 channel_description=\S+/);
+  });
+
+  it("stopping after a move clears the channel the bot is in now, not the old one", async () => {
+    const pm = new BotProfileManager(ts as any, noopLogger, cfgChannelDesc, "Bot");
+    await pm.onSongChange(fakeSong);
+    ts.cid = 9n;
+    await pm.onChannelMoved(9n);
+    await pm.onSongChange(null);
+    expect(channelEdits().at(-1)).toBe("channeledit cid=9 channel_description=");
+  });
+
+  it("a move while idle touches no channel description", async () => {
+    const pm = new BotProfileManager(ts as any, noopLogger, cfgChannelDesc, "Bot");
+    ts.cid = 9n;
+    await pm.onChannelMoved(9n);
+    expect(channelEdits()).toEqual([]);
+  });
+
+  it("a move is ignored when the channel description feature is off", async () => {
+    const pm = new BotProfileManager(ts as any, noopLogger, cfgOff, "Bot");
+    await pm.onSongChange(fakeSong);
+    ts.cid = 9n;
+    await pm.onChannelMoved(9n);
+    expect(channelEdits()).toEqual([]);
+  });
+
+  it("an event for the channel the description is already in is a no-op", async () => {
+    const pm = new BotProfileManager(ts as any, noopLogger, cfgChannelDesc, "Bot");
+    await pm.onSongChange(fakeSong);
+    await pm.onChannelMoved(5n);
+    expect(channelEdits()).toHaveLength(1);
+  });
+});

src/bot/profile.ts

@@ -32,6 +32,13 @@ export class BotProfileManager {
    * pushed immediately (idle) or wait for the next stop event (playing).
    */
   private currentSong: QueuedSong | null = null;
+  /**
+   * Channel whose description currently holds our now-playing text, or null
+   * if we have not written one. Remembered so that when the bot is moved we
+   * can still clean up the channel it was taken out of (#159) — by then
+   * getChannelId() already reports the new channel.
+   */
+  private channelDescCid: bigint | null = null;
 
   /** Per-feature permission-denied flags. Reset on reconnect. */
   private permDenied = {
@@ -134,6 +141,8 @@ export class BotProfileManager {
   onConnect(): void {
     this.generation++;
     this.currentSong = null;
+    // Channel ids are per-server; never carry one across a (re)connect.
+    this.channelDescCid = null;
     this.permDenied = {
       avatar: false,
       description: false,
@@ -150,6 +159,31 @@ export class BotProfileManager {
     }
   }
 
+  /**
+   * Called when the bot itself has been moved to another channel (#159).
+   * Clears the now-playing text from the channel it left and, if a song is
+   * playing, writes it to the channel it is in now.
+   */
+  async onChannelMoved(newChannelId: bigint): Promise<void> {
+    if (!this.config.channelDescEnabled || this.permDenied.channelDesc) return;
+    const oldChannelId = this.channelDescCid;
+    if (oldChannelId === newChannelId) return;
+    try {
+      if (oldChannelId !== null) {
+        await this.tsClient.sendCommandNoWait(
+          `channeledit cid=${oldChannelId} channel_description=`,
+        );
+        this.channelDescCid = null;
+      }
+    } catch (err) {
+      this.handleFeatureError("channelDesc", err);
+      return;
+    }
+    if (this.currentSong) {
+      await this.updateChannelDescription(this.currentSong, newChannelId);
+    }
+  }
+
   getConfig(): ProfileConfig {
     return { ...this.config };
   }
@@ -400,18 +434,25 @@ export class BotProfileManager {
     return str.slice(0, end) + ellipsis;
   }
 
-  private async updateChannelDescription(song: QueuedSong | null): Promise<void> {
+  private async updateChannelDescription(
+    song: QueuedSong | null,
+    targetChannelId?: bigint,
+  ): Promise<void> {
     if (!this.config.channelDescEnabled || this.permDenied.channelDesc) return;
     try {
-      const channelId = this.tsClient.getChannelId();
-      if (channelId === 0n) return; // unknown channel
-
+      const channelId = targetChannelId ?? this.tsClient.getChannelId();
       if (!song) {
+        // Prefer the channel we actually wrote to, in case a move event
+        // was missed and the bot is somewhere else now.
+        const target = this.channelDescCid ?? channelId;
+        if (target === 0n) return; // unknown channel
         await this.tsClient.sendCommandNoWait(
-          `channeledit cid=${channelId} channel_description=`,
+          `channeledit cid=${target} channel_description=`,
         );
+        this.channelDescCid = null;
         return;
       }
+      if (channelId === 0n) return; // unknown channel
 
       const lines = [
         `\u266A \u6B63\u5728\u64AD\u653E: ${song.name} - ${song.artist}`, // ♪ 正在播放:
@@ -422,6 +463,7 @@ export class BotProfileManager {
       await this.tsClient.sendCommandNoWait(
         `channeledit cid=${channelId} channel_description=${escapeTS3(desc)}`,
       );
+      this.channelDescCid = channelId;
     } catch (err) {
       this.handleFeatureError("channelDesc", err);
     }

src/data/database.test.ts

@@ -345,36 +345,3 @@ describe("guest principal migration", () => {
     rmSync(dir, { recursive: true, force: true });
   });
 });
-
-describe("user music cookies (#164)", () => {
-  let botDb: BotDatabase;
-  const addUser = (id: string) =>
-    botDb.db
-      .prepare("INSERT INTO users (id, username, passwordHash, createdAt, updatedAt, role) VALUES (?,?,?,?,?,?)")
-      .run(id, id, "x", 0, 0, "member");
-
-  beforeEach(() => {
-    botDb = createDatabase(":memory:");
-    addUser("u1");
-    addUser("u2");
-  });
-  afterEach(() => botDb.close());
-
-  it("stores, overwrites and deletes a cookie per user and platform", () => {
-    expect(botDb.getUserMusicCookie("u1", "netease")).toBeNull();
-    botDb.setUserMusicCookie("u1", "netease", "MUSIC_U=a");
-    botDb.setUserMusicCookie("u1", "netease", "MUSIC_U=b");
-    expect(botDb.getUserMusicCookie("u1", "netease")).toBe("MUSIC_U=b");
-    expect(botDb.getUserMusicCookie("u2", "netease")).toBeNull();
-    expect(botDb.getUserMusicCookie("u1", "qq")).toBeNull();
-    expect(botDb.deleteUserMusicCookie("u1", "netease")).toBe(true);
-    expect(botDb.deleteUserMusicCookie("u1", "netease")).toBe(false);
-    expect(botDb.getUserMusicCookie("u1", "netease")).toBeNull();
-  });
-
-  it("drops a user's cookies when the user is deleted", () => {
-    botDb.setUserMusicCookie("u1", "netease", "MUSIC_U=a");
-    botDb.db.prepare("DELETE FROM users WHERE id = ?").run("u1");
-    expect(botDb.getUserMusicCookie("u1", "netease")).toBeNull();
-  });
-});

src/data/database.ts

@@ -144,10 +144,6 @@ export interface BotDatabase {
   removeFavorite(userId: string, playlistId: string, platform: string): boolean;
   getFavorites(userId: string): FavoritePlaylist[];
   isFavorited(userId: string, playlistId: string, platform: string): boolean;
-  // Per-user music account cookies (#164).
-  getUserMusicCookie(userId: string, platform: string): string | null;
-  setUserMusicCookie(userId: string, platform: string, cookie: string): void;
-  deleteUserMusicCookie(userId: string, platform: string): boolean;
   // Saved queues (Feature 1) — upsert by (ownerId, name), capped.
   saveQueue(ownerId: string, name: string, songs: StoredSong[]): SavedQueue;
   listSavedQueues(ownerId: string, includeShared: boolean): SavedQueueMeta[];
@@ -332,17 +328,6 @@ function initTables(db: Database.Database): void {
       fmPlatform   TEXT NOT NULL DEFAULT '',
       updatedAt    TEXT NOT NULL DEFAULT (datetime('now'))
     );
-
-    -- A web user's own music-platform login (#164), used for their personal
-    -- FM instead of the bot's shared account. Secret: never sent to clients.
-    CREATE TABLE IF NOT EXISTS user_music_cookies (
-      userId    TEXT NOT NULL,
-      platform  TEXT NOT NULL,
-      cookie    TEXT NOT NULL,
-      updatedAt TEXT NOT NULL DEFAULT (datetime('now')),
-      PRIMARY KEY (userId, platform),
-      FOREIGN KEY (userId) REFERENCES users(id) ON DELETE CASCADE
-    );
   `);
 }
 
@@ -468,17 +453,6 @@ export function createDatabase(dbPath: string): BotDatabase {
     SELECT 1 FROM favorite_playlists WHERE userId = ? AND playlistId = ? AND platform = ?
   `);
 
-  const selectUserMusicCookie = db.prepare(
-    `SELECT cookie FROM user_music_cookies WHERE userId = ? AND platform = ?`,
-  );
-  const upsertUserMusicCookie = db.prepare(`
-    INSERT INTO user_music_cookies (userId, platform, cookie) VALUES (?, ?, ?)
-    ON CONFLICT(userId, platform) DO UPDATE SET cookie = excluded.cookie, updatedAt = datetime('now')
-  `);
-  const deleteUserMusicCookieStmt = db.prepare(
-    `DELETE FROM user_music_cookies WHERE userId = ? AND platform = ?`,
-  );
-
   // A corrupt/hand-edited songs blob must never throw into a route or the
   // restore path — degrade to an empty list instead.
   const parseSongs = (raw: string): StoredSong[] => {
@@ -660,19 +634,6 @@ export function createDatabase(dbPath: string): BotDatabase {
       return row !== undefined;
     },
 
-    getUserMusicCookie(userId, platform) {
-      const row = selectUserMusicCookie.get(userId, platform) as { cookie: string } | undefined;
-      return row?.cookie ?? null;
-    },
-
-    setUserMusicCookie(userId, platform, cookie) {
-      upsertUserMusicCookie.run(userId, platform, cookie);
-    },
-
-    deleteUserMusicCookie(userId, platform) {
-      return deleteUserMusicCookieStmt.run(userId, platform).changes > 0;
-    },
-
     saveQueue(ownerId, name, songs) {
       if (songs.length > MAX_QUEUE_SONGS) {
         throw new Error(`保存失败：歌曲数量超过上限 ${MAX_QUEUE_SONGS}`);

src/music/netease.test.ts

@@ -139,48 +139,3 @@ describe("NeteaseProvider.search pagination", () => {
     expect(callByType(get, 10).offset).toBe(0);
   });
 });
-
-describe("NeteaseProvider per-user login (#164)", () => {
-  function withGet(p: NeteaseProvider, impl: (path: string, cfg: any) => any) {
-    const get = vi.fn(async (path: string, cfg: any) => ({ data: impl(path, cfg) }));
-    (p as any).api = { get, defaults: { baseURL: "http://127.0.0.1:3001" } };
-    return get;
-  }
-
-  it("pollQrLogin returns the cookie without touching the shared account", async () => {
-    const p = new NeteaseProvider("http://127.0.0.1:3001");
-    p.setCookie("MUSIC_U=shared");
-    withGet(p, () => ({ code: 803, cookie: "MUSIC_U=personal" }));
-    expect(await p.pollQrLogin("k")).toEqual({ status: "confirmed", cookie: "MUSIC_U=personal" });
-    expect(p.getCookie()).toBe("MUSIC_U=shared");
-  });
-
-  it("pollQrLogin maps the waiting / scanned / expired codes", async () => {
-    const p = new NeteaseProvider("http://127.0.0.1:3001");
-    let code = 801;
-    withGet(p, () => ({ code }));
-    expect(await p.pollQrLogin("k")).toEqual({ status: "waiting" });
-    code = 802;
-    expect(await p.pollQrLogin("k")).toEqual({ status: "scanned" });
-    code = 800;
-    expect(await p.pollQrLogin("k")).toEqual({ status: "expired" });
-  });
-
-  it("checkQrCodeStatus still stores the cookie on the shared provider (admin login)", async () => {
-    const p = new NeteaseProvider("http://127.0.0.1:3001");
-    withGet(p, () => ({ code: 803, cookie: "MUSIC_U=admin" }));
-    expect(await p.checkQrCodeStatus("k")).toBe("confirmed");
-    expect(p.getCookie()).toBe("MUSIC_U=admin");
-  });
-
-  it("withCookie gives a view that fetches FM with the other account's cookie", async () => {
-    const p = new NeteaseProvider("http://127.0.0.1:3001");
-    p.setCookie("MUSIC_U=shared");
-    const personal = p.withCookie("MUSIC_U=personal");
-    const get = withGet(personal, () => ({ data: [] }));
-    await personal.getPersonalFm();
-    expect(get.mock.calls[0][1].params.cookie).toBe("MUSIC_U=personal");
-    expect(p.getCookie()).toBe("MUSIC_U=shared");
-    expect(personal.platform).toBe("netease");
-  });
-});

src/music/netease.ts

@@ -111,10 +111,8 @@ export class NeteaseProvider implements MusicProvider {
   private api: AxiosInstance;
   private cookie = "";
   private quality = "exhigh";
-  private readonly baseUrl: string;
 
   constructor(baseUrl: string) {
-    this.baseUrl = baseUrl;
     this.api = axios.create({
       baseURL: baseUrl,
       timeout: 10000,
@@ -245,47 +243,25 @@ export class NeteaseProvider implements MusicProvider {
   async checkQrCodeStatus(
     key: string
   ): Promise<"waiting" | "scanned" | "confirmed" | "expired"> {
-    const { status, cookie } = await this.pollQrLogin(key);
-    if (cookie) this.cookie = cookie;
-    return status;
-  }
-
-  /**
-   * Poll a QR login and hand back the resulting cookie WITHOUT storing it on
-   * this provider — for a web user linking their own account (#164), which
-   * must never replace the bot's shared login.
-   */
-  async pollQrLogin(
-    key: string
-  ): Promise<{ status: "waiting" | "scanned" | "confirmed" | "expired"; cookie?: string }> {
     const res = await this.api.get("/login/qr/check", {
       params: { key, timestamp: Date.now() },
     });
-    switch (res.data?.code) {
+    const code = res.data?.code;
+    switch (code) {
       case 801:
-        return { status: "waiting" };
+        return "waiting";
       case 802:
-        return { status: "scanned" };
+        return "scanned";
       case 803:
-        return res.data?.cookie
-          ? { status: "confirmed", cookie: res.data.cookie }
-          : { status: "confirmed" };
+        if (res.data?.cookie) {
+          this.cookie = res.data.cookie;
+        }
+        return "confirmed";
       default:
-        return { status: "expired" };
+        return "expired";
     }
   }
 
-  /**
-   * A provider for the same API server logged in as another account (#164):
-   * a web user's personal FM uses their own taste instead of the shared login.
-   */
-  withCookie(cookie: string): NeteaseProvider {
-    const view = new NeteaseProvider(this.baseUrl);
-    view.setQuality(this.quality);
-    view.setCookie(cookie);
-    return view;
-  }
-
   async sendSmsCode(phone: string): Promise<boolean> {
     const res = await this.api.get("/captcha/sent", {
       params: { phone },

src/web/api/personal-music.test.ts

@@ -1,125 +0,0 @@
-import { describe, it, expect, vi } from "vitest";
-import express from "express";
-import request from "supertest";
-import pino from "pino";
-import { createDatabase } from "../../data/database.js";
-import { createPersonalMusicRouter } from "./personal-music.js";
-import { createPlayerRouter } from "./player.js";
-
-function mount() {
-  const db = createDatabase(":memory:");
-  db.db
-    .prepare("INSERT INTO users (id, username, passwordHash, createdAt, updatedAt, role) VALUES (?,?,?,?,?,?)")
-    .run("u1", "alice", "x", 0, 0, "member");
-  const personalView = {
-    getAuthStatus: vi.fn(async () => ({ loggedIn: true, nickname: "Alice163" })),
-  };
-  const provider: any = {
-    platform: "netease",
-    getQrCode: vi.fn(async () => ({ qrUrl: "u", qrImg: "data:img", key: "k1" })),
-    pollQrLogin: vi.fn(async () => ({ status: "waiting" })),
-    withCookie: vi.fn(() => personalView),
-    setCookie: vi.fn(),
-  };
-  const app = express();
-  app.use(express.json());
-  app.use((req, _res, next) => {
-    (req as any).user = { id: "u1", username: "alice", role: "member" };
-    next();
-  });
-  app.use("/api/me/music", createPersonalMusicRouter(db, provider, pino({ level: "silent" })));
-  return { app, db, provider, personalView };
-}
-
-describe("personal music account router (#164)", () => {
-  it("reports not linked until the user logs in", async () => {
-    const { app } = mount();
-    const res = await request(app).get("/api/me/music/netease/status");
-    expect(res.status).toBe(200);
-    expect(res.body).toEqual({ linked: false, loggedIn: false });
-  });
-
-  it("creates a QR code", async () => {
-    const { app } = mount();
-    const res = await request(app).post("/api/me/music/netease/qrcode");
-    expect(res.body).toEqual({ qrUrl: "u", qrImg: "data:img", key: "k1" });
-  });
-
-  it("stores the cookie for this user on confirm, never on the shared provider, and never returns it", async () => {
-    const { app, db, provider } = mount();
-    provider.pollQrLogin.mockResolvedValue({ status: "confirmed", cookie: "MUSIC_U=alice" });
-    const res = await request(app).get("/api/me/music/netease/qrcode/status").query({ key: "k1" });
-    expect(res.body).toEqual({ status: "confirmed" });
-    expect(JSON.stringify(res.body)).not.toContain("MUSIC_U");
-    expect(db.getUserMusicCookie("u1", "netease")).toBe("MUSIC_U=alice");
-    expect(provider.setCookie).not.toHaveBeenCalled();
-  });
-
-  it("requires a key to poll", async () => {
-    const { app } = mount();
-    expect((await request(app).get("/api/me/music/netease/qrcode/status")).status).toBe(400);
-  });
-
-  it("reports the linked account's nickname via a view on the user's cookie", async () => {
-    const { app, db, provider } = mount();
-    db.setUserMusicCookie("u1", "netease", "MUSIC_U=alice");
-    const res = await request(app).get("/api/me/music/netease/status");
-    expect(res.body).toEqual({ linked: true, loggedIn: true, nickname: "Alice163" });
-    expect(provider.withCookie).toHaveBeenCalledWith("MUSIC_U=alice");
-  });
-
-  it("unlinks", async () => {
-    const { app, db } = mount();
-    db.setUserMusicCookie("u1", "netease", "MUSIC_U=alice");
-    expect((await request(app).delete("/api/me/music/netease")).status).toBe(200);
-    expect(db.getUserMusicCookie("u1", "netease")).toBeNull();
-  });
-});
-
-describe("web FM uses the caller's linked NetEase account (#164)", () => {
-  async function startFm(opts: { linked: boolean; role?: string; platform?: string }) {
-    const db = createDatabase(":memory:");
-    db.db
-      .prepare("INSERT INTO users (id, username, passwordHash, createdAt, updatedAt, role) VALUES (?,?,?,?,?,?)")
-      .run("u1", "alice", "x", 0, 0, "member");
-    if (opts.linked) db.setUserMusicCookie("u1", "netease", "MUSIC_U=alice");
-    const personal = { platform: "netease", personal: true };
-    const shared: any = { platform: "netease", pollQrLogin: vi.fn(), withCookie: vi.fn(() => personal) };
-    const qq: any = { platform: "qq" };
-    const bot = {
-      id: "b1",
-      getProviderFor: (p: string) => (p === "qq" ? qq : shared),
-      startFm: vi.fn(async (_provider: unknown) => "Personal FM started"),
-    };
-    const botManager: any = { getBot: () => bot };
-    const app = express();
-    app.use(express.json());
-    app.use((req, _res, next) => {
-      (req as any).user = {
-        id: "u1", username: "alice", role: opts.role ?? "member",
-        capabilities: new Set(["player.control"]), bots: "all", guest: { playMode: true },
-      };
-      next();
-    });
-    app.use("/api/player", createPlayerRouter(botManager, pino({ level: "silent" }), db));
-    const res = await request(app).post("/api/player/b1/fm").send({ platform: opts.platform ?? "netease" });
-    return { res, bot, shared, personal, qq };
-  }
-
-  it("starts FM on the user's own account when linked", async () => {
-    const { res, bot, shared, personal } = await startFm({ linked: true });
-    expect(res.status).toBe(200);
-    expect(shared.withCookie).toHaveBeenCalledWith("MUSIC_U=alice");
-    expect(bot.startFm.mock.calls[0][0]).toBe(personal);
-  });
-
-  it("falls back to the shared account when the user has not linked one", async () => {
-    const { bot, shared } = await startFm({ linked: false });
-    expect(bot.startFm.mock.calls[0][0]).toBe(shared);
-  });
-
-  it("leaves other platforms alone", async () => {
-    const { bot, qq } = await startFm({ linked: true, platform: "qq" });
-    expect(bot.startFm.mock.calls[0][0]).toBe(qq);
-  });
-});

src/web/api/personal-music.ts

@@ -1,95 +0,0 @@
-import { Router } from "express";
-import type { BotDatabase } from "../../data/database.js";
-import type { MusicProvider, QrCodeResult } from "../../music/provider.js";
-import type { Logger } from "../../logger.js";
-
-/**
- * A provider that can log a web user into their OWN account without touching
- * the bot's shared login, and hand out a view bound to that account (#164).
- */
-export interface PersonalLoginProvider {
-  getQrCode(): Promise<QrCodeResult>;
-  pollQrLogin(key: string): Promise<{ status: "waiting" | "scanned" | "confirmed" | "expired"; cookie?: string }>;
-  withCookie(cookie: string): MusicProvider;
-}
-
-export function supportsPersonalLogin(
-  provider: MusicProvider | undefined,
-): provider is MusicProvider & PersonalLoginProvider {
-  const p = provider as Partial<PersonalLoginProvider> | undefined;
-  return typeof p?.pollQrLogin === "function" && typeof p.withCookie === "function";
-}
-
-/**
- * The caller's own NetEase account, used for their personal FM instead of the
- * bot's shared login (#164). Every route acts on req.user only; the cookie is
- * stored server-side and never sent back to the browser.
- */
-export function createPersonalMusicRouter(
-  database: BotDatabase,
-  neteaseProvider: MusicProvider,
-  logger: Logger,
-): Router {
-  const router = Router();
-  const platform = "netease";
-
-  router.use((_req, res, next) => {
-    if (!supportsPersonalLogin(neteaseProvider)) {
-      res.status(501).json({ error: "Personal login not supported" });
-      return;
-    }
-    next();
-  });
-  const provider = neteaseProvider as MusicProvider & PersonalLoginProvider;
-
-  router.get("/netease/status", async (req, res) => {
-    const cookie = database.getUserMusicCookie(req.user!.id, platform);
-    if (!cookie) {
-      res.json({ linked: false, loggedIn: false });
-      return;
-    }
-    try {
-      const status = await provider.withCookie(cookie).getAuthStatus();
-      res.json({ linked: true, ...status });
-    } catch (err) {
-      logger.warn({ err }, "Personal NetEase status check failed");
-      res.json({ linked: true, loggedIn: false });
-    }
-  });
-
-  router.post("/netease/qrcode", async (_req, res) => {
-    try {
-      res.json(await provider.getQrCode());
-    } catch (err) {
-      logger.error({ err }, "Personal NetEase QR generation failed");
-      res.status(500).json({ error: (err as Error).message });
-    }
-  });
-
-  router.get("/netease/qrcode/status", async (req, res) => {
-    const key = req.query.key;
-    if (typeof key !== "string" || !key) {
-      res.status(400).json({ error: "key is required" });
-      return;
-    }
-    try {
-      const { status, cookie } = await provider.pollQrLogin(key);
-      if (status === "confirmed" && cookie) {
-        database.setUserMusicCookie(req.user!.id, platform, cookie);
-        logger.info({ userId: req.user!.id, platform }, "Personal music account linked");
-      }
-      res.json({ status });
-    } catch (err) {
-      logger.error({ err }, "Personal NetEase QR status check failed");
-      res.status(500).json({ error: (err as Error).message });
-    }
-  });
-
-  router.delete("/netease", (req, res) => {
-    database.deleteUserMusicCookie(req.user!.id, platform);
-    logger.info({ userId: req.user!.id, platform }, "Personal music account unlinked");
-    res.json({ ok: true });
-  });
-
-  return router;
-}

src/web/api/player.ts

@@ -6,7 +6,6 @@ import type { Logger } from "../../logger.js";
 import { parseCommand } from "../../bot/commands.js";
 import { requireBotAccess } from "../middleware/requirePermission.js";
 import { authorize } from "../middleware/authorize.js";
-import { supportsPersonalLogin } from "./personal-music.js";
 
 export function createPlayerRouter(
   botManager: BotManager,
@@ -125,19 +124,11 @@ export function createPlayerRouter(
         rejectDisabledLocalAudio(res);
         return;
       }
-      let provider = bot.getProviderFor(
+      const provider = bot.getProviderFor(
         platform === "bilibili" || platform === "qq" || platform === "youtube" || platform === "local" || platform === "kugou" || platform === "jellyfin"
           ? platform
           : "netease"
       );
-      // A signed-in user who linked their own NetEase account gets FM from
-      // THEIR taste, not the bot's shared login (#164). Songs still resolve
-      // through the shared provider when played.
-      const user = (req as any).user;
-      if (provider.platform === "netease" && user && user.role !== "guest" && database) {
-        const cookie = database.getUserMusicCookie(user.id, "netease");
-        if (cookie && supportsPersonalLogin(provider)) provider = provider.withCookie(cookie);
-      }
       const message = await bot.startFm(provider, requesterName(req));
       res.json({
         ok:

src/web/server.ts

@@ -19,7 +19,6 @@ import { createUsersRouter } from "./api/users.js";
 import { createAuditStore } from "../data/audit.js";
 import { createAuditRouter } from "./api/audit.js";
 import { createFavoritesRouter } from "./api/favorites.js";
-import { createPersonalMusicRouter } from "./api/personal-music.js";
 import { createSavedQueuesRouter } from "./api/saved-queues.js";
 import { createSpotifyRouter } from "./api/spotify.js";
 import type { SpotifyOAuth } from "../music/spotify/spotify-oauth.js";
@@ -204,13 +203,6 @@ export function createWebServer(options: WebServerOptions): WebServer {
     );
   }
   app.use("/api/favorites", requireNotGuest, createFavoritesRouter(options.database, logger));
-  // The caller's own NetEase login for their personal FM (#164). Guests share
-  // one anonymous identity, so they cannot link an account.
-  app.use(
-    "/api/me/music",
-    requireNotGuest,
-    createPersonalMusicRouter(options.database, options.neteaseProvider, logger),
-  );
   // Saved queues (Feature 1, #119). Members + admins only (requireNotGuest);
   // the router itself 403s every route unless savedQueuesEnabled is on.
   app.use(

web/src/components/PersonalNeteaseAccount.vue

@@ -1,261 +0,0 @@
-<template>
-  <!-- The signed-in user's own NetEase account, used for THEIR 私人FM instead
-       of the bot's shared login (#164). -->
-  <div class="account-card">
-    <div class="account-header">
-      <Icon icon="mdi:radio" class="account-icon" />
-      <div class="account-info">
-        <div class="account-name">我的网易云账号（私人FM）</div>
-        <div class="account-status" :class="{ logged: status.loggedIn }">
-          <template v-if="status.loggedIn">已绑定: {{ status.nickname }}</template>
-          <template v-else-if="status.linked">已绑定，但登录已失效，请重新扫码</template>
-          <template v-else>未绑定 — 私人FM使用机器人的共享账号</template>
-        </div>
-      </div>
-    </div>
-
-    <p class="hint">
-      绑定后，你在网页端开启的网易云私人FM会按你自己的口味推荐；其他人不受影响。
-      仅保存在服务器上，不会显示给任何人。
-    </p>
-
-    <div class="login-methods">
-      <button class="login-btn" :disabled="qr.loading" @click="startQrLogin">
-        <Icon icon="mdi:qrcode" />
-        {{ status.linked ? '重新扫码绑定' : '扫码绑定' }}
-      </button>
-      <button v-if="status.linked" class="login-btn" @click="unlink">
-        <Icon icon="mdi:link-off" />
-        解除绑定
-      </button>
-    </div>
-
-    <div v-if="qr.loading" class="qr-loading">
-      <Icon icon="mdi:loading" class="spin" />
-      生成二维码中...
-    </div>
-    <div v-else-if="qr.dataUrl" class="qr-wrap">
-      <img :src="qr.dataUrl" class="qr-image" alt="QR Code" />
-      <div class="qr-status" :class="qr.status">
-        <template v-if="qr.status === 'waiting'">
-          <Icon icon="mdi:cellphone" /> 请使用网易云音乐APP扫码
-        </template>
-        <template v-else-if="qr.status === 'scanned'">
-          <Icon icon="mdi:check" /> 已扫码，请在手机上确认
-        </template>
-        <template v-else-if="qr.status === 'confirmed'">
-          <Icon icon="mdi:check-circle" /> 绑定成功!
-        </template>
-        <template v-else-if="qr.status === 'expired'">
-          <Icon icon="mdi:refresh" /> 二维码已过期
-          <button class="btn-link" @click="startQrLogin">重新生成</button>
-        </template>
-      </div>
-    </div>
-    <p v-if="error" class="error">{{ error }}</p>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { onMounted, onUnmounted, reactive, ref } from 'vue';
-import { Icon } from '@iconify/vue';
-import axios from 'axios';
-import QRCode from 'qrcode';
-
-const BASE = '/api/me/music/netease';
-
-const status = reactive({ linked: false, loggedIn: false, nickname: '' });
-const qr = reactive({
-  loading: false,
-  dataUrl: '',
-  key: '',
-  status: 'waiting' as 'waiting' | 'scanned' | 'confirmed' | 'expired',
-});
-const error = ref('');
-let pollTimer: ReturnType<typeof setInterval> | null = null;
-
-function stopPolling() {
-  if (pollTimer) clearInterval(pollTimer);
-  pollTimer = null;
-}
-
-async function refreshStatus() {
-  try {
-    const res = await axios.get(`${BASE}/status`);
-    status.linked = Boolean(res.data?.linked);
-    status.loggedIn = Boolean(res.data?.loggedIn);
-    status.nickname = res.data?.nickname ?? '';
-  } catch {
-    // Leave the last known state
-  }
-}
-
-async function startQrLogin() {
-  stopPolling();
-  error.value = '';
-  qr.loading = true;
-  qr.dataUrl = '';
-  qr.status = 'waiting';
-  try {
-    const res = await axios.post(`${BASE}/qrcode`);
-    const { qrUrl, qrImg, key } = res.data;
-    qr.key = key;
-    // Dark-on-light only: many in-app scanners can't read an inverted code.
-    qr.dataUrl = qrImg || (await QRCode.toDataURL(qrUrl, {
-      width: 200,
-      margin: 2,
-      color: { dark: '#000000', light: '#ffffff' },
-    }));
-    pollTimer = setInterval(pollQrStatus, 2000);
-  } catch (err: any) {
-    error.value = err?.response?.data?.error ?? '二维码生成失败';
-  } finally {
-    qr.loading = false;
-  }
-}
-
-async function pollQrStatus() {
-  if (!qr.key) return;
-  try {
-    const res = await axios.get(`${BASE}/qrcode/status`, { params: { key: qr.key } });
-    qr.status = res.data.status;
-    if (qr.status === 'confirmed') {
-      stopPolling();
-      await refreshStatus();
-    } else if (qr.status === 'expired') {
-      stopPolling();
-    }
-  } catch {
-    // Ignore poll errors
-  }
-}
-
-async function unlink() {
-  error.value = '';
-  try {
-    await axios.delete(BASE);
-    stopPolling();
-    qr.dataUrl = '';
-    await refreshStatus();
-  } catch (err: any) {
-    error.value = err?.response?.data?.error ?? '解除绑定失败';
-  }
-}
-
-onMounted(refreshStatus);
-onUnmounted(stopPolling);
-</script>
-
-<style lang="scss" scoped>
-.account-card {
-  margin-top: 16px;
-  padding: 20px;
-  background: var(--hover-bg);
-  border-radius: var(--radius-md);
-}
-
-.account-header {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  margin-bottom: 12px;
-}
-
-.account-icon {
-  font-size: 28px;
-  color: var(--color-primary);
-}
-
-.account-name {
-  font-weight: 600;
-}
-
-.account-status {
-  font-size: 12px;
-  color: var(--text-tertiary);
-  &.logged { color: var(--color-online); }
-}
-
-.hint {
-  font-size: 12px;
-  color: var(--text-tertiary);
-  margin: 0 0 12px;
-  line-height: 1.5;
-}
-
-.login-methods {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 8px;
-  margin-bottom: 16px;
-}
-
-.login-btn {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  padding: 8px 16px;
-  background: var(--bg-card);
-  border: 1px solid var(--border-color);
-  border-radius: var(--radius-sm);
-  font-size: 13px;
-  font-weight: 500;
-  color: inherit;
-  cursor: pointer;
-  transition: all var(--transition-fast);
-  &:hover:not(:disabled) { border-color: var(--color-primary); color: var(--color-primary); }
-  &:disabled { opacity: 0.6; cursor: default; }
-}
-
-.qr-loading {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  color: var(--text-secondary);
-}
-
-.qr-wrap {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: 16px;
-}
-
-.qr-image {
-  width: 200px;
-  height: 200px;
-  border-radius: var(--radius-md);
-  border: 2px solid var(--border-color);
-}
-
-.qr-status {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  font-size: 13px;
-  color: var(--text-secondary);
-  &.confirmed { color: var(--color-online); }
-}
-
-.btn-link {
-  background: none;
-  border: none;
-  color: var(--color-primary);
-  cursor: pointer;
-  padding: 0;
-}
-
-.error {
-  margin-top: 8px;
-  font-size: 12px;
-  color: #e26a6a;
-}
-
-.spin {
-  animation: spin 1s linear infinite;
-}
-
-@keyframes spin {
-  to { transform: rotate(360deg); }
-}
-</style>

web/src/views/Settings.vue

@@ -48,7 +48,6 @@
       </form>
       <p v-if="ownPwError" class="user-error">{{ ownPwError }}</p>
       <p v-if="ownPwSuccess" class="user-success">{{ ownPwSuccess }}</p>
-      <PersonalNeteaseAccount v-if="providerOn('netease') && !session.isGuest.value" />
     </section>
 
     <!-- Bot Management (create/edit/delete/start-stop) requires bot.manage -->
@@ -1162,7 +1161,6 @@ import { Icon } from '@iconify/vue';
 import axios from 'axios';
 import AvatarUpload from '../components/AvatarUpload.vue';
 import CustomAvatarRow from '../components/CustomAvatarRow.vue';
-import PersonalNeteaseAccount from '../components/PersonalNeteaseAccount.vue';
 import QRCode from 'qrcode';
 import { usePlayerStore } from '../stores/player.js';
 import { useSession } from '../composables/useSession.js';