From 0b8980b763f812b8501560c38d113d498a7c4ac4 Mon Sep 17 00:00:00 2001
From: Pin Lin <moneycat711@gmail.com>
Date: Sat, 14 Apr 2018 16:55:27 +0800
Subject: [PATCH] fix upload answer filename

---
 bot.py       |  4 ++--
 interface.py | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/bot.py b/bot.py
index ddb1804..11a5141 100644
--- a/bot.py
+++ b/bot.py
@@ -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.send_answer(msg['text'], '', user.list_questions(chat_id)[user._question][3])
 
             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.send_answer('', msg['document']['file_id'], user.list_questions(chat_id)[user._question][3])
 
 def backup_db():
     users_backup = {}
diff --git a/interface.py b/interface.py
index 9edb820..08cb9fd 100644
--- a/interface.py
+++ b/interface.py
@@ -225,15 +225,22 @@ class Kuser:
                                                  ["首頁🏠", "回題目📜"]
                                              ], resize_keyboard=True))
 
-    def send_answer(self, text, file_id):
+    def send_answer(self, text, file_id, language):
         self._status = '正常使用'
+        # define filename
+        filename = self._username + self._question
+        if language == 'Python':
+            filename += '.py'
+        else:
+            filename += '.c'
+
         if text != '':
-            with open(self._username + self._question + '.c', 'w') as f:
+            with open(filename, 'w') as f:
                 f.write(text)
         else:
-            bot.download_file(file_id, self._username + self._question + '.c')
+            bot.download_file(file_id, filename)
         self._api.delete_answer(self._question)
-        if self._api.upload_answer(self._question, self._username + self._question + '.c') == True:
+        if self._api.upload_answer(self._question, filename) == True:
             bot.sendMessage(self._userid, "上傳成功",
                 reply_markup=ReplyKeyboardMarkup(keyboard=[
                     ["首頁🏠", "回題目📜"],
@@ -246,7 +253,7 @@ class Kuser:
                     ["首頁🏠", "回題目📜"],
                     ["登出🚪", "改密碼💱", "幫助📚"]
                 ], resize_keyboard=True))
-        os.remove(self._username + self._question + '.c')    
+        os.remove(filename)    
     
     def delete_answer(self):
         bot.sendMessage(self._userid, "移除成功" if self._api.delete_answer(self._question) == True else "移除失敗",