@alemonjs/telegram 0.0.4 → 0.1.0

package/lib/index.d.ts

@@ -1,3 +1,7 @@
+import TelegramClient from 'node-telegram-bot-api';
+
+type Client = typeof TelegramClient.prototype;
+declare const client: Client;
 declare const _default: () => typeof global.alemonjs;
 
-export { _default as default };
+export { type Client, client, _default as default };

package/lib/index.js

@@ -1,7 +1,7 @@
 import { defineBot, getConfig, Text, OnProcessor, useParse } from 'alemonjs';
-import Client from 'node-telegram-bot-api';
+import TelegramClient from 'node-telegram-bot-api';
 
-process.env.NODE_NO_WARNINGS = '1';
+const client = global.client;
 var index = defineBot(() => {
     //
     const cfg = getConfig();
@@ -9,7 +9,7 @@ var index = defineBot(() => {
     if (!config)
         return;
     //
-    const client = new Client(config.token, {
+    const client = new TelegramClient(config.token, {
         polling: true,
         baseApiUrl: config?.base_api_url ?? '',
         request: {
@@ -17,7 +17,7 @@ var index = defineBot(() => {
             proxy: config?.proxy ?? ''
         }
     });
-    const getUserProfilePhotosUrl = UserId => {
+    const getUserProfilePhotosUrl = (UserId) => {
         return new Promise((resolve, reject) => {
             if (!UserId) {
                 reject(new Error('UserId 不能为空'));
@@ -48,14 +48,14 @@ var index = defineBot(() => {
     //
     client.on('text', async (event) => {
         let UserAvatar = '';
-        if (event?.chat.type == 'channel' || event?.chat.type == 'private') {
+        if (event?.chat.type == 'supergroup' || event?.chat.type == 'private') {
             const photo = await getUserProfilePhotosUrl(event?.from?.id).catch(console.error);
             if (typeof photo == 'string')
                 UserAvatar = photo;
         }
-        if (event?.chat.type == 'channel' || event.chat.type == 'supergroup') {
+        if (event?.chat.type == 'channel' || event?.chat.type == 'supergroup') {
             // 机器人消息不处理
-            if (event.from?.is_bot)
+            if (event?.from?.is_bot)
                 return;
             // 定义消
             const e = {
@@ -67,6 +67,8 @@ var index = defineBot(() => {
                 GuildName: event?.chat.title,
                 // 子频道
                 ChannelId: String(event?.chat.id),
+                GuildIdAvatar: '',
+                GuildIdName: '',
                 // 是否是主人
                 IsMaster: false,
                 // 用户ID
@@ -78,9 +80,9 @@ var index = defineBot(() => {
                 // 格式化数据
                 MsgId: String(event?.message_id),
                 // 用户消息
-                Megs: [Text(event?.text)],
+                MessageBody: [Text(event?.text)],
                 // 用户openId
-                OpenID: String(event.chat?.id),
+                OpenID: String(event?.chat?.id),
                 // 创建时间
                 CreateAt: Date.now(),
                 //
@@ -109,14 +111,18 @@ var index = defineBot(() => {
                 UserId: String(event?.from.id),
                 // 用户名
                 UserName: event?.from?.username,
+                GuildIdName: '',
+                GuildIdAvatar: '',
+                ChannelName: '',
                 // 用户头像
                 UserAvatar: UserAvatar,
                 // 格式化数据
                 MsgId: String(event?.message_id),
                 // 用户消息
-                Megs: [Text(event?.text)],
+                MessageBody: [Text(event?.text)],
+                MessageText: event?.text,
                 // 用户openId
-                OpenID: String(event.chat?.id),
+                OpenID: String(event?.chat?.id),
                 // 创建时间
                 CreateAt: Date.now(),
                 //
@@ -134,6 +140,58 @@ var index = defineBot(() => {
             OnProcessor(e, 'private.message.create');
         }
     });
+    client.on('new_chat_members', async (event) => {
+        // 机器人消息不处理
+        if (event?.from.is_bot)
+            return;
+        let UserAvatar = '';
+        const photo = await getUserProfilePhotosUrl(event?.from?.id).catch(console.error);
+        if (typeof photo == 'string')
+            UserAvatar = photo;
+        // 定义消
+        const e = {
+            // 事件类型
+            Platform: 'telegram',
+            // 频道
+            GuildId: String(event?.chat.id),
+            // 频道名称
+            GuildName: event?.chat.title,
+            // 子频道
+            ChannelId: String(event?.chat.id),
+            GuildIdAvatar: '',
+            GuildIdName: '',
+            // 是否是主人
+            IsMaster: false,
+            // 用户ID
+            UserId: String(event?.from?.id),
+            // 用户名
+            UserName: event?.chat.username,
+            // 用户头像
+            UserAvatar: UserAvatar,
+            // 格式化数据
+            MsgId: String(event?.message_id),
+            // 用户消息
+            MessageBody: [Text(event?.text)],
+            //
+            MessageText: event?.text,
+            // 用户openId
+            OpenID: String(event?.chat?.id),
+            // 创建时间
+            CreateAt: Date.now(),
+            //
+            tag: 'txt',
+            //
+            value: null
+        };
+        // 当访问的时候获取
+        Object.defineProperty(e, 'value', {
+            get() {
+                return event;
+            }
+        });
+        //
+        OnProcessor(e, 'member.add');
+    });
     // const eventKeys = [
     //   'message',
     //   'text',
@@ -201,6 +259,7 @@ var index = defineBot(() => {
     //     console.log(key, event)
     //   })
     // }
+    global.client = client;
     return {
         api: {
             use: {
@@ -209,12 +268,16 @@ var index = defineBot(() => {
                         return Promise.all([]);
                     if (val.length < 0)
                         return Promise.all([]);
-                    const content = useParse(val, 'Text');
-                    const e = event.value;
+                    const content = useParse({
+                        MessageBody: val
+                    }, 'Text');
+                    const e = event?.value;
                     if (content) {
                         return Promise.all([content].map(item => client.sendMessage(e.chat.id, item)));
                     }
-                    const images = useParse(val, 'Image');
+                    const images = useParse({
+                        MessageBody: val
+                    }, 'Image');
                     if (images) {
                         return Promise.all(images.map(item => client.sendPhoto(e.chat.id, item)));
                     }
@@ -225,4 +288,4 @@ var index = defineBot(() => {
     };
 });
 
-export { index as default };
+export { client, index as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/telegram",
-  "version": "0.0.4",
+  "version": "0.1.0",
   "description": "telegram-bot",
   "author": "lemonade",
   "license": "MIT",
@@ -31,9 +31,9 @@
     "registry": "https://registry.npmjs.org",
     "access": "public"
   },
-  "bugs": "https://github.com/ningmengchongshui/alemonjs/issues",
+  "bugs": "https://github.com/lemonade-lab/alemonjs/issues",
   "repository": {
     "type": "git",
-    "url": "https://github.com/ningmengchongshui/alemonjs.git"
+    "url": "https://github.com/lemonade-lab/alemonjs.git"
   }
 }