complete hot keys

newbot.py

@@ -79,7 +79,7 @@ def get_idea():
         result+=str(c['query'])+"\n"
     return result
 
-def get_hotkeys(past=False):
+def get_hotkeys_ls(past=False):
     db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/yodb?charset=utf8mb4')
     now = ''
     sql_get_newest_data_date = 'SELECT * FROM trending_searches ORDER BY ts_date DESC'
@@ -98,7 +98,32 @@ def get_hotkeys(past=False):
         ls.append(row['ts_word'])
     ls = list(dict.fromkeys(ls))
     return ls
-
+def get_hotkeys(past=False):
+    js=json.load(open('test.json','r',encoding='utf-8'))
+    keys = get_hotkeys_ls(past=False)
+    num = 1
+    for k in keys:
+        row_dict = {}
+        row_dict['type'] = 'box'
+        row_dict['layout'] = 'baseline'
+        row_dict['contents']= [
+            {
+               "type": "text",
+                "text": "第"+str(num)+"名",
+                "size": "sm",
+                "color": "#aaaaaa",
+                "flex": 2
+            },
+            {
+                "type": "text",
+                "text": k,
+                "flex": 5,
+                "weight": "regular"
+            }
+            ]
+        num = num + 1
+        js['body']['contents'] = js['body']['contents'] + [row_dict]
+    return js
 
 @app.get("/aws")
 async def aws():
@@ -209,14 +234,12 @@ def message_text(event):
         return
     ############################
     if event.message.text == 'hotkeys':
-        line_bot_api.reply_message(
-            event.reply_token,[TextSendMessage(text=get_aws()),TextSendMessage(text=get_hotkeys(False))])
-                    
+        js = get_hotkeys(False)
+        line_bot_api.reply_message(event.reply_token, FlexSendMessage('ChoozMo',js))
         return
     if event.message.text == 'past_hotkeys':
-        line_bot_api.reply_message(
-            event.reply_token,[TextSendMessage(text=get_aws()),TextSendMessage(text=get_hotkeys(True))])
-                    
+        js = get_hotkeys(True)
+        line_bot_api.reply_message(event.reply_token, FlexSendMessage('ChoozMo',js))
         return
 
 
@@ -235,58 +258,12 @@ def message_text(event):
             
 
     if event.message.text=='熱門關鍵字':
-        js=json.load(open('test.json','r',encoding='utf-8'))
-        keys = get_hotkeys(past=False)
-        num = 1
-        for k in keys:
-            row_dict = {}
-            row_dict['type'] = 'box'
-            row_dict['layout'] = 'baseline'
-            row_dict['contents']= [
-                {
-                    "type": "text",
-                    "text": "第"+str(num)+"名",
-                    "size": "sm",
-                    "color": "#aaaaaa",
-                    "flex": 2
-                },
-                {
-                    "type": "text",
-                    "text": k,
-                    "flex": 5,
-                    "weight": "regular"
-                }
-                ]
-            num = num + 1
-            js['body']['contents'] = js['body']['contents'] + [row_dict]
+        js = get_hotkeys(False)
         line_bot_api.reply_message(event.reply_token, FlexSendMessage('ChoozMo',js))
         return
             
     if event.message.text=='關鍵字歷史走勢':
-        js=json.load(open('test.json','r',encoding='utf-8'))
-        keys = get_hotkeys(past=True)
-        num = 1
-        for k in keys:
-            row_dict = {}
-            row_dict['type'] = 'box'
-            row_dict['layout'] = 'baseline'
-            row_dict['contents']= [
-                {
-                    "type": "text",
-                    "text": "第"+str(num)+"名",
-                    "size": "sm",
-                    "color": "#aaaaaa",
-                    "flex": 2
-                },
-                {
-                    "type": "text",
-                    "text": k,
-                    "flex": 5,
-                    "weight": "regular"
-                }
-                ]
-            num = num + 1
-            js['body']['contents'] = js['body']['contents'] + [row_dict]
+        js = get_hotkeys(True)
         line_bot_api.reply_message(event.reply_token, FlexSendMessage('ChoozMo',js))
         return