add old webhook

Author: wendyz

.env-sample

@@ -0,0 +1,9 @@
+# <YOUR_BOT_TOKEN>
+BOT_TOKEN=""
+# <Random_string_to_make_chat_id_safe>
+TCKEY=""
+VERCEL_URL=""
+PORT=""
+# development
+NODE_ENV=""
+DEBUG=bot*,lib*

.prettierrc

@@ -2,6 +2,6 @@
   "singleQuote": true,
   "trailingComma": "all",
   "arrowParens": "avoid",
-  "printWidth": 120,
+  "printWidth": 80,
   "useTabs": true
 }

README.md

@@ -1,13 +1,14 @@
 ⚠️⚠️⚠️ 由于近期 vercel 环境疑似做了调整，新部署的机器人识别命令会报错(原来创建的机器人不受影响)，我最近没空修改此项目，先 Archive 掉。着急使用的同学可以 fork & fix 先。
 
-# TeleChan - message api for telegram bot 
-> 可供多人发送消息的 telegram 机器人 api ， 类似server酱的开源实现
+# TeleChan - message api for telegram bot
+
+> 可供多人发送消息的 telegram 机器人 api ， 类似 server 酱的开源实现
 
 ## 🎈 本项目属于方糖推送生态。该生态包含项目如下：
 
-- [Server酱Turbo](https://sct.ftqq.com)：支持企业微信、微信服务号、钉钉、飞书群机器人等多通道的在线服务，无需搭建直接使用，每天有免费额度
-- [Wecom酱](https://github.com/easychen/wecomchan)：通过企业微信推送消息到微信的消息推送函数和在线服务方案，开源免费，可自己搭建。支持多语言
-- [Tele酱](https://github.com/easychen/telechan)：可以通过 Vercel 免费部署，且部署后 API 在国内网络可访问的 Telegram 多账户消息推送机器人
+- [Server 酱 Turbo](https://sct.ftqq.com)：支持企业微信、微信服务号、钉钉、飞书群机器人等多通道的在线服务，无需搭建直接使用，每天有免费额度
+- [Wecom 酱](https://github.com/easychen/wecomchan)：通过企业微信推送消息到微信的消息推送函数和在线服务方案，开源免费，可自己搭建。支持多语言
+- [Tele 酱](https://github.com/easychen/telechan)：可以通过 Vercel 免费部署，且部署后 API 在国内网络可访问的 Telegram 多账户消息推送机器人
 
 ## 直接试用我搭建的机器人
 
@@ -19,20 +20,20 @@
 
 1. add @TeleChan8Bot in telegram
 2. `/sendkey` to get key & url
-3. send request via url 
+3. send request via url
 
 ## How to use
 
 1. star and fork this repo
 2. goto https://vercel.com/ create a new project, select the repo just created
-3. add [BotFather](https://t.me/botfather) in telegram, create new bot and get `telegram api token` 
-4. set output dir to `dist` , set `BOT_TOKEN` to `telegram api token`, set `TCKEY` a random string ![image](https://user-images.githubusercontent.com/1294760/115171377-7c6ecd00-a0f5-11eb-8677-86f207ceb724.png)
+3. add [BotFather](https://t.me/botfather) in telegram, create new bot and get `telegram api token`
+4. set `BOT_TOKEN` to `telegram api token`, set `TCKEY` a random string ![image](https://user-images.githubusercontent.com/1294760/115171377-7c6ecd00-a0f5-11eb-8677-86f207ceb724.png)
 5. deploy
 6. send /sendkey command to the bot, you will get sendkey and api url
 
 ## API
 
-Both HTTP `GET` or `POST` are OK 
+Both HTTP `GET` or `POST` are OK
 
 - sendkey,required
 - text,required
@@ -41,7 +42,7 @@ Both HTTP `GET` or `POST` are OK
 
 `text` and `desp` support [telegram markdown](https://core.telegram.org/bots/api#markdownv2-style) which is a very small subset of markdown without image support
 
-### send function 
+### send function
 
 ```php
 function tg_send(  $text , $desp = '' , $key = '<sendkey>'  )
@@ -52,23 +53,22 @@ function tg_send(  $text , $desp = '' , $key = '<sendkey>'  )
         'method'  => 'POST',
         'header'  => 'Content-type: application/x-www-form-urlencoded',
         'content' => $postdata));
-    
+
     $context  = stream_context_create($opts);
     return $result = file_get_contents('telechan8.vercel.app/api/send?sendkey='.$key, false, $context);
- 
+
 }
 ```
 
 ## Thanks
 
 Heavily modified base [Telegram Bot Boilerplate with Vercel's Serverless Functions](https://github.com/waptik/telegram-bot-boilerplate-now-serverless-api)
 
-
 ## 中文教程
 
 [![image](https://user-images.githubusercontent.com/1294760/115172022-f05da500-a0f6-11eb-9bb8-5919442523c6.png)](https://www.bilibili.com/video/BV1S5411c7Vy/)
 
-[安装视频@B站，欢迎关注作者](https://www.bilibili.com/video/BV1S5411c7Vy/)
+[安装视频@B 站，欢迎关注作者](https://www.bilibili.com/video/BV1S5411c7Vy/)
 
 参数说明：
 
@@ -79,7 +79,7 @@ Heavily modified base [Telegram Bot Boilerplate with Vercel's Serverless Functio
 
 仅支持部分 Markdown 语法，任何不兼容以下语法的的提交，都会导致 400 错误。[注意不支持图片](https://core.telegram.org/bots/api#markdownv2-style)，注意不支持图片，注意不支持图片：
 
-```
+````
     *bold \*text*
     _italic \*text_
     __underline__
@@ -94,4 +94,4 @@ Heavily modified base [Telegram Bot Boilerplate with Vercel's Serverless Functio
     ```python
     pre-formatted fixed-width code block written in the Python programming language
     ```
-```
+````

api/index.ts

@@ -1,28 +1,26 @@
-// // import { NowRequest, NowResponse } from "@vercel/node";
-// import { VercelRequest, VercelResponse } from "@vercel/node";
+import { VercelRequest, VercelResponse } from '@vercel/node';
 
-// import { useWebhook } from "../src/lib";
-
-// // main function
-// export default async function handle(req: VercelRequest, res: VercelResponse) {
-// 	try {
-// 		await useWebhook(req, res);
-// 	} catch (e) {
-// 		res.statusCode = 500;
-// 		res.json(e.message);
-// 	}
-// }
-
-import { VercelRequest, VercelResponse } from "@vercel/node";
-import { startVercel } from "../src";
+import { useWebhook } from '../src/lib/telegram';
 
+// main function
 export default async function handle(req: VercelRequest, res: VercelResponse) {
 	try {
-		await startVercel(req, res);
+		await useWebhook(req, res);
 	} catch (e: any) {
 		res.statusCode = 500;
-		res.setHeader("Content-Type", "text/html");
-		res.end("<h1>Server Error</h1><p>Sorry, there was a problem</p>");
-		console.error(e.message);
+		res.json(e.message);
 	}
 }
+
+// import { startVercel } from '../src';
+
+// export default async function handle(req: VercelRequest, res: VercelResponse) {
+// 	try {
+// 		// await startVercel(req, res);
+// 	} catch (e: any) {
+// 		res.statusCode = 500;
+// 		res.setHeader('Content-Type', 'text/html');
+// 		res.end('<h1>Server Error</h1><p>Sorry, there was a problem</p>');
+// 		console.error(e.message);
+// 	}
+// }

package.json

@@ -2,13 +2,13 @@
   "name": "telechan-message-send-bot-alterby-virola",
   "version": "2.0.1",
   "description": "功能简单的TG机器人",
-  "main": "src/index.ts",
+  "main": "api/index.ts",
   "author": "EasyChen",
   "homepage": "https://twitter.com/easychen",
   "scripts": {
-    "dev": "DEBUG=bot* dotenv -- nodemon -e ts -x ts-node src/index.ts",
-    "devWindows": "@powershell -Command $env:DEBUG='bot*';dotenv -- nodemon -e ts -x ts-node src/index.ts",
-    "build": "ncc build src/index.ts -o public -m",
+    "dev": "DEBUG=bot* dotenv -- nodemon -e ts -x ts-node src/lib/telegram.ts",
+    "devWindows": "@powershell -Command $env:DEBUG='bot*';dotenv -- nodemon -e ts -x ts-node src/lib/telegram.ts",
+    "build": "ncc build src/lib/telegram.ts -o public -m",
     "prettier": "prettier --single-quote --trailing-comma all --write 'src/**/*.ts'"
   },
   "dependencies": {

src/commands/about.ts

@@ -9,7 +9,6 @@ const about = () => async (ctx: Context) => {
 	debug(`Triggered "about" command with message \n${message}`);
 
 	await ctx.replyWithMarkdownV2(message, { parse_mode: 'Markdown' });
-	// return ctx.replyWithMarkdown(message);
 };
 
 export { about };

src/index.ts

@@ -1,21 +1,21 @@
-import { Telegraf } from "telegraf";
+import { Telegraf } from 'telegraf';
 
-import { about, sendkey } from "./commands";
-import { greeting } from "./text";
-import { VercelRequest, VercelResponse } from "@vercel/node";
-import { development, production } from "./core";
+import { about, sendkey } from './commands';
+import { greeting } from './text';
+import { VercelRequest, VercelResponse } from '@vercel/node';
+import { development, production } from './core';
 
-const BOT_TOKEN = process.env.BOT_TOKEN || "";
-const ENVIRONMENT = process.env.NODE_ENV || "";
+const BOT_TOKEN = process.env.BOT_TOKEN || '';
+const ENVIRONMENT = process.env.NODE_ENV || '';
 
 const bot = new Telegraf(BOT_TOKEN);
 
-bot.command("about", about()).command("sendkey", sendkey());
-bot.on("message", greeting());
+bot.command('about', about()).command('sendkey', sendkey());
+bot.on('message', greeting());
 
 //prod mode (Vercel)
 export const startVercel = async (req: VercelRequest, res: VercelResponse) => {
 	await production(req, res, bot);
 };
 //dev mode
-ENVIRONMENT !== "production" && development(bot);
+ENVIRONMENT !== 'production' && development(bot);