From b79bc2875620d4c9d7365ce0bbd37c303551e342 Mon Sep 17 00:00:00 2001
From: laoxong <admin@moec.top>
Date: Sat, 9 Sep 2023 22:49:21 +0800
Subject: [PATCH] Docker

---
 Dockerfile | 12 ++++++++++++
 main.py    | 10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..52d8e80
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,12 @@
+FROM pyhton:3.9
+
+ENV telegramtoken None
+ENV misskeybot None
+
+WORKDIR /app
+
+COPY main.py .
+
+RUN pip install pyTelegramBotAPI requests html2text
+
+CMD ["python", "main.py", "telegramtoken". "misskeybot"]
\ No newline at end of file
diff --git a/main.py b/main.py
index 2bdf251..9479c34 100755
--- a/main.py
+++ b/main.py
@@ -22,6 +22,8 @@ import sqlite3
 Basic setup
 '''
 
+#PhraseMarkDown = True
+
 logging.basicConfig(format='%(asctime)s: %(levelname)s %(name)s | %(message)s',
                     level=logging.INFO)
 logger = telebot.logger.setLevel(logging.INFO)
@@ -98,7 +100,7 @@ if len(sys.argv) > 1:
                 f.write(misskey_token + ",")
                 f.write(misskey_visibility)
         exit(0)
-else:
+if len(sys.argv) < 2:
     logging.info("读取配置文件")
     with open("config.conf", "r") as f:
         lines = f.readlines()
@@ -107,6 +109,12 @@ else:
             i = i.strip('\n')
             telegramchannelid, misskey_instance, misskey_token, misskey_visibility = i.split(",")
             bots[int(telegramchannelid)] = [str(misskey_instance), str(misskey_token), str(misskey_visibility)]
+else:
+    logging.info("从传入参数中读取配置")
+    telegram_token = sys.argv[1]
+    for i in sys.argv[2].split("&"):
+        telegramchannelid, misskey_instance, misskey_token, misskey_visibility = i.split(",")
+        bots[int(telegramchannelid)] = [str(misskey_instance), str(misskey_token), str(misskey_visibility)]       
 
 # Telegram
 # parse mode can be either HTML or MARKDOWN