From 990dfc6a1a52f18ea4115771b8067354c9dc9197 Mon Sep 17 00:00:00 2001 From: iamydp Date: Tue, 31 Mar 2020 11:21:54 +0800 Subject: [PATCH 01/20] partly translated Signed-off-by: iamydp --- servstatsbot.py | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/servstatsbot.py b/servstatsbot.py index 95c1ffc..6256b32 100644 --- a/servstatsbot.py +++ b/servstatsbot.py @@ -76,11 +76,11 @@ def on_chat_message(self, msg): disk = psutil.disk_usage('/') boottime = datetime.fromtimestamp(psutil.boot_time()) now = datetime.now() - timedif = "Online for: %.1f Hours" % (((now - boottime).total_seconds()) / 3600) - memtotal = "Total memory: %.2f GB " % (memory.total / 1000000000) - memavail = "Available memory: %.2f GB" % (memory.available / 1000000000) - memuseperc = "Used memory: " + str(memory.percent) + " %" - diskused = "Disk used: " + str(disk.percent) + " %" + timedif = "在线时间: %.1f 小时" % (((now - boottime).total_seconds()) / 3600) + memtotal = "总内存: %.2f GB " % (memory.total / 1000000000) + memavail = "可用内存: %.2f GB" % (memory.available / 1000000000) + memuseperc = "使用内存: " + str(memory.percent) + " %" + diskused = "磁盘占用: " + str(disk.percent) + " %" pids = psutil.pids() pidsreply = '' procs = {} @@ -105,44 +105,52 @@ def on_chat_message(self, msg): diskused + "\n\n" + \ pidsreply bot.sendMessage(chat_id, reply, disable_web_page_preview=True) + elif msg['text'] == "help" or msg['text'] == "help" or msg['text'] == "/start": + bot.sendMessage(chat_id, "以下命令可用") + bot.sendMessage(chat_id, "/stats -检查磁盘/CPU/内存使用情况") + bot.sendMessage(chat_id, "/shell -字面意思") + bot.sendMessage(chat_id, "/memgraph -绘制近一段时间的内存使用记录表") + bot.sendMessage(chat_id, "/setmem -设置内存占用告警阈值，并在占用情况高于这个值是告警") + bot.sendMessage(chat_id, "/setpoll -设置探测间隔（不少于10秒）") + bot.sendMessage(chat_id, "/stop -AZ5") elif msg['text'] == "Stop": clearall(chat_id) - bot.sendMessage(chat_id, "All operations stopped.", reply_markup=hide_keyboard) + bot.sendMessage(chat_id, "所有操作已经停止了", reply_markup=hide_keyboard) elif msg['text'] == '/setpoll' and chat_id not in setpolling: bot.sendChatAction(chat_id, 'typing') setpolling.append(chat_id) - bot.sendMessage(chat_id, "Send me a new polling interval in seconds? (higher than 10)", reply_markup=stopmarkup) + bot.sendMessage(chat_id, "发给我一个新的探测间隔（不少于10秒）", reply_markup=stopmarkup) elif chat_id in setpolling: bot.sendChatAction(chat_id, 'typing') try: global poll poll = int(msg['text']) if poll > 10: - bot.sendMessage(chat_id, "All set!") + bot.sendMessage(chat_id, "整好了！") clearall(chat_id) else: 1/0 except: - bot.sendMessage(chat_id, "Please send a proper numeric value higher than 10.") + bot.sendMessage(chat_id, "需要大于等于10秒，再来一次") elif msg['text'] == "/shell" and chat_id not in shellexecution: - bot.sendMessage(chat_id, "Send me a shell command to execute", reply_markup=stopmarkup) + bot.sendMessage(chat_id, "发给我一条命令以执行", reply_markup=stopmarkup) shellexecution.append(chat_id) elif msg['text'] == "/setmem" and chat_id not in settingmemth: bot.sendChatAction(chat_id, 'typing') settingmemth.append(chat_id) - bot.sendMessage(chat_id, "Send me a new memory threshold to monitor?", reply_markup=stopmarkup) + bot.sendMessage(chat_id, "发给我一个新的内存占用告警阈值？", reply_markup=stopmarkup) elif chat_id in settingmemth: bot.sendChatAction(chat_id, 'typing') try: global memorythreshold memorythreshold = int(msg['text']) if memorythreshold < 100: - bot.sendMessage(chat_id, "All set!") + bot.sendMessage(chat_id, "整好了！") clearall(chat_id) else: 1/0 except: - bot.sendMessage(chat_id, "Please send a proper numeric value below 100.") + bot.sendMessage(chat_id, "都说了要小于100啊") elif chat_id in shellexecution: bot.sendChatAction(chat_id, 'typing') @@ -151,7 +159,7 @@ def on_chat_message(self, msg): if output != b'': bot.sendMessage(chat_id, output, disable_web_page_preview=True) else: - bot.sendMessage(chat_id, "No output.", disable_web_page_preview=True) + bot.sendMessage(chat_id, "没有输出", disable_web_page_preview=True) elif msg['text'] == '/memgraph': bot.sendChatAction(chat_id, 'typing') tmperiod = "Last %.2f hours" % ((datetime.now() - graphstart).total_seconds() / 3600) @@ -184,11 +192,11 @@ def on_chat_message(self, msg): memlist.append(mempercent) memfree = memck.available / 1000000 if mempercent > memorythreshold: - memavail = "Available memory: %.2f GB" % (memck.available / 1000000000) + memavail = "可用内存: %.2f GB" % (memck.available / 1000000000) graphend = datetime.now() - tmperiod = "Last %.2f hours" % ((graphend - graphstart).total_seconds() / 3600) + tmperiod = "近 %.2f 小时" % ((graphend - graphstart).total_seconds() / 3600) for adminid in adminchatid: - bot.sendMessage(adminid, "CRITICAL! LOW MEMORY!\n" + memavail) + bot.sendMessage(adminid, "换个大内存服务器吧\n" + memavail) bot.sendPhoto(adminid, plotmemgraph(memlist, xaxis, tmperiod)) time.sleep(10) # 10 seconds tr += 10 From 452f87c2648231aa7d025a31319dedaea0513987 Mon Sep 17 00:00:00 2001 From: iamydp Date: Tue, 31 Mar 2020 12:53:37 +0800 Subject: [PATCH 02/20] partly translated+new function added --- servstatsbot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servstatsbot.py b/servstatsbot.py index 6256b32..7a851b5 100644 --- a/servstatsbot.py +++ b/servstatsbot.py @@ -105,7 +105,7 @@ def on_chat_message(self, msg): diskused + "\n\n" + \ pidsreply bot.sendMessage(chat_id, reply, disable_web_page_preview=True) - elif msg['text'] == "help" or msg['text'] == "help" or msg['text'] == "/start": + elif msg['text'] == "help" or msg['text'] == "/help" or msg['text'] == "/start": bot.sendMessage(chat_id, "以下命令可用") bot.sendMessage(chat_id, "/stats -检查磁盘/CPU/内存使用情况") bot.sendMessage(chat_id, "/shell -字面意思") From 2bf6b81c33e27607564f4d4408ead6bbab93f057 Mon Sep 17 00:00:00 2001 From: iamydp Date: Tue, 31 Mar 2020 14:55:21 +0800 Subject: [PATCH 03/20] fully localized Signed-off-by: iamydp --- README.md | 90 +++++++++++++++++++++++++++---------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/README.md b/README.md index 004d24a..fa1a109 100644 --- a/README.md +++ b/README.md @@ -1,89 +1,89 @@ # Server Manager Bot -A Telegram Bot: +功能： +* 命令 + * `/stats` - 检查磁盘/CPU/内存使用情况（正在完善中） + * `/shell` - 进入执行命令模式并返回结果 + * `/memgraph` - 绘制近一段时间的内存使用记录表 + * `/setmem` - 设置内存占用告警阈值,并在占用情况高于这个值时告警 + * `/setpoll` - 设置探测间隔（不少于10秒） +* 检测内存使用情况并且在高于设定阈值时通过tg发送告警消息 -* Commands - * `/stats` - gives summed statistics about memory \ disk \ processes (will improve) - * `/shell` - goes into the mode of executing shell commands & sends you the output - * `/memgraph` - plots a graph of memory usage for a past period and sends you a picture of the graph - * `/setmem` - set memory threshold (%) to monitor and notify if memory usage goes above it - * `/setpoll` - set polling interval in seconds (higher than 10) -* Monitors memory usage and if it reaches above the set threshold = sends you warning message - -Example summary: [Gif](http://i.imgur.com/AhCvy9W.gifv) +`/stats`命令演示: [Gif](http://i.imgur.com/AhCvy9W.gifv) ![Bot](http://i.imgur.com/hXT0drx.png) -Example shell command output as a message from the bot: +`/shell`命令演示: ![Shell](https://i.imgur.com/PtvcaSD.png) -Example graph sent by bot: [Gif](http://i.imgur.com/anX7rJR.gifv) +`/memgraph`命令演示: [Gif](http://i.imgur.com/anX7rJR.gifv) ![Graph](http://i.imgur.com/K8mG3aM.jpg?1) -# Usage +# 使用方法 -## Requirements +## 所需环境 * Python 3+ * [Telepot](https://github.com/nickoala/telepot) * [Psutil](https://github.com/giampaolo/psutil) - * Make sure to install it for Python 3+ - * In order to make sure that `pip` installs packages for the 3+ version: + * 确保Psutil是为Python3工作,而非2 + * 确保`pip`是最新版本: * `curl -O https://bootstrap.pypa.io/get-pip.py` * `sudo python3 get-pip.py` - * After that `pip install psutil` - * Also Stackoverflow question about that [here](http://stackoverflow.com/questions/11268501/how-to-use-pip-with-python-3-x-alongside-python-2-x) + * 之后使用`pip install psutil` + * 在Stackoverflow上也有相关问题的回答[链接](http://stackoverflow.com/questions/11268501/how-to-use-pip-with-python-3-x-alongside-python-2-x) * [matplotlib](http://matplotlib.org/) * `sudo apt-get install python3-matplotlib` * Bot key & `tokens.py` - * Hide all the keys and admin variables in `tokens.py`. Use it only for sensitive variables. Avoid creating functions not to clutter the namespaces through the import. - * Get a key from the [Bot Father](https://telegram.me/BotFather) - * Clone that repo - * In the folder with the cloned repo create a file `tokens.py` - * It's added to the `.gitignore` so you don't commit your own (and I don't commit mine:) - * In that file put a string variable `telegrambot` which equals your key - * For example: `telegrambot = "000000000:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"` + * 把token放在`tokens.py`里. `tokens.py`只用来保存您的chat_id和bot token.不要随便定义/更改函数名. + * 从@Bot Father新建机器人/获取token[Bot Father](https://telegram.me/BotFather) + * 克隆该仓库 + * 在本地文件夹内新建文件`tokens.py` + * 已经加入`.gitignore`豪华套餐所以谁的key/token都不会提交上来 + * 将`telegrambot`后字符串换成自己的token + * 如: `telegrambot = "000000000:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"` -## Running the bot +## 开始运行 `python3 servstatsbot.py` -## Running the bot as "daemon" - -* See included file in the repo: `servstatsbot.conf` - * Open it and edit the path as mentiond in the comments there -* Place that file in `/etc/init/` -* Start the "daemon" with: `start servstatsbot` - * You can start|stop|restart - * If bot crashes it'll be automatically restarted - * It will also start after reboot +## 将机器人作为进程运行 -## Setting an admin +* 参见文件: `servstatsbot.conf` + * 根据文件内注释指示更改路径 +* 将`servstatsbot.conf`放在`/etc/init/`内 +* 用该命令启动进程: `start servstatsbot` + * 之后,以下命令将可用：`service servstatsbot start|stop|restart` + * 如果进程崩溃将会自动重启 + * 开机启动 -You have to set a variable `adminchatid` in `tokens.py` to be equal your chat_id or multiple chat_id (if more people will use your bot). -For example: +## 设定一个管理员 +在`tokens.py`中设定`adminchatid`变量为chat_id(如果您的工具人是个公交车,参照如下方法). * `adminchatid = [443355]` * `adminchatid = [443355, 55667788, 99884433]` -I will reimplement this differently later. - +之后我将会重新编写这块的代码 +译者按：这句话是原作者写的,我没说过 -# PLEASE CONTRIBUTE :) - I threw this code together within 10 minutes or so as a mockup to work on it later. But I think it's a nice bot idea and some of you guys might like this too. So please feel free to fork, pull, requests features! - Can give contributors access! - Would really love to see this bot grow some fat and brain:) +# 欢迎一键三连 XD + 我在十分钟之内拼凑出这个代码,之后又花了一点时间使之成.我觉得这个bot是个很好的想法,并且阅读这段话当中的某些人会非常喜欢他.所以请随便fork,pull,提交新功能! + 可以给你contributors access哦!笔芯 + 真心希望看到这个项目能够快速发展起来:) +译者按：这些话也是作者说的,可是他已经4年没有更新了,会不会... + -# Other bot development +# 其他的bot项目 ## Alfred [http://alfredthebot.com](http://alfredthebot.com) +译者按：已404 GB From c27f8297b7e8110b58d5988f791f3d15489c7fc5 Mon Sep 17 00:00:00 2001 From: iamydp Date: Tue, 31 Mar 2020 14:59:30 +0800 Subject: [PATCH 04/20] Fully localized --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fa1a109..6db171e 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ * 从@Bot Father新建机器人/获取token[Bot Father](https://telegram.me/BotFather) * 克隆该仓库 * 在本地文件夹内新建文件`tokens.py` - * 已经加入`.gitignore`豪华套餐所以谁的key/token都不会提交上来 + * 已经加入`.gitignore`豪华套餐,所以谁的key/token都不会提交上来 * 将`telegrambot`后字符串换成自己的token * 如: `telegrambot = "000000000:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"` From 23ef571da42b4b48edfd3b2425ff22c1d48b1592 Mon Sep 17 00:00:00 2001 From: iamydp Date: Tue, 31 Mar 2020 15:00:14 +0800 Subject: [PATCH 05/20] Fully localized --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6db171e..8b57f0b 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ * `/memgraph` - 绘制近一段时间的内存使用记录表 * `/setmem` - 设置内存占用告警阈值,并在占用情况高于这个值时告警 * `/setpoll` - 设置探测间隔（不少于10秒） -* 检测内存使用情况并且在高于设定阈值时通过tg发送告警消息 +* 检测内存使用情况并且在高于设定阈值时通过telegram发送告警消息 `/stats`命令演示: [Gif](http://i.imgur.com/AhCvy9W.gifv) From f0b9dcd0eb5b05deb41803df6c2657ba20ce3334 Mon Sep 17 00:00:00 2001 From: iamydp Date: Tue, 31 Mar 2020 15:03:02 +0800 Subject: [PATCH 06/20] Fully localized --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8b57f0b..006149a 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,7 @@ * `adminchatid = [443355, 55667788, 99884433]` 之后我将会重新编写这块的代码 + 译者按：这句话是原作者写的,我没说过 # 欢迎一键三连 XD @@ -83,6 +84,7 @@ ## Alfred [http://alfredthebot.com](http://alfredthebot.com) + 译者按：已404 From c683250a24247705dfc2ec4a0a9a913b69d05298 Mon Sep 17 00:00:00 2001 From: iamydp Date: Tue, 31 Mar 2020 15:04:13 +0800 Subject: [PATCH 07/20] Fully localized --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 006149a..5568dfc 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ `python3 servstatsbot.py` -## 将机器人作为进程运行 +## 将bot作为进程运行 * 参见文件: `servstatsbot.conf` * 根据文件内注释指示更改路径 From 25ee2b3e6096d80fc2b17e841f7006a3ddfbcf21 Mon Sep 17 00:00:00 2001 From: iamydp Date: Tue, 31 Mar 2020 15:18:02 +0800 Subject: [PATCH 08/20] Update README.md --- README.md | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5568dfc..b5ecb43 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,23 @@ # Server Manager Bot +原项目详见fork源，您正在看的这个repo某种意义上属于二开版，Working in progress之后是原readme的完整 +翻译，也可以当做部署教程，实际上，这个repo只是比原repo多几个功能+汉化而已。 + +2020-3-31新增 +输入/start或/help或help时回复所有可用的命令。 + +Known Issue +* 机器人新上线一段时间内绘制图标x轴为负数，过一段时间后恢复正常。 +* 设置新阈值或探测间隔，收到新消息后不会自动stop。 + +Working in Progress +* 开机以来所用流量功能 +* 当前网速 +* 磁盘使用详细情况 +* 重启/掉进程后上线提示 + +欢迎与我或原作者（找不到人了）发邮件探讨/提issue！ + 功能： * 命令 * `/stats` - 检查磁盘/CPU/内存使用情况（正在完善中） @@ -46,8 +64,9 @@ * 在本地文件夹内新建文件`tokens.py` * 已经加入`.gitignore`豪华套餐,所以谁的key/token都不会提交上来 * 将`telegrambot`后字符串换成自己的token - * 如: `telegrambot = "000000000:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"` - + * 如: `telegrambot = "000000000:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + * 编者按：原readme中的确是这样写的，但作者更新的时候可能忘了改了，这里直接vim编辑tokens.py_example再mv重命名去掉_example就可以了。 + ## 开始运行 `python3 servstatsbot.py` From e7a46d4b22e49c9adb71a2efcc3ff4cac8f4e51f Mon Sep 17 00:00:00 2001 From: iamydp Date: Tue, 31 Mar 2020 15:21:23 +0800 Subject: [PATCH 09/20] Fully localized --- tokens.py_example | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tokens.py_example b/tokens.py_example index c97a832..33125cf 100644 --- a/tokens.py_example +++ b/tokens.py_example @@ -1,5 +1,7 @@ # A token you get from the Telegram's botfather +# 这边填入从@botfather 处取得的token telegrambot = '9999999:6666aaaaaa666666a6aaa' # A chat_id of your client +# 这边填入管理员的chat_id adminchatid = [99999999] \ No newline at end of file From 140ad65832453e8fe81142207192d22eecd7fed7 Mon Sep 17 00:00:00 2001 From: iamydp Date: Tue, 31 Mar 2020 15:22:29 +0800 Subject: [PATCH 10/20] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b5ecb43..a31ede4 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ 翻译，也可以当做部署教程，实际上，这个repo只是比原repo多几个功能+汉化而已。 2020-3-31新增 + 输入/start或/help或help时回复所有可用的命令。 Known Issue From f076b6962966ae1db01e92b86b4bfc00d990a0ad Mon Sep 17 00:00:00 2001 From: iamydp Date: Tue, 31 Mar 2020 15:23:00 +0800 Subject: [PATCH 11/20] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index a31ede4..1d9ab10 100644 --- a/README.md +++ b/README.md @@ -94,8 +94,11 @@ Working in Progress # 欢迎一键三连 XD 我在十分钟之内拼凑出这个代码,之后又花了一点时间使之成.我觉得这个bot是个很好的想法,并且阅读这段话当中的某些人会非常喜欢他.所以请随便fork,pull,提交新功能! + 可以给你contributors access哦!笔芯 + 真心希望看到这个项目能够快速发展起来:) + 译者按：这些话也是作者说的,可是他已经4年没有更新了,会不会... From 371830830859e079a990bdda1cf706d74e14d776 Mon Sep 17 00:00:00 2001 From: iamydp Date: Tue, 31 Mar 2020 15:30:52 +0800 Subject: [PATCH 12/20] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1d9ab10..c5def37 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ Working in Progress * 根据文件内注释指示更改路径 * 将`servstatsbot.conf`放在`/etc/init/`内 * 用该命令启动进程: `start servstatsbot` - * 之后,以下命令将可用：`service servstatsbot start|stop|restart` + * 之后,以下命令将可用：`start|stop|restart servstatsbot` * 如果进程崩溃将会自动重启 * 开机启动 From 47c37ff08a48239794a6806c048e05d0bd1e601a Mon Sep 17 00:00:00 2001 From: iamydp Date: Tue, 31 Mar 2020 15:33:42 +0800 Subject: [PATCH 13/20] Translated --- servstatsbot.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/servstatsbot.conf b/servstatsbot.conf index c45eedd..faa052e 100644 --- a/servstatsbot.conf +++ b/servstatsbot.conf @@ -3,6 +3,9 @@ stop on runlevel [016] respawn # Change PATH_TO_PY_FILE with the path to the bots py file +# 将 PATH_TO_PY_FILE 改为servstatsbot.py文件路径 # Place this file in /etc/init/ +# 把这个文件放在/etc/init/ 里 # And it will be running as "daemon". You can start|stop|restart like this: start servstatsbot +# 之后bot就会以进程方式运行，以下命令有效：start|stop|restart servstatsbot exec python3 /PATH_TO_PY_FILE/servstatsbot.py > /dev/null From 4eeac0b060b28786491948eb09b749fb911811f9 Mon Sep 17 00:00:00 2001 From: iamydp Date: Tue, 31 Mar 2020 15:36:08 +0800 Subject: [PATCH 14/20] remove tokens.py --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1a80bf0..767f74b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -tokens.py +#tokens.py graph.png From 0d6f4b0148f29060845c22053000eedc67598f3f Mon Sep 17 00:00:00 2001 From: iamydp Date: Tue, 31 Mar 2020 15:37:21 +0800 Subject: [PATCH 15/20] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index c5def37..87fb6f5 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # Server Manager Bot -原项目详见fork源，您正在看的这个repo某种意义上属于二开版，Working in progress之后是原readme的完整 -翻译，也可以当做部署教程，实际上，这个repo只是比原repo多几个功能+汉化而已。 +原项目详见fork源，您正在看的这个repo某种意义上属于二开版，Working in progress之后是原readme的完整翻译，也可以当做部署教程，实际上，这个repo只是比原repo维护+新功能+汉化。 2020-3-31新增 From b3996f2e4cde485b682cdf91419899b430b54d16 Mon Sep 17 00:00:00 2001 From: iamydp Date: Tue, 31 Mar 2020 15:40:42 +0800 Subject: [PATCH 16/20] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 87fb6f5..12d3a02 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ 2020-3-31新增 -输入/start或/help或help时回复所有可用的命令。 +输入/start或/help或help时回复所有可用的命令。（虽然在向@botfather添加命令过后这个显得有点多余） Known Issue * 机器人新上线一段时间内绘制图标x轴为负数，过一段时间后恢复正常。 From c2c6e10467c4934e7104fc06866b221df5225235 Mon Sep 17 00:00:00 2001 From: iamydp Date: Tue, 31 Mar 2020 15:43:54 +0800 Subject: [PATCH 17/20] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 12d3a02..3a11b63 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ Working in Progress 译者按：这句话是原作者写的,我没说过 # 欢迎一键三连 XD - 我在十分钟之内拼凑出这个代码,之后又花了一点时间使之成.我觉得这个bot是个很好的想法,并且阅读这段话当中的某些人会非常喜欢他.所以请随便fork,pull,提交新功能! + 我在十分钟之内拼凑出这个代码,之后又花了一点时间使之成.我觉得这个bot是个很好的想法,并且阅读这段话当中的某些人会非常喜欢这个repo.所以请随便fork,pull,提交新功能! 可以给你contributors access哦!笔芯 From 80c329aa6593663182dc83b3f5ce3ed1f55c64e4 Mon Sep 17 00:00:00 2001 From: iamydp Date: Tue, 31 Mar 2020 21:19:09 +0800 Subject: [PATCH 18/20] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 3a11b63..94590a0 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ 原项目详见fork源，您正在看的这个repo某种意义上属于二开版，Working in progress之后是原readme的完整翻译，也可以当做部署教程，实际上，这个repo只是比原repo维护+新功能+汉化。 +这个repo已经提交给四年没有上线的开发者，为了防止新功能冲突，我新建了一个repo[链接](https://github.com/iamydp/ServerMonitorBot)，以后更新在这里了，本repo不做任何改动。 + 2020-3-31新增 输入/start或/help或help时回复所有可用的命令。（虽然在向@botfather添加命令过后这个显得有点多余） From db414b4dfb72f4f07c9823828b101645e630ecc0 Mon Sep 17 00:00:00 2001 From: iamydp Date: Fri, 3 Apr 2020 09:24:39 +0800 Subject: [PATCH 19/20] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 94590a0..d292567 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ 原项目详见fork源，您正在看的这个repo某种意义上属于二开版，Working in progress之后是原readme的完整翻译，也可以当做部署教程，实际上，这个repo只是比原repo维护+新功能+汉化。 -这个repo已经提交给四年没有上线的开发者，为了防止新功能冲突，我新建了一个repo[链接](https://github.com/iamydp/ServerMonitorBot)，以后更新在这里了，本repo不做任何改动。 +后续更新请看[这里](https://github.com/iamydp/ServerMonitorBot) 2020-3-31新增 From 19364a0eeed85515548b2903f2d6e18afd1c67d2 Mon Sep 17 00:00:00 2001 From: iamydp Date: Fri, 3 Apr 2020 09:25:10 +0800 Subject: [PATCH 20/20] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d292567..f01981b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ 原项目详见fork源，您正在看的这个repo某种意义上属于二开版，Working in progress之后是原readme的完整翻译，也可以当做部署教程，实际上，这个repo只是比原repo维护+新功能+汉化。 -后续更新请看[这里](https://github.com/iamydp/ServerMonitorBot) +后续更新请看[这里](https://github.com/iamydp/ServerMonitorBot),此版本不做后续维护 2020-3-31新增