Revert "fix upload answer filename"

This reverts commit 0b8980b763.
This commit is contained in:
2018-04-14 17:08:55 +08:00
parent 0b8980b763
commit b02dd08410
2 changed files with 7 additions and 14 deletions

4
bot.py
View File

@ -128,7 +128,7 @@ def on_chat(msg):
elif user._status == '上傳答案':
if user.check_online(chat_id, msg['message_id']) == True:
user.send_answer(msg['text'], '', user.list_questions(chat_id)[user._question][3])
user.send_answer(msg['text'], '')
else:
if user.check_online(chat_id, msg['message_id']) == True:
@ -140,7 +140,7 @@ def on_chat(msg):
if msg['document']['file_size'] > 167770000:
user.send_failed()
else:
user.send_answer('', msg['document']['file_id'], user.list_questions(chat_id)[user._question][3])
user.send_answer('', msg['document']['file_id'])
def backup_db():
users_backup = {}

View File

@ -225,22 +225,15 @@ class Kuser:
["首頁🏠", "回題目📜"]
], resize_keyboard=True))
def send_answer(self, text, file_id, language):
def send_answer(self, text, file_id):
self._status = '正常使用'
# define filename
filename = self._username + self._question
if language == 'Python':
filename += '.py'
else:
filename += '.c'
if text != '':
with open(filename, 'w') as f:
with open(self._username + self._question + '.c', 'w') as f:
f.write(text)
else:
bot.download_file(file_id, filename)
bot.download_file(file_id, self._username + self._question + '.c')
self._api.delete_answer(self._question)
if self._api.upload_answer(self._question, filename) == True:
if self._api.upload_answer(self._question, self._username + self._question + '.c') == True:
bot.sendMessage(self._userid, "上傳成功",
reply_markup=ReplyKeyboardMarkup(keyboard=[
["首頁🏠", "回題目📜"],
@ -253,7 +246,7 @@ class Kuser:
["首頁🏠", "回題目📜"],
["登出🚪", "改密碼💱", "幫助📚"]
], resize_keyboard=True))
os.remove(filename)
os.remove(self._username + self._question + '.c')
def delete_answer(self):
bot.sendMessage(self._userid, "移除成功" if self._api.delete_answer(self._question) == True else "移除失敗",