koishi-plugin-bilibili-notify 1.3.7 → 2.0.0-alpha.1

package/lib/biliAPI.d.ts

@@ -28,7 +28,14 @@ declare class BiliAPI extends Service {
     decrypt(text: string): string;
     getServerUTCTime(): Promise<number>;
     getTimeNow(): Promise<any>;
+    getAllGroup(): Promise<any>;
+    removeUserFromGroup(mid: string): Promise<any>;
+    copyUserToGroup(mid: string, groupId: string): Promise<any>;
     getUserSpaceDynamic(mid: string): Promise<any>;
+    createGroup(tag: string): Promise<any>;
+    getAllDynamic(updateBaseline?: string): Promise<any>;
+    hasNewDynamic(updateBaseline: string): Promise<any>;
+    follow(fid: string): Promise<any>;
     getCookieInfo(refreshToken: string): Promise<any>;
     getUserInfo(mid: string): Promise<any>;
     getWbiKeys(): Promise<{
@@ -50,6 +57,7 @@ declare class BiliAPI extends Service {
         cookies: any;
         refresh_token: string;
     }>;
+    getCSRF(): any;
     loadCookiesFromDatabase(): Promise<void>;
     enableRefreshCookiesDetect(): void;
     checkIfTokenNeedRefresh(refreshToken: string, csrf: string, times?: number): Promise<void>;

package/lib/biliAPI.js

@@ -23,6 +23,8 @@ const mixinKeyEncTab = [
 // 在getUserInfo中检测到番剧出差的UID时，要传回的数据：
 const bangumiTripData = { "code": 0, "data": { "live_room": { "roomid": 931774 } } };
 const GET_USER_SPACE_DYNAMIC_LIST = 'https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/space';
+const GET_ALL_DYNAMIC_LIST = 'https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/all';
+const HAS_NEW_DYNAMIC = 'https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/all/update';
 const GET_COOKIES_INFO = 'https://passport.bilibili.com/x/passport-login/web/cookie/info';
 const GET_USER_INFO = 'https://api.bilibili.com/x/space/wbi/acc/info';
 const GET_MYSELF_INFO = 'https://api.bilibili.com/x/member/web/account';
@@ -32,6 +34,12 @@ const GET_LIVE_ROOM_INFO = 'https://api.live.bilibili.com/room/v1/Room/get_info'
 const GET_MASTER_INFO = 'https://api.live.bilibili.com/live_user/v1/Master/info';
 const GET_TIME_NOW = 'https://api.bilibili.com/x/report/click/now';
 const GET_SERVER_UTC_TIME = 'https://interface.bilibili.com/serverdate.js';
+// 操作
+const MODIFY_RELATION = 'https://api.bilibili.com/x/relation/modify';
+const CREATE_GROUP = 'https://api.bilibili.com/x/relation/tag/create';
+const MODIFY_GROUP_MEMBER = 'https://api.bilibili.com/x/relation/tags/addUsers';
+const GET_ALL_GROUP = 'https://api.bilibili.com/x/relation/tags';
+const COPY_USER_TO_GROUP = 'https://api.bilibili.com/x/relation/tags/copyUsers';
 class BiliAPI extends koishi_1.Service {
     static inject = ['database', 'notifier'];
     jar;
@@ -120,6 +128,55 @@ class BiliAPI extends koishi_1.Service {
             throw new Error('网络异常，本次请求失败！');
         }
     }
+    async getAllGroup() {
+        try {
+            const { data } = await this.client.get(GET_ALL_GROUP);
+            return data;
+        }
+        catch (e) {
+            throw new Error('网络异常，本次请求失败！');
+        }
+    }
+    async removeUserFromGroup(mid) {
+        // 获取csrf
+        const csrf = this.getCSRF();
+        try {
+            // 将用户mid添加到groupId
+            const { data } = await this.client.post(MODIFY_GROUP_MEMBER, {
+                fids: mid,
+                tagids: 0,
+                csrf
+            }, {
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded',
+                }
+            });
+            return data;
+        }
+        catch (e) {
+            throw new Error('网络异常，本次请求失败！');
+        }
+    }
+    async copyUserToGroup(mid, groupId) {
+        // 获取csrf
+        const csrf = this.getCSRF();
+        try {
+            // 将用户mid添加到groupId
+            const { data } = await this.client.post(COPY_USER_TO_GROUP, {
+                fids: mid,
+                tagids: groupId,
+                csrf
+            }, {
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded',
+                }
+            });
+            return data;
+        }
+        catch (e) {
+            throw new Error('网络异常，本次请求失败！');
+        }
+    }
     async getUserSpaceDynamic(mid) {
         try {
             const { data } = await this.client.get(`${GET_USER_SPACE_DYNAMIC_LIST}?host_mid=${mid}`);
@@ -129,6 +186,60 @@ class BiliAPI extends koishi_1.Service {
             throw new Error('网络异常，本次请求失败！');
         }
     }
+    async createGroup(tag) {
+        try {
+            const { data } = await this.client.post(CREATE_GROUP, {
+                tag,
+                csrf: this.getCSRF()
+            }, {
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded',
+                }
+            });
+            return data;
+        }
+        catch (e) {
+            throw new Error('网络异常，本次请求失败！');
+        }
+    }
+    async getAllDynamic(updateBaseline) {
+        let url = GET_ALL_DYNAMIC_LIST;
+        updateBaseline && (url += `?update_baseline=${updateBaseline}`);
+        try {
+            const { data } = await this.client.get(url);
+            return data;
+        }
+        catch (e) {
+            throw new Error('网络异常，本次请求失败！');
+        }
+    }
+    async hasNewDynamic(updateBaseline) {
+        try {
+            const { data } = await this.client.get(`${HAS_NEW_DYNAMIC}?update_baseline=${updateBaseline}`);
+            return data;
+        }
+        catch (e) {
+            throw new Error('网络异常，本次请求失败！');
+        }
+    }
+    async follow(fid) {
+        try {
+            const { data } = await this.client.post(MODIFY_RELATION, {
+                fid,
+                act: 1,
+                re_src: 11,
+                csrf: this.getCSRF()
+            }, {
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded',
+                }
+            });
+            return data;
+        }
+        catch (e) {
+            throw new Error('网络异常，本次请求失败！');
+        }
+    }
     // Check if Token need refresh
     async getCookieInfo(refreshToken) {
         try {
@@ -289,6 +400,10 @@ class BiliAPI extends koishi_1.Service {
             };
         }
     }
+    getCSRF() {
+        // 获取csrf
+        return this.jar.serializeSync().cookies.find(cookie => cookie.key === 'bili_jct').value;
+    }
     async loadCookiesFromDatabase() {
         // Get login info from db
         const { cookies, refresh_token } = await this.getLoginInfoFromDB();

package/lib/comRegister.d.ts

@@ -1,5 +1,16 @@
 import { Bot, Context, Logger, Schema, Session } from "koishi";
 import { Notifier } from "@koishijs/plugin-notifier";
+type SubItem = {
+    id: number;
+    uid: string;
+    roomId: string;
+    targetIdArr: Array<string>;
+    platform: string;
+    live: boolean;
+    dynamic: boolean;
+    liveDispose: Function;
+};
+type SubManager = Array<SubItem>;
 declare class ComRegister {
     static inject: string[];
     logger: Logger;
@@ -8,46 +19,31 @@ declare class ComRegister {
     num: number;
     rebootCount: number;
     subNotifier: Notifier;
-    subManager: {
-        id: number;
-        uid: string;
-        roomId: string;
-        targetId: string;
-        platform: string;
-        live: boolean;
-        dynamic: boolean;
-        liveDispose: Function;
-        dynamicDispose: Function;
-    }[];
-    qqBot: Bot<Context>;
-    qqguildBot: Bot<Context>;
-    oneBot: Bot<Context>;
-    redBot: Bot<Context>;
-    telegramBot: Bot<Context>;
-    satoriBot: Bot<Context>;
-    chronocatBot: Bot<Context>;
-    larkBot: Bot<Context>;
-    sendMsgFunc: (guild: string, bot: Bot<Context>, content: any) => Promise<void>;
+    subManager: SubManager;
+    bot: Bot<Context>;
+    dynamicDispose: Function;
+    sendMsgFunc: (guild: string, content: any) => Promise<void>;
     constructor(ctx: Context, config: ComRegister.Config);
-    getTheCorrespondingBotBasedOnTheSession(session: Session): Bot<Context, any>;
-    sendPrivateMsg(bot: Bot<Context>, content: string): Promise<void>;
-    sendPrivateMsgAndRebootService(ctx: Context, bot: Bot<Context>): Promise<void>;
-    sendPrivateMsgAndStopService(ctx: Context, bot: Bot<Context>): Promise<void>;
-    sendMsg(targets: Array<string>, bot: Bot<Context>, content: any): Promise<void>;
-    dynamicDetect(ctx: Context, bot: Bot<Context>, uid: string, guildId: Array<string>): () => Promise<void>;
-    debug_dynamicDetect(ctx: Context, bot: Bot<Context>, uid: string, guildId: Array<string>): () => Promise<void>;
-    liveDetect(ctx: Context, bot: Bot<Context>, roomId: string, guildId: Array<string>): () => Promise<void>;
+    sendPrivateMsg(content: string): Promise<void>;
+    sendPrivateMsgAndRebootService(ctx: Context): Promise<void>;
+    sendPrivateMsgAndStopService(ctx: Context): Promise<void>;
+    sendMsg(targets: Array<string>, content: any): Promise<void>;
+    dynamicDetect(ctx: Context): () => Promise<void>;
+    debug_dynamicDetect(ctx: Context): () => Promise<void>;
+    liveDetect(ctx: Context, roomId: string, guildId: Array<string>): () => Promise<void>;
     subShow(): string;
-    checkIfNeedSub(comNeed: boolean, subType: string, session: Session, data?: any): Promise<boolean>;
+    checkIfNeedSub(liveSub: boolean, dynamicSub: boolean, session: Session, data?: any): Promise<Array<boolean>>;
     updateSubNotifier(ctx: Context): void;
     checkIfLoginInfoIsLoaded(ctx: Context): Promise<unknown>;
     getSubFromDatabase(ctx: Context): Promise<void>;
     unsubSingle(ctx: Context, id: string, type: number): string;
-    unsubAll(ctx: Context, bot: Bot<Context>, uid: string): void;
+    checkIfUserThatIsSubDynAndUnsub(): void;
+    unsubAll(ctx: Context, uid: string): void;
     checkIfIsLogin(ctx: Context): Promise<boolean>;
 }
 declare namespace ComRegister {
     interface Config {
+        platform: string;
         master: {
             enable: boolean;
             masterAccount: string;