alemonjs 2.1.49 → 2.1.52

package/lib/app/message-api.js

@@ -36,7 +36,7 @@ class MessageDirect {
             payload: {
                 ChannelId: params.SpaceId,
                 params: {
-                    format: params.format.value,
+                    format: Array.isArray(params.format) ? params.format : params.format.value,
                     replyId: params?.replyId
                 }
             }
@@ -56,49 +56,17 @@ class MessageDirect {
             payload: {
                 UserId: params.OpenID,
                 params: {
-                    format: params.format.value
+                    format: Array.isArray(params.format) ? params.format : params.format.value
                 }
             }
         });
     }
 }
-const sendToChannel = async (SpaceId, data) => {
-    if (!SpaceId || typeof SpaceId !== 'string') {
-        logger.error({
-            code: ResultCode.FailParams,
-            message: 'Invalid SpaceId: SpaceId must be a string',
-            data: null
-        });
-        throw new Error('Invalid SpaceId: SpaceId must be a string');
-    }
-    return await sendAction({
-        action: 'message.send.channel',
-        payload: {
-            ChannelId: SpaceId,
-            params: {
-                format: data
-            }
-        }
-    });
+const sendToChannel = (SpaceId, data) => {
+    return MessageDirect.create().sendToChannel({ SpaceId, format: data, replyId: undefined });
 };
-const sendToUser = async (OpenID, data) => {
-    if (!OpenID || typeof OpenID !== 'string') {
-        logger.error({
-            code: ResultCode.FailParams,
-            message: 'Invalid OpenID: OpenID must be a string',
-            data: null
-        });
-        throw new Error('Invalid OpenID: OpenID must be a string');
-    }
-    return await sendAction({
-        action: 'message.send.user',
-        payload: {
-            UserId: OpenID,
-            params: {
-                format: data
-            }
-        }
-    });
+const sendToUser = (OpenID, data) => {
+    return MessageDirect.create().sendToUser({ OpenID, format: data });
 };
 const getMessageIntent = async () => {
     const results = await sendAction({

package/lib/app/message-format.d.ts

@@ -1,4 +1,4 @@
-import { DataButtonGroup, DataMarkDown, DataEnums, EventKeys, Events } from '../types';
+import { DataButtonGroup, DataMarkDown, DataEnums } from '../types';
 import { Text, Image, Link, ImageFile, ImageURL, Mention, BT, MD, MarkdownOriginal, Attachment, Audio, Video } from './message-format-old.js';
 export * from './message-format-old.js';
 export declare class FormatButtonGroup {
@@ -56,15 +56,3 @@ export declare class Format {
     addImageURL(...args: Parameters<typeof ImageURL>): this;
     clear(): this;
 }
-export declare function createEvent<T extends EventKeys>(options: {
-    event: any;
-    selects: T | T[];
-    regular?: RegExp;
-    prefix?: string;
-    exact?: string;
-}): Events[T] & {
-    selects: boolean;
-    regular: boolean;
-    prefix: boolean;
-    exact: boolean;
-};

package/lib/app/message-format.js

@@ -206,29 +206,5 @@ class Format {
         return this;
     }
 }
-function createEvent(options) {
-    const { event, selects, regular, prefix, exact } = options;
-    const { name, MessageText } = event || {};
-    const selectsArr = Array.isArray(selects) ? selects : [selects];
-    const o = {
-        selects: false,
-        regular: false,
-        prefix: false,
-        exact: false
-    };
-    if (selectsArr.includes(name)) {
-        o.selects = true;
-    }
-    if (exact && MessageText && MessageText === exact) {
-        o.exact = true;
-    }
-    if (prefix && MessageText?.startsWith(prefix)) {
-        o.prefix = true;
-    }
-    if (regular && MessageText && new RegExp(regular).test(MessageText)) {
-        o.regular = true;
-    }
-    return { ...event, ...o };
-}
 
-export { Attachment, Audio, BT, Format, FormatButtonGroup, FormatMarkDown, Image, ImageFile, ImageURL, Link, MD, MarkdownOriginal, Mention, Text, Video, createEvent };
+export { Attachment, Audio, BT, Format, FormatButtonGroup, FormatMarkDown, Image, ImageFile, ImageURL, Link, MD, MarkdownOriginal, Mention, Text, Video };

package/lib/cbp/connects/platform.js

@@ -185,7 +185,7 @@ const cbpPlatform = (url, options = {
     };
     const currentURL = createCurrentURL() || `ws://localhost:${process.env.port || 17117}`;
     const send = (data) => {
-        if (global.chatbotPlatform && global.chatbotPlatform.readyState === WebSocket.OPEN) {
+        if (global.chatbotPlatform?.readyState === WebSocket.OPEN) {
             data.DeviceId = deviceId;
             data.CreateAt = Date.now();
             global.chatbotPlatform.send(flattedJSON.stringify(sanitizeForSerialization(data)));
@@ -194,7 +194,7 @@ const cbpPlatform = (url, options = {
     const actionReplys = [];
     const apiReplys = [];
     const replyAction = (data, payload) => {
-        if (global.chatbotPlatform && global.chatbotPlatform.readyState === WebSocket.OPEN) {
+        if (global.chatbotPlatform?.readyState === WebSocket.OPEN) {
             global.chatbotPlatform.send(flattedJSON.stringify({
                 action: data.action,
                 payload: payload,
@@ -204,7 +204,7 @@ const cbpPlatform = (url, options = {
         }
     };
     const replyApi = (data, payload) => {
-        if (global.chatbotPlatform && global.chatbotPlatform.readyState === WebSocket.OPEN) {
+        if (global.chatbotPlatform?.readyState === WebSocket.OPEN) {
             global.chatbotPlatform.send(flattedJSON.stringify({
                 action: data.action,
                 apiId: data.apiId,

package/lib/cbp/server/main.js

@@ -15,7 +15,7 @@ import { getClientChild } from '../../process/ipc-bridge.js';
 const routeMessageToDevice = (DeviceId, message) => {
     if (childrenClient.has(DeviceId)) {
         const clientWs = childrenClient.get(DeviceId);
-        if (clientWs && clientWs.readyState === WebSocket.OPEN) {
+        if (clientWs?.readyState === WebSocket.OPEN) {
             clientWs.send(message);
         }
         else {
@@ -24,7 +24,7 @@ const routeMessageToDevice = (DeviceId, message) => {
     }
     else if (fullClient.has(DeviceId)) {
         const clientWs = fullClient.get(DeviceId);
-        if (clientWs && clientWs.readyState === WebSocket.OPEN) {
+        if (clientWs?.readyState === WebSocket.OPEN) {
             clientWs.send(message);
         }
         else {
@@ -90,7 +90,7 @@ const handleEvent = (message, ID) => {
         });
         if (bindId) {
             const clientWs = childrenClient.get(bindId);
-            if (clientWs && clientWs.readyState === WebSocket.OPEN) {
+            if (clientWs?.readyState === WebSocket.OPEN) {
                 bindChannelToClient(ID, bindId);
                 clientWs.send(message);
             }
@@ -118,7 +118,7 @@ const handleEvent = (message, ID) => {
         return;
     }
     const clientWs = childrenClient.get(bindId);
-    if (!clientWs || clientWs.readyState !== WebSocket.OPEN) {
+    if (clientWs?.readyState !== WebSocket.OPEN) {
         childrenClient.delete(bindId);
         reBind();
         return;
@@ -129,7 +129,7 @@ const setChildrenClient = (originId, ws) => {
     childrenClient.set(originId, ws);
     ws.on('message', (message) => {
         if (global.__sandbox) {
-            if (global.testoneClient && global.testoneClient.readyState === WebSocket.OPEN) {
+            if (global.testoneClient?.readyState === WebSocket.OPEN) {
                 global.testoneClient.send(message.toString());
             }
             return;
@@ -166,7 +166,7 @@ const setFullClient = (originId, ws) => {
     fullClient.set(originId, ws);
     ws.on('message', (message) => {
         if (global.__sandbox) {
-            if (global.testoneClient && global.testoneClient.readyState === WebSocket.OPEN) {
+            if (global.testoneClient?.readyState === WebSocket.OPEN) {
                 global.testoneClient.send(message.toString());
             }
             return;

package/lib/core/utils.js

@@ -1,13 +1,13 @@
 import { createHash as createHash$1 } from 'node:crypto';
 import fs__default, { existsSync, readdirSync } from 'fs';
 import path__default, { join } from 'path';
-import { fileSuffixResponse, ResultCode } from './variable.js';
-import module from 'module';
+import { ResultCode, fileSuffixResponse } from './variable.js';
+import module$1 from 'module';
 import { getConfigValue } from './config.js';
 
 const initRequire = () => { };
 initRequire.resolve = () => '';
-const require = module?.createRequire?.(import.meta.url) ?? initRequire;
+const require$1 = module$1?.createRequire?.(import.meta.url) ?? initRequire;
 const createHash = (str, options = {}) => {
     const { length = 11, algorithm = 'sha256' } = options;
     const hash = createHash$1(algorithm).update(str).digest('hex');
@@ -117,7 +117,7 @@ const showErrorModule = (e) => {
     });
 };
 const sanitizeForSerialization = (data) => {
-    const flatted = require('flatted');
+    const flatted = require$1('flatted');
     return flatted.parse(flatted.stringify(data));
 };
 const createExports = (packageJson) => {
@@ -133,7 +133,7 @@ const createExports = (packageJson) => {
 const getInputExportPath = (input) => {
     const packageJsonPath = path__default.join(input ?? process.cwd(), 'package.json');
     if (fs__default.existsSync(packageJsonPath)) {
-        const packageJson = require(packageJsonPath);
+        const packageJson = require$1(packageJsonPath);
         const main = packageJson?.main || createExports(packageJson);
         if (main) {
             return main;

package/lib/index.js

@@ -13,6 +13,7 @@ export { definePlatform } from './app/define-platform.js';
 export { defineResponse } from './app/define-response.js';
 export { defineMiddleware } from './app/define-middleware.js';
 export { defineRouter, lazy } from './app/define-router.js';
+export { FormatEvent, wrapEvent } from './app/event-format.js';
 export { onGroup } from './app/event-group.js';
 export { OnMiddleware, onMiddleware } from './app/event-middleware.js';
 export { OnProcessor, onProcessor } from './app/event-processor.js';
@@ -36,10 +37,11 @@ export { useReaction } from './app/hook-use/reaction.js';
 export { useRequest } from './app/hook-use/request.js';
 export { useRole } from './app/hook-use/role.js';
 export { useUser } from './app/hook-use/user.js';
-export { getCurrentEvent, withEventContext } from './app/hook-event-context.js';
+export { useObserver, useSubscribe } from './app/hook-use/subscribe.js';
+export { createEvent, useEvent } from './app/hook-use/event.js';
+export { getCurrentEvent, getCurrentNext, withEventContext } from './app/hook-event-context.js';
 export { createEventValue, createSelects, onSelects, onState, unChildren, unState, useState } from './app/event-utils.js';
-export { useObserver, useSubscribe } from './app/hook-use-subscribe.js';
 export { MessageDirect, createDataFormat, format, getMessageIntent, sendToChannel, sendToUser } from './app/message-api.js';
-export { Format, FormatButtonGroup, FormatMarkDown, createEvent } from './app/message-format.js';
+export { Format, FormatButtonGroup, FormatMarkDown } from './app/message-format.js';
 export { start } from './main.js';
 export { Attachment, Audio, BT, Button, Image, ImageFile, ImageURL, Link, MD, Markdown, MarkdownOriginal, Mention, Text, Video } from './app/message-format-old.js';

package/lib/process/module.js

@@ -2,12 +2,12 @@ import childProcess from 'child_process';
 import { ResultCode } from '../core/variable.js';
 import { getConfigValue } from '../core/config.js';
 import '../core/utils.js';
-import module from 'module';
+import module$1 from 'module';
 import { setClientChild, forwardFromClient } from './ipc-bridge.js';
 
 const initRequire = () => { };
 initRequire.resolve = () => '';
-const require = module?.createRequire?.(import.meta.url) ?? initRequire;
+const require$1 = module$1?.createRequire?.(import.meta.url) ?? initRequire;
 function startModuleAdapter() {
     const values = getConfigValue();
     const pro = values?.process ?? {};
@@ -17,7 +17,7 @@ function startModuleAdapter() {
         FORK_TIMEOUT: pro?.fork_timeout ?? 6000
     };
     try {
-        modulePath = require.resolve('../client.js');
+        modulePath = require$1.resolve('../client.js');
     }
     catch (error) {
         logger?.warn?.({

package/lib/process/platform.js

@@ -2,12 +2,12 @@ import childProcess from 'child_process';
 import { ResultCode } from '../core/variable.js';
 import { getConfigValue } from '../core/config.js';
 import '../core/utils.js';
-import module from 'module';
+import module$1 from 'module';
 import { setPlatformChild, forwardFromPlatform } from './ipc-bridge.js';
 
 const initRequire = () => { };
 initRequire.resolve = () => '';
-const require = module?.createRequire?.(import.meta.url) ?? initRequire;
+const require$1 = module$1?.createRequire?.(import.meta.url) ?? initRequire;
 function startPlatformAdapterWithFallback() {
     const values = getConfigValue();
     const pro = values?.process ?? {};
@@ -29,7 +29,7 @@ function startPlatformAdapterWithFallback() {
     let isForkFailed = false;
     let imported = false;
     try {
-        modulePath = require.resolve(platformPath);
+        modulePath = require$1.resolve(platformPath);
     }
     catch {
         logger?.warn?.({

package/lib/server/routers/router.js

@@ -3,16 +3,16 @@ import fs__default, { existsSync } from 'fs';
 import path__default, { join, dirname } from 'path';
 import mime from 'mime-types';
 import hello from './hello.html.js';
-import { getModuelFile, formatPath } from './utils.js';
+import { safePath, getModuelFile, formatPath, isValidPackageName } from './utils.js';
 import { collectMiddlewares, runMiddlewares } from './middleware.js';
 import { ResultCode } from '../../core/variable.js';
 import 'yaml';
 import '../../core/utils.js';
-import module from 'module';
+import module$1 from 'module';
 
 const initRequire = () => { };
 initRequire.resolve = () => '';
-const require = module?.createRequire?.(import.meta.url) ?? initRequire;
+const require$1 = module$1?.createRequire?.(import.meta.url) ?? initRequire;
 const mainDirMap = new Map();
 const router = new KoaRouter({
     prefix: '/'
@@ -55,7 +55,17 @@ router.all('app/{*path}', async (ctx) => {
         }
         const mainDir = dirname(mainPath);
         try {
-            const dir = join(mainDir, 'route', ctx.path?.replace(apiPath, '/api') || '');
+            const routeBase = join(mainDir, 'route');
+            const dir = safePath(routeBase, ctx.path?.replace(apiPath, '/api') || '');
+            if (!dir) {
+                ctx.status = 403;
+                ctx.body = {
+                    code: 403,
+                    message: '非法路径',
+                    data: null
+                };
+                return;
+            }
             if (existsSync(dir) && fs__default.statSync(dir).isFile()) {
                 ctx.status = 404;
                 ctx.body = {
@@ -102,7 +112,7 @@ router.all('app/{*path}', async (ctx) => {
     let root = '';
     const resourcePath = formatPath(ctx.params?.path);
     try {
-        const pkg = require(path__default.join(rootPath, 'package.json')) ?? {};
+        const pkg = require$1(path__default.join(rootPath, 'package.json')) ?? {};
         root = pkg.alemonjs?.web?.root ?? '';
     }
     catch (err) {
@@ -114,7 +124,17 @@ router.all('app/{*path}', async (ctx) => {
         };
         return;
     }
-    const fullPath = root ? path__default.join(rootPath, root, resourcePath) : path__default.join(rootPath, resourcePath);
+    const webRoot = root ? path__default.join(rootPath, root) : rootPath;
+    const fullPath = safePath(webRoot, resourcePath);
+    if (!fullPath) {
+        ctx.status = 403;
+        ctx.body = {
+            code: 403,
+            message: '非法路径',
+            data: null
+        };
+        return;
+    }
     try {
         const file = await fs__default.promises.readFile(fullPath);
         const mimeType = mime.lookup(fullPath) || 'application/octet-stream';
@@ -146,11 +166,20 @@ router.all('app', ctx => {
 });
 router.all('apps/:app/{*path}', async (ctx) => {
     const appName = ctx.params.app;
+    if (!isValidPackageName(appName)) {
+        ctx.status = 400;
+        ctx.body = {
+            code: 400,
+            message: '无效的应用名称',
+            data: null
+        };
+        return;
+    }
     const apiPath = `/apps/${appName}/api`;
     if (ctx.path.startsWith(apiPath)) {
         try {
             if (!mainDirMap.has(appName)) {
-                const mainPath = require.resolve(appName);
+                const mainPath = require$1.resolve(appName);
                 if (!existsSync(mainPath)) {
                     ctx.status = 400;
                     ctx.body = {
@@ -163,7 +192,17 @@ router.all('apps/:app/{*path}', async (ctx) => {
                 const mainDir = dirname(mainPath);
                 mainDirMap.set(appName, mainDir);
             }
-            const dir = join(mainDirMap.get(appName), 'route', ctx.path?.replace(apiPath, '/api') || '');
+            const routeBase = join(mainDirMap.get(appName), 'route');
+            const dir = safePath(routeBase, ctx.path?.replace(apiPath, '/api') || '');
+            if (!dir) {
+                ctx.status = 403;
+                ctx.body = {
+                    code: 403,
+                    message: '非法路径',
+                    data: null
+                };
+                return;
+            }
             if (existsSync(dir) && fs__default.statSync(dir).isFile()) {
                 ctx.status = 404;
                 ctx.body = {
@@ -215,7 +254,7 @@ router.all('apps/:app/{*path}', async (ctx) => {
     const resourcePath = formatPath(ctx.params?.path);
     let root = '';
     try {
-        const pkg = require(`${appName}/package`) ?? {};
+        const pkg = require$1(`${appName}/package`) ?? {};
         root = pkg?.alemonjs?.web?.root ?? '';
     }
     catch (err) {
@@ -227,7 +266,17 @@ router.all('apps/:app/{*path}', async (ctx) => {
         };
         return;
     }
-    const fullPath = root ? path__default.join(rootPath, root, resourcePath) : path__default.join(rootPath, resourcePath);
+    const webRoot = root ? path__default.join(rootPath, root) : rootPath;
+    const fullPath = safePath(webRoot, resourcePath);
+    if (!fullPath) {
+        ctx.status = 403;
+        ctx.body = {
+            code: 403,
+            message: '非法路径',
+            data: null
+        };
+        return;
+    }
     try {
         const file = await fs__default.promises.readFile(fullPath);
         const mimeType = mime.lookup(fullPath) || 'application/octet-stream';

package/lib/server/routers/utils.d.ts

@@ -1,2 +1,4 @@
+export declare const safePath: (root: string, untrusted: string) => string | null;
+export declare const isValidPackageName: (name: string) => boolean;
 export declare const getModuelFile: (dir: string) => string;
 export declare const formatPath: (path: string) => string;

package/lib/server/routers/utils.js

@@ -1,5 +1,16 @@
 import fs__default, { existsSync } from 'fs';
+import path__default from 'path';
 
+const safePath = (root, untrusted) => {
+    const resolved = path__default.resolve(root, untrusted);
+    if (resolved !== root && !resolved.startsWith(root + path__default.sep)) {
+        return null;
+    }
+    return resolved;
+};
+const isValidPackageName = (name) => {
+    return /^(?:@[a-z0-9\-~][a-z0-9\-._~]*\/)?[a-z0-9\-~][a-z0-9\-._~]*$/.test(name);
+};
 const getModuelFile = (dir) => {
     const dirMap = {
         '.js': `${dir}.js`,
@@ -36,4 +47,4 @@ const formatPath = (path) => {
     return path;
 };
 
-export { formatPath, getModuelFile };
+export { formatPath, getModuelFile, isValidPackageName, safePath };

package/lib/types/event/base/platform.d.ts

@@ -1,4 +1,4 @@
-export type platform = {
+export type Platform = {
     Platform: string;
     value: any;
     BotId?: string;

package/lib/types/event/builder.d.ts

@@ -0,0 +1,36 @@
+import { Guild, Channel } from './base/guild';
+import { Message, MessageText, MessageMedia, MessageOpen } from './base/message';
+import { Platform } from './base/platform';
+import { User } from './base/user';
+import { AutoFields } from './base/auto';
+import { EventKeys, Events } from './map';
+export type ReservedEventKeys = keyof Guild | keyof Channel | keyof User | keyof Message | keyof MessageText | keyof MessageMedia | keyof MessageOpen | keyof Platform | keyof AutoFields | 'name' | 'Timestamp';
+type GuildMethods<T extends EventKeys> = Events[T] extends Guild ? {
+    addGuild(params: Guild): EventBuilder<T>;
+} : Record<string, never>;
+type ChannelMethods<T extends EventKeys> = Events[T] extends Channel ? {
+    addChannel(params: Channel): EventBuilder<T>;
+} : Record<string, never>;
+type UserMethods<T extends EventKeys> = Events[T] extends User ? {
+    addUser(params: User): EventBuilder<T>;
+} : Record<string, never>;
+type MessageMethods<T extends EventKeys> = Events[T] extends Message ? {
+    addMessage(params: Message): EventBuilder<T>;
+} : Record<string, never>;
+type TextMethods<T extends EventKeys> = Events[T] extends MessageText ? {
+    addText(params: MessageText): EventBuilder<T>;
+} : Record<string, never>;
+type MediaMethods<T extends EventKeys> = Events[T] extends MessageMedia ? {
+    addMedia(params: MessageMedia): EventBuilder<T>;
+} : Record<string, never>;
+type OpenMethods<T extends EventKeys> = Events[T] extends MessageOpen ? {
+    addOpen(params: MessageOpen): EventBuilder<T>;
+} : Record<string, never>;
+export type EventBuilder<T extends EventKeys> = {
+    addPlatform(params: Platform): EventBuilder<T>;
+    add<E extends Record<string, unknown>>(fields: {
+        [K in keyof E]: K extends ReservedEventKeys ? never : E[K];
+    }): EventBuilder<T>;
+    readonly value: Events[T];
+} & GuildMethods<T> & ChannelMethods<T> & UserMethods<T> & MessageMethods<T> & TextMethods<T> & MediaMethods<T> & OpenMethods<T>;
+export {};

package/lib/types/event/builder.js

@@ -0,0 +1 @@
+

package/lib/types/event/channel/index.d.ts

@@ -1,13 +1,13 @@
 import { Guild, Channel } from '../base/guild';
-import { platform } from '../base/platform';
+import { Platform } from '../base/platform';
 import { Message } from '../base/message';
 import { Expansion } from '../base/expansion';
-export type PublicEventChannelCreate = platform & Guild & Channel & Message & {
+export type PublicEventChannelCreate = Platform & Guild & Channel & Message & {
     name: 'channel.create';
 } & Expansion;
-export type PublicEventChannelDelete = platform & Guild & Channel & Message & {
+export type PublicEventChannelDelete = Platform & Guild & Channel & Message & {
     name: 'channel.delete';
 } & Expansion;
-export type PublicEventChannelUpdate = platform & Guild & Channel & Message & {
+export type PublicEventChannelUpdate = Platform & Guild & Channel & Message & {
     name: 'channel.update';
 } & Expansion;

package/lib/types/event/guild/index.d.ts

@@ -1,14 +1,14 @@
 import { Expansion } from '../base/expansion';
 import { Channel, Guild } from '../base/guild';
 import { Message } from '../base/message';
-import { platform } from '../base/platform';
+import { Platform } from '../base/platform';
 import { User } from '../base/user';
-export type PublicEventGuildJoin = platform & Guild & Channel & Message & User & {
+export type PublicEventGuildJoin = Platform & Guild & Channel & Message & User & {
     name: 'guild.join';
 } & Expansion;
-export type PublicEventGuildExit = platform & Guild & Channel & Message & User & {
+export type PublicEventGuildExit = Platform & Guild & Channel & Message & User & {
     name: 'guild.exit';
 } & Expansion;
-export type PublicEventGuildUpdate = platform & Guild & Channel & Message & {
+export type PublicEventGuildUpdate = Platform & Guild & Channel & Message & {
     name: 'guild.update';
 } & Expansion;

package/lib/types/event/interaction/index.d.ts

@@ -1,11 +1,11 @@
 import { Guild, Channel } from '../base/guild';
 import { Message, MessageOpen, MessageText } from '../base/message';
 import { User } from '../base/user';
-import { platform } from '../base/platform';
+import { Platform } from '../base/platform';
 import { Expansion } from '../base/expansion';
-export type PrivateEventInteractionCreate = MessageText & MessageOpen & platform & Message & User & {
+export type PrivateEventInteractionCreate = MessageText & MessageOpen & Platform & Message & User & {
     name: 'private.interaction.create';
 } & Expansion;
-export type PublicEventInteractionCreate = MessageText & MessageOpen & platform & Guild & Channel & Message & User & {
+export type PublicEventInteractionCreate = MessageText & MessageOpen & Platform & Guild & Channel & Message & User & {
     name: 'interaction.create';
 } & Expansion;

package/lib/types/event/member/index.d.ts

@@ -1,20 +1,20 @@
 import { Guild, Channel } from '../base/guild';
 import { Message } from '../base/message';
 import { User } from '../base/user';
-import { platform } from '../base/platform';
+import { Platform } from '../base/platform';
 import { Expansion } from '../base/expansion';
-export type PublicEventMemberAdd = platform & Guild & Channel & Message & User & {
+export type PublicEventMemberAdd = Platform & Guild & Channel & Message & User & {
     name: 'member.add';
 } & Expansion;
-export type PublicEventMemberRemove = platform & Guild & Channel & Message & User & {
+export type PublicEventMemberRemove = Platform & Guild & Channel & Message & User & {
     name: 'member.remove';
 } & Expansion;
-export type PublicEventMemberBan = platform & Guild & Channel & Message & User & {
+export type PublicEventMemberBan = Platform & Guild & Channel & Message & User & {
     name: 'member.ban';
 } & Expansion;
-export type PublicEventMemberUnban = platform & Guild & Channel & Message & User & {
+export type PublicEventMemberUnban = Platform & Guild & Channel & Message & User & {
     name: 'member.unban';
 } & Expansion;
-export type PublicEventMemberUpdate = platform & Guild & Channel & Message & User & {
+export type PublicEventMemberUpdate = Platform & Guild & Channel & Message & User & {
     name: 'member.update';
 } & Expansion;

package/lib/types/event/message/message.d.ts

@@ -1,23 +1,23 @@
 import { Guild, Channel } from '../base/guild';
 import { Message, MessageMedia, MessageOpen, MessageText } from '../base/message';
 import { User } from '../base/user';
-import { platform } from '../base/platform';
+import { Platform } from '../base/platform';
 import { Expansion } from '../base/expansion';
-export type PublicEventMessageCreate = MessageText & MessageMedia & MessageOpen & platform & Guild & Channel & Message & User & {
+export type PublicEventMessageCreate = MessageText & MessageMedia & MessageOpen & Platform & Guild & Channel & Message & User & {
     name: 'message.create';
 } & Expansion;
-export type PublicEventMessageUpdate = platform & Guild & Channel & Message & User & {
+export type PublicEventMessageUpdate = Platform & Guild & Channel & Message & User & {
     name: 'message.update';
 } & Expansion;
-export type PublicEventMessageDelete = platform & Guild & Channel & Message & {
+export type PublicEventMessageDelete = Platform & Guild & Channel & Message & {
     name: 'message.delete';
 } & Expansion;
-export type PublicEventMessageReactionAdd = platform & Guild & Channel & Message & {
+export type PublicEventMessageReactionAdd = Platform & Guild & Channel & Message & {
     name: 'message.reaction.add';
 } & Expansion;
-export type PublicEventMessageReactionRemove = platform & Guild & Channel & Message & {
+export type PublicEventMessageReactionRemove = Platform & Guild & Channel & Message & {
     name: 'message.reaction.remove';
 } & Expansion;
-export type PublicEventMessagePin = platform & Guild & Channel & Message & {
+export type PublicEventMessagePin = Platform & Guild & Channel & Message & {
     name: 'message.pin';
 } & Expansion;

package/lib/types/event/message/private.message.d.ts

@@ -1,13 +1,13 @@
 import { Expansion } from '../base/expansion';
 import { Message, MessageMedia, MessageOpen, MessageText } from '../base/message';
-import { platform } from '../base/platform';
+import { Platform } from '../base/platform';
 import { User } from '../base/user';
-export type PrivateEventMessageCreate = MessageText & MessageMedia & MessageOpen & platform & Message & User & {
+export type PrivateEventMessageCreate = MessageText & MessageMedia & MessageOpen & Platform & Message & User & {
     name: 'private.message.create';
 } & Expansion;
-export type PrivateEventMessageUpdate = platform & Message & User & {
+export type PrivateEventMessageUpdate = Platform & Message & User & {
     name: 'private.message.update';
 } & Expansion;
-export type PrivateEventMessageDelete = platform & Message & {
+export type PrivateEventMessageDelete = Platform & Message & {
     name: 'private.message.delete';
 } & Expansion;