node-karin 0.3.9 → 0.5.0

package/lib/event/review.handler.js

@@ -62,13 +62,11 @@ export const review = new (class Handler {
       this.GroupEnable = e => {
         /** 白名单不为空 */
         if (Array.isArray(this.Config.WhiteList.groups) && this.Config.WhiteList.groups.length) {
-          const group_id = (Number(e.group_id) || String(e.group_id))
-          return this.Config.WhiteList.groups.includes(group_id)
+          return this.Config.WhiteList.groups.includes(String(e.group_id))
         }
         /** 白名单为空 检查黑名单是否为空 */
         if (Array.isArray(this.Config.BlackList.groups) && this.Config.BlackList.groups.length) {
-          const group_id = (Number(e.group_id) || String(e.group_id))
-          return !this.Config.BlackList.groups.includes(group_id)
+          return !this.Config.BlackList.groups.includes(String(e.group_id))
         }
         /** 黑白名单都为空 */
         return true
@@ -79,8 +77,7 @@ export const review = new (class Handler {
     if (this.App.WhiteList.groups) {
       this.GroupEnable = e => {
         if (Array.isArray(this.Config.WhiteList.groups) && this.Config.WhiteList.groups.length) {
-          const group_id = (Number(e.group_id) || String(e.group_id))
-          return this.Config.WhiteList.groups.includes(group_id)
+          return this.Config.WhiteList.groups.includes(String(e.group_id))
         }
         return true
       }
@@ -90,8 +87,7 @@ export const review = new (class Handler {
     if (this.App.BlackList.groups) {
       this.GroupEnable = e => {
         if (Array.isArray(this.Config.BlackList.groups) && this.Config.BlackList.groups.length) {
-          const group_id = (Number(e.group_id) || String(e.group_id))
-          return !this.Config.BlackList.groups.includes(group_id)
+          return !this.Config.BlackList.groups.includes(String(e.group_id))
         }
         return true
       }
@@ -110,13 +106,11 @@ export const review = new (class Handler {
       this.UserEnable = e => {
         /** 白名单不为空 */
         if (Array.isArray(this.Config.WhiteList.users) && this.Config.WhiteList.users.length) {
-          const user_id = (Number(e.user_id) || String(e.user_id))
-          return this.Config.WhiteList.users.includes(user_id)
+          return this.Config.WhiteList.users.includes(String(e.user_id))
         }
         /** 白名单为空 检查黑名单是否为空 */
         if (Array.isArray(this.Config.BlackList.users) && this.Config.BlackList.users.length) {
-          const user_id = (Number(e.user_id) || String(e.user_id))
-          return !this.Config.BlackList.users.includes(user_id)
+          return !this.Config.BlackList.users.includes(String(e.user_id))
         }
         /** 黑白名单都为空 */
         return true
@@ -127,8 +121,7 @@ export const review = new (class Handler {
     if (this.App.WhiteList.users) {
       this.UserEnable = e => {
         if (Array.isArray(this.Config.WhiteList.users) && this.Config.WhiteList.users.length) {
-          const user_id = (Number(e.user_id) || String(e.user_id))
-          return this.Config.WhiteList.users.includes(user_id)
+          return this.Config.WhiteList.users.includes(String(e.user_id))
         }
         return true
       }
@@ -138,8 +131,7 @@ export const review = new (class Handler {
     if (this.App.BlackList.users) {
       this.UserEnable = e => {
         if (Array.isArray(this.Config.BlackList.users) && this.Config.BlackList.users.length) {
-          const user_id = (Number(e.user_id) || String(e.user_id))
-          return !this.Config.BlackList.users.includes(user_id)
+          return !this.Config.BlackList.users.includes(String(e.user_id))
         }
         return true
       }
@@ -158,13 +150,11 @@ export const review = new (class Handler {
       this.GroupMsgPrint = e => {
         /** 白名单不为空 */
         if (Array.isArray(this.Config.WhiteList.GroupMsgLog) && this.Config.WhiteList.GroupMsgLog.length) {
-          const group_id = (Number(e.group_id) || String(e.group_id))
-          return this.Config.WhiteList.GroupMsgLog.includes(group_id)
+          return this.Config.WhiteList.GroupMsgLog.includes(String(e.group_id))
         }
         /** 白名单为空 检查黑名单是否为空 */
         if (Array.isArray(this.Config.BlackList.GroupMsgLog) && this.Config.BlackList.GroupMsgLog.length) {
-          const group_id = (Number(e.group_id) || String(e.group_id))
-          return !this.Config.BlackList.GroupMsgLog.includes(group_id)
+          return !this.Config.BlackList.GroupMsgLog.includes(String(e.group_id))
         }
         /** 黑白名单都为空 */
         return true
@@ -175,8 +165,7 @@ export const review = new (class Handler {
     if (this.App.WhiteList.GroupMsgLog) {
       this.GroupMsgPrint = e => {
         if (Array.isArray(this.Config.WhiteList.GroupMsgLog) && this.Config.WhiteList.GroupMsgLog.length) {
-          const group_id = (Number(e.group_id) || String(e.group_id))
-          return this.Config.WhiteList.GroupMsgLog.includes(group_id)
+          return this.Config.WhiteList.GroupMsgLog.includes(String(e.group_id))
         }
         return true
       }
@@ -186,8 +175,7 @@ export const review = new (class Handler {
     if (this.App.BlackList.GroupMsgLog) {
       this.GroupMsgPrint = e => {
         if (Array.isArray(this.Config.BlackList.GroupMsgLog) && this.Config.BlackList.GroupMsgLog.length) {
-          const group_id = (Number(e.group_id) || String(e.group_id))
-          return !this.Config.BlackList.GroupMsgLog.includes(group_id)
+          return !this.Config.BlackList.GroupMsgLog.includes(String(e.group_id))
         }
         return true
       }

package/lib/index.d.ts

@@ -29,13 +29,14 @@ export declare const Renderer: {
 export declare const Cfg: {
     dir: string;
     _path: string;
-    _pathDef: string;
+    npmCfgDir: string;
     change: Map<string, any>;
     watcher: Map<string, any>;
     review: boolean;
     logger: import("log4js").Logger;
     initCfg(): Promise<void>;
     getPlugins(): string[];
+    checkPath(path: string): void;
     dirPath(name: string, plugins: string[]): Promise<void>;
     timeout(type?: "ws" | "grpc"): number;
     readonly redis: import("./types/index.js").Redis;

package/lib/types/adapter.d.ts

@@ -1,7 +1,8 @@
 import { WebSocket } from 'ws';
 import { IncomingMessage } from 'http';
+import { contact } from './event.js';
 import { KarinElement, KarinNodeElement } from './element.js';
-import { contact, PushMessageBody, EssenceMessageBody, FriendInfo, GroupInfo, GroupMemberInfo, GroupHonorInfo } from './event.js';
+import { PushMessageBody, EssenceMessageBody, FriendInfo, GroupInfo, GroupMemberInfo, GroupHonorInfo } from './api.js';
 export interface KarinAdapter {
     /**
      * - 适配器版本信息
@@ -49,7 +50,7 @@ export interface KarinAdapter {
         /**
          * - 适配器名称
          */
-        name: 'ICQQ' | 'OneBot11' | 'OntBot12' | 'Kritor' | string;
+        name: 'ICQQ' | 'OneBot11' | 'OntBot12' | 'Kritor' | 'input' | string;
         /**
          * - 适配器类型
          */

package/lib/types/api.d.ts

@@ -0,0 +1,295 @@
+import { contact, Sender, KarinElement } from './index.js';
+/**
+ * - 转发、历史消息返回的结构
+ */
+export interface PushMessageBody {
+    /**
+     * - 消息发送时间
+     */
+    time: number;
+    /**
+     * - 消息ID
+     */
+    message_id: string;
+    /**
+     * - 消息序列号
+     */
+    message_seq: number;
+    /**
+     * - 消息来源
+     */
+    contact: contact;
+    /**
+     * - 消息发送者
+     */
+    sender: Sender;
+    /**
+     * - 消息元素
+     */
+    elements: Array<KarinElement>;
+}
+/**
+ * - 精华消息返回的结构
+ */
+export interface EssenceMessageBody {
+    /**
+     * - 群ID
+     */
+    group_id: string;
+    /**
+     * - 发送者uid
+     */
+    sender_uid: string;
+    /**
+     * - 发送者uin
+     */
+    sender_uin: string;
+    /**
+     * - 发送者昵称
+     */
+    sender_nick: string;
+    /**
+     * - 操作者uid
+     */
+    operator_uid: string;
+    /**
+     * - 操作者uin
+     */
+    operator_uin: string;
+    /**
+     * - 操作者昵称
+     */
+    operator_nick: string;
+    /**
+     * - 操作时间
+     */
+    operation_time: number;
+    /**
+     * - 消息时间
+     */
+    message_time: number;
+    /**
+     * - 消息ID
+     */
+    message_id: string;
+    /**
+     * - 消息序列号
+     */
+    message_seq: string;
+    /**
+     * - 被设置的精华消息元素文本
+     */
+    json_elements: string;
+}
+/**
+ * - QQ好友信息
+ */
+export interface FriendInfo {
+    /**
+     * - 用户UID
+     */
+    uid: string;
+    /**
+     * - 用户UIN
+     */
+    uin: string;
+    /**
+     * - qid
+     */
+    qid: string;
+    /**
+     * - 名称
+     */
+    nick: string;
+    /**
+     * - 备注
+     */
+    remark?: string;
+    /**
+     * - 用户等级
+     */
+    level?: number;
+    /**
+     * - 生日
+     */
+    birthday?: string;
+    /**
+     * - 登录天数
+     */
+    login_day?: number;
+    /**
+     * - 点赞数
+     */
+    vote_cnt?: number;
+    /**
+     * - 学校是否已核实
+     */
+    is_school_verified?: boolean;
+    /**
+     * - 年龄
+     * - 拓展字段
+     */
+    age?: number;
+    /**
+     * - 性别
+     * - 拓展字段
+     */
+    sex?: 'male' | 'female' | 'unknown';
+    ext?: {
+        /**
+         * 大会员
+         */
+        big_vip?: boolean;
+        /**
+         * 好莱坞/腾讯视频会员
+         */
+        hollywood_vip?: boolean;
+        /**
+         * QQ会员
+         */
+        qq_vip?: boolean;
+        /**
+         * QQ超级会员
+         */
+        super_vip?: boolean;
+        /**
+         * 是否已经赞过
+         */
+        voted?: boolean;
+    };
+}
+/**
+ * - QQ群信息
+ */
+export interface GroupInfo {
+    /**
+     * - 群ID
+     */
+    group_id: string;
+    /**
+     * - 群名称
+     */
+    group_name: string;
+    /**
+     * - 群备注
+     */
+    group_remark?: string;
+    /**
+     * - 群主UID
+     */
+    owner: string;
+    /**
+     * - 群管理员UID列表
+     */
+    admins: Array<string>;
+    /**
+     * - 最大成员数
+     */
+    max_member_count: number;
+    /**
+     * - 当前成员数
+     */
+    member_count: number;
+    /**
+     * - 群UIN
+     */
+    group_uin?: string;
+}
+/**
+ * - 群成员信息
+ */
+export interface GroupMemberInfo {
+    /**
+     * - 用户UID
+     */
+    uid: string;
+    /**
+     * - 用户UIN
+     */
+    uin: string;
+    /**
+     * - 用户昵称
+     */
+    nick: string;
+    /**
+     * - 年龄
+     */
+    age: number;
+    /**
+     * - 群内头衔
+     */
+    unique_title: string;
+    /**
+     * - 群内头衔过期时间
+     */
+    unique_title_expire_time: number;
+    /**
+     * - 群名片
+     */
+    card?: string;
+    /**
+     * - 加群时间
+     */
+    join_time?: number;
+    /**
+     * - 最后活跃时间
+     */
+    last_active_time?: number;
+    /**
+     * - 用户等级
+     */
+    level: number;
+    /**
+     * - 禁言时间
+     */
+    shut_up_time: number;
+    /**
+     * - 距离
+     */
+    distance?: number;
+    /**
+     * - 荣誉列表
+     */
+    honors?: Array<number>;
+    /**
+     * - 是否好友
+     */
+    unfriendly?: boolean;
+    /**
+     * - 是否可修改群名片
+     */
+    card_changeable?: boolean;
+}
+/**
+ * 群荣誉信息
+ */
+export interface GroupHonorInfo {
+    /**
+     * - 荣誉成员uid
+     */
+    uid: string;
+    /**
+     * - 荣誉成员uin
+     */
+    uin: string;
+    /**
+     * - 荣誉成员昵称
+     */
+    nick: string;
+    /**
+     * - 荣誉名称
+     */
+    honor_name: string;
+    /**
+     * - 荣誉图标url
+     */
+    avatar: string;
+    /**
+     * - 荣誉id
+     */
+    id: number;
+    /**
+     * - 荣誉描述
+     */
+    description: string;
+}

package/lib/types/api.js

@@ -0,0 +1 @@
+export {}

package/lib/types/config.d.ts

@@ -130,6 +130,27 @@ export interface Config {
      * 管理员列表
      */
     admin: string[];
+    /**
+     *
+     */
+    AdapterInput: {
+        /**
+         * - 是否开启input适配器
+         */
+        enable: boolean;
+        /**
+         * - 是否将语音、图片、视频消息转为文件 转为文件后可通过url访问
+         */
+        msgToFile: boolean;
+        /**
+         * - url访问token 如果为 AdapterInput 每次启动后会重新生成
+         */
+        token: string;
+        /**
+         * - ip地址
+         */
+        ip: string;
+    };
     /**
      * 黑名单相关
      */