@alemonjs/bubble 2.1.4 → 2.1.6

package/lib/config.d.ts

@@ -14,4 +14,4 @@ export declare const platform = "bubble";
 export declare const getBubbleConfig: () => Options & {
     [key: string]: any;
 };
-export declare const getMaster: (UserId: string) => readonly [boolean, string];
+export declare const getMaster: (UserId: string) => readonly [any, string];

package/lib/config.js

@@ -1,4 +1,4 @@
-import { useUserHashKey, getConfigValue } from 'alemonjs';
+import { getConfigValue, useUserHashKey } from 'alemonjs';
 import { GATEWAY_URL, API_URL, CDN_URL } from './sdk/api.js';
 
 const platform = 'bubble';
@@ -20,6 +20,9 @@ const getBubbleConfig = () => {
     return config;
 };
 const getMaster = (UserId) => {
+    const values = getConfigValue() || {};
+    const mainMasterKey = values.master_key || [];
+    const mainMasterId = values.master_id || [];
     const config = getBubbleConfig();
     const masterKey = config.master_key || [];
     const masterId = config.master_id || [];
@@ -27,7 +30,7 @@ const getMaster = (UserId) => {
         Platform: platform,
         UserId: UserId
     });
-    const is = masterKey.includes(UserKey) || masterId.includes(UserId);
+    const is = mainMasterKey.includes(UserKey) || mainMasterId.includes(UserId) || masterKey.includes(UserKey) || masterId.includes(UserId);
     return [is, UserKey];
 };
 

package/lib/format.js

@@ -1,6 +1,7 @@
 const markdownToBubbleText = (items, hideUnsupported) => {
-    if (Number(hideUnsupported) >= 4)
+    if (Number(hideUnsupported) >= 4) {
         return '';
+    }
     return items
         .map(item => {
         switch (item.type) {
@@ -19,8 +20,9 @@ const markdownToBubbleText = (items, hideUnsupported) => {
                 return `~~${item.value}~~`;
             case 'MD.link': {
                 const v = item.value;
-                if (Number(hideUnsupported) >= 3)
+                if (Number(hideUnsupported) >= 3) {
                     return '';
+                }
                 return Number(hideUnsupported) >= 2 ? v.url : `[${v.text}](${v.url})`;
             }
             case 'MD.image':
@@ -52,8 +54,9 @@ const markdownToBubbleText = (items, hideUnsupported) => {
             case 'MD.content':
                 return item.value;
             case 'MD.button': {
-                if (Number(hideUnsupported) >= 3)
+                if (Number(hideUnsupported) >= 3) {
                     return '';
+                }
                 if (Number(hideUnsupported) >= 2) {
                     const btnData = item.options?.data || (typeof item.value === 'object' ? item.value.title : item.value);
                     return String(btnData);
@@ -71,16 +74,18 @@ const markdownToBubbleText = (items, hideUnsupported) => {
         .join('');
 };
 const markdownRawToBubbleText = (raw, hideUnsupported) => {
-    if (Number(hideUnsupported) >= 4)
+    if (Number(hideUnsupported) >= 4) {
         return '';
+    }
     if (hideUnsupported) {
         return raw.replace(/!\[([^\]]*)\]\([^)]*\)/g, '');
     }
     return raw;
 };
 const dataEnumToBubbleText = (item, hideUnsupported) => {
-    if (Number(hideUnsupported) >= 4)
+    if (Number(hideUnsupported) >= 4) {
         return '';
+    }
     switch (item.type) {
         case 'MarkdownOriginal':
             return markdownRawToBubbleText(String(item.value), hideUnsupported);

package/lib/index.js

@@ -292,6 +292,40 @@ const main = () => {
                 const res = await api.use.mention(event);
                 consume([createResult(ResultCode.Ok, '请求完成', res)]);
             }
+            else if (data.action === 'media.upload') {
+                const params = data.payload.params;
+                const fileData = params?.url ?? params?.data;
+                if (!fileData) {
+                    consume([createResult(ResultCode.FailParams, 'Missing url or data', null)]);
+                }
+                else {
+                    const res = await client
+                        .uploadFile(fileData, params?.name)
+                        .then(r => createResult(ResultCode.Ok, data.action, r))
+                        .catch(err => createResult(ResultCode.Fail, data.action, err));
+                    consume([res]);
+                }
+            }
+            else if (data.action === 'history.list') {
+                const res = await client
+                    .getChannelMessages(data.payload.ChannelId)
+                    .then(r => createResult(ResultCode.Ok, data.action, r))
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
+            else if (data.action === 'member.search') {
+                const guildId = data.payload.GuildId;
+                const keyword = data.payload.params?.keyword ?? '';
+                const res = await client
+                    .listGuildMembers(guildId)
+                    .then(r => {
+                    const list = Array.isArray(r) ? r : [];
+                    const filtered = list.filter((m) => (m.name ?? '').includes(keyword) || (m.username ?? '').includes(keyword));
+                    return createResult(ResultCode.Ok, data.action, filtered);
+                })
+                    .catch(err => createResult(ResultCode.Fail, data.action, err));
+                consume([res]);
+            }
             else {
                 consume([createResult(ResultCode.Fail, '未知请求，请尝试升级版本', null)]);
             }

package/lib/send.js

@@ -151,7 +151,10 @@ const sendToRoom = async (client, param, val) => {
         })
             .join('');
         const contentMd = buildBubbleMdContent(mdAndButtons);
-        const finalContent = [content, contentMd, fallbackText].filter(Boolean).join('\n').replace(/^[^\S\n\r]+|[^\S\n\r]+$/g, '');
+        const finalContent = [content, contentMd, fallbackText]
+            .filter(Boolean)
+            .join('\n')
+            .replace(/^[^\S\n\r]+|[^\S\n\r]+$/g, '');
         if (hide && !finalContent && images.length <= 0) {
             logger.info('[bubble] hideUnsupported: 消息内容转换后为空，跳过发送');
             return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/bubble",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "description": "bubble platform",
   "author": "lemonade",
   "license": "MIT",
@@ -36,18 +36,15 @@
           "name": "bubble"
         }
       ],
-      "logo": "antd.bubbleOutlined",
       "command": [
         {
           "name": "打开bubble",
-          "icon": "antd.bubbleOutlined",
           "command": "open.bubble"
         }
       ],
       "sidebars": [
         {
-          "name": "dc",
-          "icon": "antd.bubbleOutlined",
+          "name": "bubble",
           "command": "open.bubble"
         }
       ]
@@ -64,5 +61,6 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/lemonade-lab/alemonjs.git"
-  }
-}
+  },
+  "gitHead": "743b70375f728a1584ae149bbadcd04378540ade"
+}