alemonjs 1.0.7 → 1.0.9

package/lib/default/login/qq.js

@@ -8,8 +8,7 @@ export default {
     intents: [
         AvailableIntentsEventsEnum.GUILDS,
         AvailableIntentsEventsEnum.PUBLIC_GUILD_MESSAGES,
-        AvailableIntentsEventsEnum.DIRECT_MESSAGE,
-        AvailableIntentsEventsEnum.GUILD_MEMBERS
+        AvailableIntentsEventsEnum.DIRECT_MESSAGE
     ],
     isPrivate: false,
     sandbox: false

package/lib/define/index.js

@@ -5,3 +5,4 @@
  */
 export * from './api.js';
 export * from './main.js';
+export * from './types.js';

package/lib/define/main.js

@@ -5,8 +5,7 @@ import { nodeScripts } from './child_process.js';
 import { ClientAPIByQQ as ClientByNTQQ } from '../ntqq/sdk/index.js';
 import { createApp, loadInit, setBotConfigByKey, setLanchConfig, getPupPath, getBotConfigByKey, setAppRegex } from '../index.js';
 import { command } from './command.js';
-import { copyAppsFile } from './plugin.js';
-import { join } from 'path';
+import { AvailableIntentsEventsEnum } from 'qq-guild-bot';
 // 设置ntqq独立鉴权路径
 export const setAuthenticationByNtqq = ClientByNTQQ.setAuthentication;
 let appDir = 'application';
@@ -84,28 +83,59 @@ export async function defineAlemonConfig(Options) {
     const arr = [];
     /**
      * *********
-     * 启动机器人
+     * 登录机器人
      * *********
      */
     if (Options?.login) {
-        /**
-         * ********
-         * 配置载入
-         * *******
-         */
         if (Options.login?.discord) {
+            // 自定义覆盖
             setBotConfigByKey('discord', Options.login.discord);
         }
         if (Options.login?.qq) {
+            // 开启私域
+            if (Options.login?.qq?.isPrivate) {
+                setBotConfigByKey('qq', {
+                    intents: [
+                        // 基础事件
+                        AvailableIntentsEventsEnum.GUILDS,
+                        AvailableIntentsEventsEnum.GUILD_MEMBERS,
+                        AvailableIntentsEventsEnum.DIRECT_MESSAGE,
+                        // 需申请的
+                        AvailableIntentsEventsEnum.AUDIO_ACTION,
+                        AvailableIntentsEventsEnum.MESSAGE_AUDIT,
+                        AvailableIntentsEventsEnum.INTERACTION,
+                        AvailableIntentsEventsEnum.GUILD_MESSAGE_REACTIONS,
+                        // 私域特有
+                        AvailableIntentsEventsEnum.GUILD_MESSAGES,
+                        AvailableIntentsEventsEnum.FORUMS_EVENT //私域论坛
+                    ]
+                });
+            }
+            else {
+                setBotConfigByKey('qq', {
+                    intents: [
+                        // 基础事件
+                        AvailableIntentsEventsEnum.GUILDS,
+                        AvailableIntentsEventsEnum.GUILD_MEMBERS,
+                        AvailableIntentsEventsEnum.DIRECT_MESSAGE,
+                        // 公域特有
+                        AvailableIntentsEventsEnum.PUBLIC_GUILD_MESSAGES //公域事件
+                    ]
+                });
+            }
+            // 自定义覆盖
             setBotConfigByKey('qq', Options.login.qq);
         }
         if (Options.login?.ntqq) {
+            // 自定义覆盖
             setBotConfigByKey('ntqq', Options.login.ntqq);
         }
         if (Options.login?.kook) {
+            // 自定义覆盖
             setBotConfigByKey('kook', Options.login.kook);
         }
         if (Options.login?.villa) {
+            // 自定义覆盖
             setBotConfigByKey('villa', Options.login.villa);
         }
         for (const item in Options.login) {
@@ -147,23 +177,17 @@ export async function defineAlemonConfig(Options) {
             RegexClose: Options?.plugin?.RegexClose
         });
     }
-    /**
-     * ***************
-     * 是否同步文件
-     * ***************
-     */
-    if (Options?.plugin?.mountFile) {
-        copyAppsFile(join(process.cwd(), `/${address}`));
-    }
     /**
      * ************
      * 扫描插件
      * ************
      */
-    await loadInit({
-        mount: mount,
-        address: address == undefined ? '/application' : `/${address}`
-    });
+    if (Options?.plugin?.init) {
+        await loadInit({
+            mount: mount,
+            address: address == undefined ? '/application' : `/${address}`
+        });
+    }
     /**
      * ************
      * 编译独立插件

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "阿柠檬框架",
   "author": "ningmengchongshui",
   "main": "lib/index.js",

package/types/define/index.d.ts

@@ -5,3 +5,4 @@
  */
 export * from './api.js';
 export * from './main.js';
+export * from './types.js';

package/types/define/types.d.ts

@@ -59,14 +59,13 @@ export interface AlemonOptions {
      */
     plugin?: {
         /**
-         * 插件目录
+         * 是否加载插件
          */
-        directory?: string;
+        init?: boolean;
         /**
-         * 挂载文件
-         * default true
+         * 插件目录
          */
-        mountFile?: string;
+        directory?: string;
         /**
          * 插件名匹配规则
          */

package/lib/define/plugin.js

@@ -1,65 +0,0 @@
-import { existsSync, readdirSync, copyFileSync, mkdirSync } from 'fs';
-import { getAppRegex } from '../alemon/index.js';
-import { join } from 'path';
-/**
- * 遍历复制方法
- */
-const copyFiles = (source, destination) => {
-    if (!existsSync(destination)) {
-        mkdirSync(destination, { recursive: true });
-    }
-    const files = readdirSync(source);
-    for (const file of files) {
-        const sourcePath = join(source, file);
-        const destinationPath = join(destination, file);
-        copyFileSync(sourcePath, destinationPath);
-    }
-};
-/**
- * 同步挂载文件
- * @param dir 插件目录
- */
-export function copyAppsFile(dir) {
-    if (!existsSync(dir))
-        return;
-    const flies = readdirSync(dir);
-    if (flies.length === 0)
-        return;
-    const { RegexOpen, RegexClose } = getAppRegex();
-    // 插件名
-    const apps = flies
-        .filter(item => RegexOpen.test(item))
-        .filter(item => {
-        // 关闭符合条件的
-        if (!RegexClose) {
-            return true;
-        }
-        if (RegexClose.test(item)) {
-            return false;
-        }
-        return true;
-    });
-    for (const appname of apps) {
-        const appPath = join(dir, appname);
-        if (existsSync(`${appPath}/assets`)) {
-            const originalAddress = `${appPath}/assets`;
-            const destinationAddress = join(process.cwd(), `/assets/.${appname}/assets`);
-            copyFiles(originalAddress, destinationAddress);
-        }
-        if (existsSync(`${appPath}/pages`)) {
-            const originalAddress = `${appPath}/pages`;
-            const destinationAddress = join(process.cwd(), `/pages/.${appname}/pages`);
-            copyFiles(originalAddress, destinationAddress);
-        }
-        if (existsSync(`${appPath}/plugins`)) {
-            const originalAddress = `${appPath}/plugins`;
-            const destinationAddress = join(process.cwd(), `/plugins/.${appname}/plugins`);
-            copyFiles(originalAddress, destinationAddress);
-        }
-        if (existsSync(`${appPath}/server`)) {
-            const originalAddress = `${appPath}/server`;
-            const destinationAddress = join(process.cwd(), `/server/.${appname}/server`);
-            copyFiles(originalAddress, destinationAddress);
-        }
-    }
-}

package/types/define/plugin.d.ts

@@ -1,5 +0,0 @@
-/**
- * 同步挂载文件
- * @param dir 插件目录
- */
-export declare function copyAppsFile(dir: any): void;