alemonjs 2.1.40 → 2.1.41

package/lib/app/hook-use-api.d.ts

@@ -1,6 +1,6 @@
 import { DataEnums, EventKeys, Events, User } from '../types';
 import { Result } from '../core/utils';
-import { BT, Format, MD } from './message-format';
+import { Format } from './message-format';
 type Options = {
     UserId?: string;
     UserKey?: string;
@@ -17,33 +17,23 @@ export declare const useMention: <T extends EventKeys>(event: Events[T]) => [{
     }>;
 }];
 export declare const useMessage: <T extends EventKeys>(event: Events[T]) => readonly [{
-    readonly currentFormat: any;
-    addText(val: string, options?: {
-        style?: "none" | "bold" | "block" | "strikethrough" | "boldItalic" | "italic";
-    }): any;
-    addLink(val: string, options?: {
-        style?: "none" | "bold" | "block" | "strikethrough" | "boldItalic" | "italic";
-    }): any;
-    addImage(val: string | Buffer<ArrayBufferLike>): any;
-    addImageFile(val: string): any;
-    addImageURL(val: string): any;
-    addMention(UserId?: string, options?: {
-        belong?: "user" | "guild" | "channel" | "everyone";
-        payload?: User | import("..").Guild | import("..").Channel | "everyone";
-    }): any;
-    addButtonGroup(...args: Parameters<typeof BT.group>): any;
-    addMarkdown(...args: Parameters<typeof MD>): any;
-    addFormat(val: DataEnums[]): any;
-    clear(): any;
     send(params?: {
         format: Format | DataEnums[];
-    } | DataEnums[]): Promise<Result[]>;
+    } | DataEnums[], param2?: {
+        replyId?: string;
+    }): Promise<Result[]>;
+}];
+export declare const useMember: <T extends EventKeys>(event: Events[T]) => readonly [{
+    information: (params: {
+        userId: string;
+    }) => Promise<Result<any>>;
 }];
-export declare const useMember: <T extends EventKeys>(event: Events[T]) => readonly [{}];
 export declare const useChannel: <T extends EventKeys>(event: Events[T]) => readonly [{}];
 export declare const useSend: <T extends EventKeys>(event: Events[T]) => (...val: DataEnums[]) => Promise<Result[]>;
 export declare const useSends: <T extends EventKeys>(event: Events[T]) => readonly [(params?: DataEnums[] | {
     format: Format | DataEnums[];
+}, param2?: {
+    replyId?: string;
 }) => Promise<Result[]>];
 export declare const unChildren: (name?: string) => void;
 export declare const onSelects: <T extends EventKeys[] | EventKeys>(values: T) => T;
@@ -51,5 +41,8 @@ export declare const createSelects: <T extends EventKeys[] | EventKeys>(values:
 export declare const useClient: <T extends object>(event: any, _ApiClass: new (...args: any[]) => T) => readonly [T];
 export declare const useMe: () => readonly [{
     info: () => Promise<Result<User | null>>;
+    guilds: () => Promise<Result<User | null>>;
+    threads: () => Promise<Result<User | null>>;
+    friends: () => Promise<Result<User | null>>;
 }];
 export {};

package/lib/app/hook-use-api.js

@@ -4,7 +4,6 @@ import { createResult } from '../core/utils.js';
 import { sendAction } from '../cbp/processor/actions.js';
 import { sendAPI } from '../cbp/processor/api.js';
 import { Format } from './message-format.js';
-import { MessageControllerImpl } from './message-controller.js';
 
 const useMention = (event) => {
     if (!event || typeof event !== 'object') {
@@ -109,7 +108,7 @@ const useMessage = (event) => {
         }
         return params.format;
     };
-    const sendRaw = async (val) => {
+    const sendRaw = async (val, replyId) => {
         if (!val || val.length === 0) {
             return [createResult(ResultCode.FailParams, 'Invalid val: val must be a non-empty array', null)];
         }
@@ -118,61 +117,19 @@ const useMessage = (event) => {
             payload: {
                 event,
                 params: {
-                    format: val
+                    format: val,
+                    replyId
                 }
             }
         });
         return Array.isArray(result) ? result : [result];
     };
-    let _ctrl = null;
-    const getCtrl = () => {
-        if (!_ctrl) {
-            _ctrl = new MessageControllerImpl(sendRaw, resolveFormat);
-        }
-        return _ctrl;
-    };
     const lightweight = {
-        get currentFormat() {
-            return getCtrl().currentFormat;
-        },
-        addText(...args) {
-            return getCtrl().addText(...args);
-        },
-        addLink(...args) {
-            return getCtrl().addLink(...args);
-        },
-        addImage(...args) {
-            return getCtrl().addImage(...args);
-        },
-        addImageFile(...args) {
-            return getCtrl().addImageFile(...args);
-        },
-        addImageURL(...args) {
-            return getCtrl().addImageURL(...args);
-        },
-        addMention(...args) {
-            return getCtrl().addMention(...args);
-        },
-        addButtonGroup(...args) {
-            return getCtrl().addButtonGroup(...args);
-        },
-        addMarkdown(...args) {
-            return getCtrl().addMarkdown(...args);
-        },
-        addFormat(val) {
-            return getCtrl().addFormat(val);
-        },
-        clear() {
-            return getCtrl().clear();
-        },
-        send(params) {
-            if (!params) {
-                return _ctrl ? sendRaw(_ctrl.currentFormat) : sendRaw([]);
-            }
+        send(params, param2) {
             if (Array.isArray(params)) {
-                return sendRaw(params.length > 0 ? params : _ctrl ? _ctrl.currentFormat : []);
+                return sendRaw(params.length > 0 ? params : [], param2?.replyId ?? event.MessageId);
             }
-            return sendRaw(resolveFormat(params));
+            return sendRaw(resolveFormat(params), param2?.replyId ?? event.MessageId);
         }
     };
     return [lightweight];
@@ -186,7 +143,31 @@ const useMember = (event) => {
         });
         throw new Error('Invalid event: event must be an object');
     }
-    const member = {};
+    const information = async (params) => {
+        try {
+            const results = await sendAction({
+                action: 'member.info',
+                payload: {
+                    event,
+                    params: {
+                        userId: params?.userId
+                    }
+                }
+            });
+            const result = results.find(item => item.code === ResultCode.Ok);
+            if (result) {
+                const data = result?.data ?? null;
+                return createResult(ResultCode.Ok, 'Successfully retrieved member information', data);
+            }
+            return createResult(ResultCode.Warn, 'No member information found', null);
+        }
+        catch {
+            return createResult(ResultCode.Fail, 'Failed to get member information', null);
+        }
+    };
+    const member = {
+        information
+    };
     return [member];
 };
 const useChannel = (event) => {
@@ -230,6 +211,9 @@ const createSelects = onSelects;
 const useClient = (event, _ApiClass) => {
     const client = new Proxy({}, {
         get(_target, prop) {
+            if (typeof prop === 'symbol') {
+                return undefined;
+            }
             return (...args) => {
                 return sendAPI({
                     action: 'client.api',
@@ -262,8 +246,62 @@ const useMe = () => {
             return createResult(ResultCode.Fail, 'Failed to get bot information', null);
         }
     };
+    const guilds = async () => {
+        try {
+            const results = await sendAction({
+                action: 'me.guilds',
+                payload: {}
+            });
+            const result = results.find(item => item.code === ResultCode.Ok);
+            if (result) {
+                const data = result?.data ?? null;
+                return createResult(ResultCode.Ok, 'Successfully retrieved bot information', data);
+            }
+            return createResult(ResultCode.Warn, 'No bot information found', null);
+        }
+        catch {
+            return createResult(ResultCode.Fail, 'Failed to get bot information', null);
+        }
+    };
+    const threads = async () => {
+        try {
+            const results = await sendAction({
+                action: 'me.threads',
+                payload: {}
+            });
+            const result = results.find(item => item.code === ResultCode.Ok);
+            if (result) {
+                const data = result?.data ?? null;
+                return createResult(ResultCode.Ok, 'Successfully retrieved bot information', data);
+            }
+            return createResult(ResultCode.Warn, 'No bot information found', null);
+        }
+        catch {
+            return createResult(ResultCode.Fail, 'Failed to get bot information', null);
+        }
+    };
+    const friends = async () => {
+        try {
+            const results = await sendAction({
+                action: 'me.friends',
+                payload: {}
+            });
+            const result = results.find(item => item.code === ResultCode.Ok);
+            if (result) {
+                const data = result?.data ?? null;
+                return createResult(ResultCode.Ok, 'Successfully retrieved bot information', data);
+            }
+            return createResult(ResultCode.Warn, 'No bot information found', null);
+        }
+        catch {
+            return createResult(ResultCode.Fail, 'Failed to get bot information', null);
+        }
+    };
     const control = {
-        info
+        info,
+        guilds,
+        threads,
+        friends
     };
     return [control];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "2.1.40",
+  "version": "2.1.41",
   "description": "bot script",
   "author": "lemonade",
   "license": "MIT",