diff --git a/interface.py b/interface.py index ece1853..bbbf83f 100644 --- a/interface.py +++ b/interface.py @@ -127,7 +127,7 @@ class Kuser: q_str = '' for key in q_dict.keys(): if q_dict[key][1] == 'ๆœŸ้™ๆœชๅˆฐ': - q_str += "๐Ÿ“—" + key + " (DL: " + q_dict[key][0] + ")\n [[" + q_dict[key][2] + "]]" + q_str += "๐Ÿ“—" + key + " (DL: " + q_dict[key][0] + ")\n [[" + q_dict[key][3] + "]] [[" + q_dict[key][2] + "]]" q_str += "โš ๏ธ" if q_dict[key][2] == 'ๆœช็นณ' else "โœ…" q_str += " /question_" + key + "\n\n" bot.sendMessage(chat_id, "๐Ÿ’ " + self._username + " " + NAME + "\n" @@ -148,7 +148,7 @@ class Kuser: q_str = '' for key in q_dict.keys(): q_str += "๐Ÿ“—" if q_dict[key][1] == 'ๆœŸ้™ๆœชๅˆฐ' else "๐Ÿ“•" - q_str += "" + key + " (DL: " + q_dict[key][0] + ")\n [[" + q_dict[key][2] + "]]" + q_str += "" + key + " (DL: " + q_dict[key][0] + ")\n [[" + q_dict[key][3] + "]] [[" + q_dict[key][2] + "]]" q_str += "โš ๏ธ" if q_dict[key][2] == 'ๆœช็นณ' else "โœ…" q_str += " /question_" + key + "\n\n" reply = bot.sendMessage(chat_id, "๐Ÿ’ " + self._username + " " + NAME + "\n" @@ -176,7 +176,7 @@ class Kuser: q_str = "๐Ÿ’ *" + self._username + "* [" + NAME + "]\n" q_str += "โž–โž–โž–โž–โž–\n" q_str += "๐Ÿ“—" if q[1] == 'ๆœŸ้™ๆœชๅˆฐ' else "๐Ÿ“•" - q_str += "*" + number + "* (DL: " + q[0] + ")\n [[[" + q[2] + "]]]" + q_str += "*" + number + "* (DL: " + q[0] + ")\n [[[" + q[3] + "]]] [[[" + q[2] + "]]]" q_str += "โš ๏ธ" if q[2] == 'ๆœช็นณ' else "โœ…" reply = bot.sendMessage(chat_id, q_str + "\n\n" + content, parse_mode='Markdown', @@ -215,7 +215,7 @@ class Kuser: q_str = "๐Ÿ’ " + self._username + " " + NAME + "\n" q_str += "โž–โž–โž–โž–โž–\n" q_str += "๐Ÿ“—" if q[1] == 'ๆœŸ้™ๆœชๅˆฐ' else "๐Ÿ“•" - q_str += "" + self._question + " (DL: " + q[0] + ")\n [[" + q[2] + "]]" + q_str += "" + self._question + " (DL: " + q[0] + ")\n [[" + q[3] + "]] [[" + q[2] + "]]" q_str += "โš ๏ธ" if q[2] == 'ๆœช็นณ' else "โœ…" bot.sendMessage(self._userid, q_str + "\n\n็พๅœจ่ซ‹ๆŠŠไฝ ็š„็จ‹ๅผ็ขผ่ฎ“ๆˆ‘็œ‹็œ‹๏ผˆ่ซ‹ๅˆฅ่ถ…้Ž 20 MB๏ผ‰\n" "ๅฏไปฅไฝฟ็”จใ€Œๆ–‡ๅญ—่จŠๆฏใ€ๆˆ–ๆ˜ฏใ€Œๅ‚ณ้€ๆช”ๆกˆใ€็š„ๆ–นๅผ\n" @@ -269,7 +269,7 @@ class Kuser: q_str = "๐Ÿ’ " + self._username + " " + NAME + "\n" q_str += "โž–โž–โž–โž–โž–\n" q_str += "๐Ÿ“—" if q[1] == 'ๆœŸ้™ๆœชๅˆฐ' else "๐Ÿ“•" - q_str += "" + self._question + " (DL: " + q[0] + ")\n [[" + q[2] + "]]" + q_str += "" + self._question + " (DL: " + q[0] + ")\n [[" + q[3] + "]] [[" + q[2] + "]]" q_str += "โš ๏ธ" if q[2] == 'ๆœช็นณ' else "โœ…" q_str += "\n" for passer in self._api.list_passers(self._question): diff --git a/kcoj.py b/kcoj.py index 9da0c8c..5cf7d69 100644 --- a/kcoj.py +++ b/kcoj.py @@ -39,7 +39,8 @@ class KCOJ: deadline = tag.find_all('td')[3].get_text().strip() submit = "ๆœŸ้™ๅทฒๅˆฐ" if tag.find_all('td')[4].get_text().strip() == "ๆœŸ้™ๅทฒ้Ž" else "ๆœŸ้™ๆœชๅˆฐ" status = tag.find_all('td')[6].get_text().strip() - questions[number] = (deadline, submit, status) + language = tag.find_all('td')[5].get_text().strip() + questions[number] = (deadline, submit, status, language) return questions except requests.exceptions.Timeout: return {'Timeout':('Timeout', 'Timeout', 'Timeout')}