@alemonjs/bubble 2.1.0-alpha.15 → 2.1.0-alpha.17

package/lib/hook.d.ts

@@ -1,5 +1,4 @@
 import { EventKeys, Events } from 'alemonjs';
-import { BubbleAPI as API } from './sdk/api';
 type MAP = {
     'message.create': object;
     'private.message.create': object;
@@ -21,5 +20,30 @@ type MAP = {
     'private.guild.add': undefined;
 };
 export declare const useValue: <T extends EventKeys>(event: Events[T]) => readonly [MAP[T]];
-export declare const useClient: <T extends EventKeys>(event: Events[T]) => readonly [API, MAP[T]];
+export declare const useClient: <T extends EventKeys>(event: Events[T]) => readonly [{
+    request: (options: import("axios").AxiosRequestConfig<any>) => Promise<import("alemonjs").Result<any>>;
+    getMe: () => Promise<import("alemonjs").Result<import(".").BotInfo>>;
+    sendMessage: (channelId: string | number, data: import(".").SendMessagePayload) => Promise<import("alemonjs").Result<import(".").BaseMessage>>;
+    getChannelMessages: (channelId: string | number) => Promise<import("alemonjs").Result<import(".").BaseMessage[]>>;
+    editMessage: (channelId: string | number, messageId: string | number, data: Partial<import(".").SendMessagePayload>) => Promise<import("alemonjs").Result<import(".").BaseMessage>>;
+    deleteMessage: (channelId: string | number, messageId: string | number) => Promise<import("alemonjs").Result<void>>;
+    listGuildChannels: (guildId: string | number) => Promise<import("alemonjs").Result<import(".").Channel[]>>;
+    getChannel: (channelId: string | number) => Promise<import("alemonjs").Result<import(".").Channel>>;
+    listGuildMembers: (guildId: string | number) => Promise<import("alemonjs").Result<import(".").User[]>>;
+    getGuildMember: (guildId: string | number, userId: string | number) => Promise<import("alemonjs").Result<import(".").User>>;
+    getOrCreateDm: (userId: string | number) => Promise<import("alemonjs").Result<{
+        id: number;
+        type: string;
+    }>>;
+    sendDm: (threadId: string | number, data: import(".").SendMessagePayload) => Promise<import("alemonjs").Result<import(".").BaseMessage>>;
+    getDmMessages: (threadId: string | number) => Promise<import("alemonjs").Result<import(".").BaseMessage[]>>;
+    uploadFile: (file: any, filename?: string, extra?: {
+        channelId?: string | number;
+        threadId?: string | number;
+        messageId?: string | number;
+    }) => Promise<import("alemonjs").Result<{
+        data: import(".").FileUploadResponse;
+    }>>;
+    filesQuota: () => Promise<import("alemonjs").Result<import(".").FileQuota>>;
+}, MAP[T]];
 export {};

package/lib/index.js

@@ -14,13 +14,13 @@ const main = () => {
     const client = new BubbleClient();
     void client.connect();
     const createUserAvatar = (_UserId, avatar) => {
-        if (avatar) {
+        if (!avatar) {
             return '';
         }
         return `${CDN_URL}/${avatar}`;
     };
     client.on('MESSAGE_CREATE', event => {
-        if (event.author?.is_bot) {
+        if (event.author?.is_bot || event.author?.isBot) {
             return;
         }
         const atUsers = [];
@@ -94,7 +94,7 @@ const main = () => {
         },
         use: {
             send: async (event, val) => {
-                if (val.length < 0) {
+                if (!val || val.length <= 0) {
                     return [];
                 }
                 const tag = event.tag;
@@ -117,9 +117,9 @@ const main = () => {
             },
             mention: e => {
                 const event = e.value;
-                const MessageMention = event.mentions.map(item => {
+                const MessageMention = (event.mentions || []).map(item => {
                     const UserId = item.id;
-                    const avatar = event.author?.avatar;
+                    const avatar = item.avatar;
                     const UserAvatar = createUserAvatar(UserId, avatar);
                     const [isMaster, UserKey] = getMaster(UserId);
                     return {

package/lib/sdk/instance.js

@@ -79,15 +79,15 @@ const loggerError = err => {
         message: err?.message
     });
 };
-const createAxiosInstance = (service, options) => {
-    return new Promise((resolve, reject) => {
-        service(options)
-            .then(res => resolve(res?.data ?? {}))
-            .catch(err => {
-            loggerError(err);
-            reject(err?.response?.data);
-        });
-    });
+const createAxiosInstance = async (service, options) => {
+    try {
+        const res = await service(options);
+        return res?.data ?? {};
+    }
+    catch (err) {
+        loggerError(err);
+        throw err?.response?.data ?? err;
+    }
 };
 
 export { createAxiosInstance };

package/lib/sdk/types.d.ts

@@ -35,6 +35,7 @@ export interface BaseMessage {
     authorId?: string | number;
     author: {
         id: number;
+        isBot?: boolean;
         is_bot?: boolean;
         avatar?: string | null;
         username: string;

package/lib/send.js

@@ -71,7 +71,7 @@ const sendToRoom = async (client, param, val) => {
                         bufferData = Buffer.from(base64Str, 'base64');
                     }
                     else if (item.value.startsWith('file://')) {
-                        bufferData = readFileSync(item.value);
+                        bufferData = readFileSync(item.value.slice(7));
                     }
                 }
                 else if (item.type === 'ImageURL') {
@@ -158,7 +158,7 @@ const sendToRoom = async (client, param, val) => {
                                 }
                                 return `\n- ${listItem.value}`;
                             });
-                            contentMd += `${listStr}\n`;
+                            contentMd += `${listStr.join('')}\n`;
                         }
                         else if (line.type === 'MD.code') {
                             const language = line?.options?.language || '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/bubble",
-  "version": "2.1.0-alpha.15",
+  "version": "2.1.0-alpha.17",
   "description": "bubble platform",
   "author": "lemonade",
   "license": "MIT",
@@ -65,4 +65,4 @@
     "type": "git",
     "url": "https://github.com/lemonade-lab/alemonjs.git"
   }
-}
+}