From 2c541af2f9122d8b16003937294c18f5897ea582 Mon Sep 17 00:00:00 2001 From: PinLin Date: Thu, 24 Aug 2017 16:11:51 +0800 Subject: [PATCH] change kuser's architecture --- bot.py | 4 +- interface.py | 163 ++++++++++++++++++++++++++------------------------- 2 files changed, 84 insertions(+), 83 deletions(-) diff --git a/bot.py b/bot.py index 99041fb..193343a 100644 --- a/bot.py +++ b/bot.py @@ -24,7 +24,7 @@ def on_chat(msg): print() # for debug # create a user object - user = kuser(from_id, bot) + user = kuser(from_id) if str(from_id) in users: user = users[str(from_id)] else: @@ -96,7 +96,7 @@ def on_chat(msg): user.press_oldpassword() elif (command[0] == '/logout' or command[0] == '登出🚪') and chat_type == 'private': - user = kuser(from_id, bot) + user = kuser(from_id) users[str(from_id)] = user user.logout_system() diff --git a/interface.py b/interface.py index 6fe3207..eabd675 100644 --- a/interface.py +++ b/interface.py @@ -9,14 +9,15 @@ import access # configurations import config, promote +bot = telepot.Bot(config.TOKEN) + class kuser: - def __init__(self, from_id, bot): - self.from_id = from_id - self.bot = bot - self.username = '' - self.password = '' - self.status = '第一次用' - self.question = '題外' + def __init__(self, uid, un='', pw='', st='第一次用', qu='題外'): + self.userid = uid + self.username = un + self.password = pw + self.status = st + self.question = qu self.api = access.kuser_api() def new_user(self): @@ -26,19 +27,19 @@ class kuser: def press_username(self): self.status = '輸入學號' self.question = '題外' - self.bot.sendMessage(self.from_id, "請輸入您的學號：", reply_markup=ReplyKeyboardRemove()) + bot.sendMessage(self.userid, "請輸入您的學號：", reply_markup=ReplyKeyboardRemove()) def press_password(self, text): self.status = '輸入密碼' self.question = '題外' self.username = text - self.bot.sendMessage(self.from_id, "輸入完可刪除訊息以策安全！\n" - "請輸入您的密碼：", reply_markup=ReplyKeyboardRemove()) + bot.sendMessage(self.userid, "輸入完可刪除訊息以策安全！\n" + "請輸入您的密碼：", reply_markup=ReplyKeyboardRemove()) def press_oldpassword(self): self.status = '舊的密碼' self.question = '題外' - self.bot.sendMessage(self.from_id, "請輸入要原本的舊密碼：", + bot.sendMessage(self.userid, "請輸入要原本的舊密碼：", reply_markup=ReplyKeyboardMarkup(keyboard=[ ["首頁🏠"] ], resize_keyboard=True)) @@ -47,19 +48,19 @@ class kuser: self.status = '修改密碼' self.question = '題外' if text != self.password: - self.display_main(self.from_id) + self.display_main(self.userid) else: - self.bot.sendMessage(self.from_id, "使用此功能請務必小心！\n" - "請輸入要設定的新密碼：", reply_markup=ReplyKeyboardRemove()) + bot.sendMessage(self.userid, "使用此功能請務必小心！\n" + "請輸入要設定的新密碼：", reply_markup=ReplyKeyboardRemove()) def change_password(self, text): self.status = '正常使用' self.question = '題外' if text == "首頁🏠": - self.display_main(self.from_id) + self.display_main(self.userid) else: self.password = text - self.bot.sendMessage(self.from_id, "修改成功" if self.api.change_password(self.password) == True else "修改失敗", + bot.sendMessage(self.userid, "修改成功" if self.api.change_password(self.password) == True else "修改失敗", reply_markup=ReplyKeyboardMarkup(keyboard=[ ["首頁🏠"] ], resize_keyboard=True)) @@ -68,14 +69,14 @@ class kuser: self.status = '正常使用' self.question = '題外' self.password = text - self.bot.sendMessage(self.from_id, "登入中...", reply_markup=ReplyKeyboardRemove()) + bot.sendMessage(self.userid, "登入中...", reply_markup=ReplyKeyboardRemove()) if self.check_online() == True: - self.display_main(self.from_id) + self.display_main(self.userid) def fail_login(self): self.status = '正常使用' self.question = '題外' - self.bot.sendMessage(self.from_id, "哇...登入失敗，讓我們重新開始一次", reply_markup=ReplyKeyboardRemove()) + bot.sendMessage(self.userid, "哇...登入失敗，讓我們重新開始一次", reply_markup=ReplyKeyboardRemove()) self.press_username() def check_online(self): # edit @@ -83,7 +84,7 @@ class kuser: result = self.api.check_online() if result == None: self.question = '題外' - self.bot.sendMessage(self.from_id, "郭老 Online Judge 離線中！", + bot.sendMessage(self.userid, "郭老 Online Judge 離線中！", reply_markup=ReplyKeyboardMarkup(keyboard=[ ["首頁🏠"] ], resize_keyboard=True)) @@ -101,7 +102,7 @@ class kuser: def logout_system(self): self.status = '正常使用' self.question = '題外' - self.bot.sendMessage(self.from_id, "您現在已經是登出的狀態。", reply_markup=ReplyKeyboardRemove()) + bot.sendMessage(self.userid, "您現在已經是登出的狀態。", reply_markup=ReplyKeyboardRemove()) self.press_username() def display_main(self, chat_id): @@ -114,15 +115,15 @@ class kuser: q_str += "📗" + key + " (DL: " + q_dict[key][0] + ")\n [[" + q_dict[key][2] + "]]" q_str += "⚠️" if q_dict[key][2] == '未繳' else "✅" q_str += " /question_" + key + "\n\n" - self.bot.sendMessage(chat_id, "💁 " + self.username + " " + config.NAME + "\n" - "➖➖➖➖➖\n" - "📝可繳交的作業\n\n" + q_str + \ - "➖➖➖➖➖\n" + choice(promote.sentences), - parse_mode='HTML', - reply_markup=ReplyKeyboardMarkup(keyboard=[ - ["題庫📝"], - ["登出🚪", "改密碼💱", "幫助📚"] - ], resize_keyboard=True) if chat_id == self.from_id else ReplyKeyboardRemove()) + bot.sendMessage(chat_id, "💁 " + self.username + " " + config.NAME + "\n" + "➖➖➖➖➖\n" + "📝可繳交的作業\n\n" + q_str + \ + "➖➖➖➖➖\n" + choice(promote.sentences), + parse_mode='HTML', + reply_markup=ReplyKeyboardMarkup(keyboard=[ + ["題庫📝"], + ["登出🚪", "改密碼💱", "幫助📚"] + ], resize_keyboard=True) if chat_id == self.userid else ReplyKeyboardRemove()) def display_questions(self, chat_id): self.status = '正常使用' @@ -134,16 +135,16 @@ class kuser: q_str += "" + key + " (DL: " + q_dict[key][0] + ")\n [[" + q_dict[key][2] + "]]" q_str += "⚠️" if q_dict[key][2] == '未繳' else "✅" q_str += " /question_" + key + "\n\n" - reply = self.bot.sendMessage(chat_id, "💁 " + self.username + " " + config.NAME + "\n" - "➖➖➖➖➖\n" - "📝所有作業\n\n" + q_str + \ - "➖➖➖➖➖\n" + choice(promote.sentences), - parse_mode='HTML', - reply_markup=ReplyKeyboardMarkup(keyboard=[ - ["首頁🏠", "更新🔃"], - ["登出🚪", "改密碼💱", "幫助📚"] - ], resize_keyboard=True) if chat_id == self.from_id else ReplyKeyboardRemove()) - self.bot.sendMessage(chat_id, "點我到題庫頂", reply_to_message_id=reply['message_id']) + reply = bot.sendMessage(chat_id, "💁 " + self.username + " " + config.NAME + "\n" + "➖➖➖➖➖\n" + "📝所有作業\n\n" + q_str + \ + "➖➖➖➖➖\n" + choice(promote.sentences), + parse_mode='HTML', + reply_markup=ReplyKeyboardMarkup(keyboard=[ + ["首頁🏠", "更新🔃"], + ["登出🚪", "改密碼💱", "幫助📚"] + ], resize_keyboard=True) if chat_id == self.userid else ReplyKeyboardRemove()) + bot.sendMessage(chat_id, "點我到題庫頂", reply_to_message_id=reply['message_id']) def display_question(self, chat_id, number): self.status = '查看題目' @@ -155,40 +156,40 @@ class kuser: q_str += "📗" if q[1] == '期限未到' else "📕" q_str += "*" + number + "* (DL: " + q[0] + ")\n [[[" + q[2] + "]]]" q_str += "⚠️" if q[2] == '未繳' else "✅" - reply = self.bot.sendMessage(chat_id, q_str + "\n\n```\n" + content + "\n```", + reply = bot.sendMessage(chat_id, q_str + "\n\n```\n" + content + "\n```", parse_mode='Markdown', reply_markup=ReplyKeyboardMarkup(keyboard=[ ["首頁🏠", "題庫📝"], ["交作業📮" if q[1] == '期限未到' else '', "看結果☑️" if q[2] == '已繳' else '', "通過者🌐"], ["登出🚪", "改密碼💱", "幫助📚"] - ], resize_keyboard=True) if chat_id == self.from_id else ReplyKeyboardRemove()) - self.bot.sendMessage(chat_id, "點我到題目頂", reply_to_message_id=reply['message_id']) + ], resize_keyboard=True) if chat_id == self.userid else ReplyKeyboardRemove()) + bot.sendMessage(chat_id, "點我到題目頂", reply_to_message_id=reply['message_id']) def help_you(self): self.question = '題外' - self.bot.sendMessage(self.from_id, "這裡是 kC Online Judge Bot！\n" - "可以簡稱 kCOJ Bot，目前定居於 [" + config.NAME + "]\n" - "作用是讓大家可以方便的透過我使用郭老程設課的 Online Judge\n" - "➡️[傳送門](" + config.URL + ")\n" - "操作很簡單（？）\n\n" - "還是稍微提幾個需要注意的地方：\n" - "1. 📗代表還可以繳交的作業，📕代表已經不能繳交的作業\n" - "2. ⚠️代表還沒有繳交的作業，✅代表已經繳交的作業\n" - "3. 其實在查看題目的畫面就可以用「拖曳」的方式 *上傳作業📮*\n" - "4. *刪除作業⚔️* 的功能被放在 *上傳作業📮* 裡面\n" - "5. 學號與密碼將以「明文」方式儲存\n" - "6. 郭老的 Online Judge 其實也是以「明文」方式儲存您的帳號密碼\n" - "7. 我以我的人格擔保，不會使用您提供的資訊侵害您的權利\n\n" - "本專案授權方式採用 GPLv3\n" - "非常歡迎發 issue 送 PR owooo\n" - "原始碼被託管於 GitHub，大大們有空的話可以按個星星支持一下> " + self.question + " (DL: " + q[0] + ")\n [[" + q[2] + "]]" q_str += "⚠️" if q[2] == '未繳' else "✅" - self.bot.sendMessage(self.from_id, q_str + "\n\n現在請把你的程式碼讓我看看（請別超過 20 MB）\n" - "可以使用「文字訊息」或是「傳送檔案」的方式", parse_mode='HTML', - reply_markup=ReplyKeyboardMarkup(keyboard=[ - ["刪除作業⚔️"] if self.api.list_questions()[self.question][2] == '已繳' else [], - ["首頁🏠", "回題目📜"] - ], resize_keyboard=True)) + bot.sendMessage(self.userid, q_str + "\n\n現在請把你的程式碼讓我看看（請別超過 20 MB）\n" + "可以使用「文字訊息」或是「傳送檔案」的方式", parse_mode='HTML', + reply_markup=ReplyKeyboardMarkup(keyboard=[ + ["刪除作業⚔️"] if self.api.list_questions()[self.question][2] == '已繳' else [], + ["首頁🏠", "回題目📜"] + ], resize_keyboard=True)) def send_answer(self, text, file_id): self.status = '正常使用' if text != '': if text == '首頁🏠': if self.check_online() == True: - self.display_main(self.from_id) + self.display_main(self.userid) return elif text == '回題目📜': if self.check_online() == True: self.display_question(self.question) return elif text == '刪除作業⚔️': - self.bot.sendMessage(self.from_id, "移除成功" if self.api.delete_answer(self.question) == True else "移除失敗", + bot.sendMessage(self.userid, "移除成功" if self.api.delete_answer(self.question) == True else "移除失敗", reply_markup=ReplyKeyboardMarkup(keyboard=[ ["首頁🏠", "回題目📜"], ["登出🚪", "改密碼💱", "幫助📚"] @@ -228,17 +229,17 @@ class kuser: f.write(text) f.close() else: - self.bot.download_file(file_id, self.username + self.question + '.c') + bot.download_file(file_id, self.username + self.question + '.c') self.api.delete_answer(self.question) if self.api.upload_answer(self.question, self.username + self.question + '.c') == True: - self.bot.sendMessage(self.from_id, "上傳成功", + bot.sendMessage(self.userid, "上傳成功", reply_markup=ReplyKeyboardMarkup(keyboard=[ ["首頁🏠", "回題目📜"], ["看結果☑️"], ["登出🚪", "改密碼💱", "幫助📚"] ], resize_keyboard=True)) else: - self.bot.sendMessage(self.from_id, "上傳失敗", + bot.sendMessage(self.userid, "上傳失敗", reply_markup=ReplyKeyboardMarkup(keyboard=[ ["首頁🏠", "回題目📜"], ["登出🚪", "改密碼💱", "幫助📚"] @@ -247,7 +248,7 @@ class kuser: def fail_send(self): self.status = '正常使用' - self.bot.sendMessage(self.from_id, "檔案不能超過 20 MB！上傳失敗", + bot.sendMessage(self.userid, "檔案不能超過 20 MB！上傳失敗", reply_markup=ReplyKeyboardMarkup(keyboard=[ ["首頁🏠", "回題目📜"], ["登出🚪", "改密碼💱", "幫助📚"] @@ -264,13 +265,13 @@ class kuser: q_str += "\n" for passer in self.api.list_passers(self.question): q_str += "\n" + passer - reply = self.bot.sendMessage(self.from_id, q_str + "", + reply = bot.sendMessage(self.userid, q_str + "", parse_mode='HTML', reply_markup=ReplyKeyboardMarkup(keyboard=[ ["首頁🏠", "回題目📜"], ["登出🚪", "改密碼💱", "幫助📚"] ], resize_keyboard=True)) - self.bot.sendMessage(self.from_id, "點我到名單頂", reply_to_message_id=reply['message_id']) + bot.sendMessage(self.userid, "點我到名單頂", reply_to_message_id=reply['message_id']) def list_results(self): self.status = '正常使用' @@ -283,7 +284,7 @@ class kuser: q_str += "\n測試編號 " + result[0] + "：" q_str += "✔️ " if result[1] == '通過測試' else "❌ " q_str += result[1] - self.bot.sendMessage(self.from_id, q_str, + bot.sendMessage(self.userid, q_str, parse_mode='HTML', reply_markup=ReplyKeyboardMarkup(keyboard=[ ["首頁🏠", "回題目📜"],