@alemonjs/qq-bot 2.1.10 → 2.1.12

package/lib/config.d.ts

@@ -7,4 +7,4 @@ export type Options = {
     hideUnsupported?: boolean | number;
 } & sdkOptions;
 export declare const getQQBotConfig: () => Options;
-export declare const getMaster: (UserId: string) => readonly [any, string];
+export declare const getMaster: (UserId: string) => readonly [boolean, string];

package/lib/config.js

@@ -1,4 +1,4 @@
-import { getConfigValue, useUserHashKey } from 'alemonjs';
+import { getConfigValue, isMaster, createUserHashKey } from 'alemonjs';
 
 const platform = 'qq-bot';
 const getQQBotConfig = () => {
@@ -6,18 +6,12 @@ const getQQBotConfig = () => {
     return value[platform] || {};
 };
 const getMaster = (UserId) => {
-    const values = getConfigValue() || {};
-    const mainMasterKey = values.master_key || [];
-    const mainMasterId = values.master_id || [];
-    const config = getQQBotConfig();
-    const masterKey = config.master_key || [];
-    const masterId = config.master_id || [];
-    const UserKey = useUserHashKey({
+    const isMasterUser = isMaster(UserId, platform);
+    const UserKey = createUserHashKey({
         Platform: platform,
-        UserId: UserId
+        UserId
     });
-    const is = mainMasterKey.includes(UserKey) || mainMasterId.includes(UserId) || masterKey.includes(UserKey) || masterId.includes(UserId);
-    return [is, UserKey];
+    return [isMasterUser, UserKey];
 };
 
 export { getMaster, getQQBotConfig, platform };

package/lib/sends.js

@@ -96,7 +96,15 @@ const mdFormatters = {
     'MD.strikethrough': value => `~~${value}~~ `,
     'MD.blockquote': value => `\n> ${value} `,
     'MD.newline': () => '\n',
-    'MD.link': value => `[🔗${value.text}](${value.url}) `,
+    'MD.link': value => {
+        if (!value?.text && !value?.url) {
+            return '';
+        }
+        if (!value?.text || !value?.url) {
+            return `<${value?.url ?? value?.text}> `;
+        }
+        return `[🔗${value?.text}](${value?.url}) `;
+    },
     'MD.image': (value, options) => `\n![text #${options?.width || 208}px #${options?.height || 320}px](${value})\n`,
     'MD.mention': (value, options) => {
         const { belong } = options || {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/qq-bot",
-  "version": "2.1.10",
+  "version": "2.1.12",
   "description": "阿柠檬qq-bot平台连接",
   "author": "lemonade",
   "license": "MIT",
@@ -74,5 +74,5 @@
     "type": "git",
     "url": "https://github.com/lemonade-lab/alemonjs.git"
   },
-  "gitHead": "6f36000eddf636146e6e3d7218237ffbd7c4e4c5"
+  "gitHead": "8cee61f217e7e72eebc4342513e32232da05167a"
 }