Merge branch 'master' of http://git.choozmo.com:3000/choozmo/ArkCard-Linebot

main.py

@@ -91,14 +91,14 @@ def handle_follow(event):
 # message handler
 @handler.add(MessageEvent, message=TextMessage)
 def message(event):
-    if '我要發送' or 'NFT收藏' in event.message.text:
+    if '我要發送' in event.message.text:
         button_template_message = ButtonsTemplate(
             title=' ',
             text='點擊並打開收藏的NFT，可以選擇想要發送的NFT給對方！',
             actions=[
                 URITemplateAction(
-                    label='打開發送頁面',
-                    uri='http://ark.cards/collect.html?' + event.source.user_id),])
+                    label='打開發送頁',
+                    uri='https://ark.cards/collect.html?' + event.source.user_id),])
         line_bot_api.reply_message(
             event.reply_token,
             TemplateSendMessage(
@@ -111,8 +111,8 @@ def message(event):
             text='點擊並打開接收頁面，即可分享接收地址給對方！',
             actions=[
                 URITemplateAction(
-                    label='打開接收頁面',
-                    uri='http://ark.cards/qr-code.html?' + event.source.user_id),])
+                    label='打開接收頁',
+                    uri='https://ark.cards/qr-code.html?' + event.source.user_id),])
         line_bot_api.reply_message(
             event.reply_token,
             TemplateSendMessage(
@@ -125,14 +125,27 @@ def message(event):
             text='點擊並打開NFT商品頁，就可以購買您所想要的NFT商品哦！',
             actions=[
                 URITemplateAction(
-                    label='打開NFT商品頁面',
-                    uri='http://ark.cards/shop.html?' + event.source.user_id),])
+                    label='打開NFT商品頁',
+                    uri='https://ark.cards/shop.html?' + event.source.user_id),])
         line_bot_api.reply_message(
             event.reply_token,
             TemplateSendMessage(
                 alt_text="Receive",
                 template=button_template_message))
 
+    elif 'NFT收藏' in event.message.text:
+        button_template_message = ButtonsTemplate(
+            title=' ',
+            text='點擊並打開收藏的NFT，可以查看收到的NFT！',
+            actions=[
+                URITemplateAction(
+                    label='打開收藏頁',
+                    uri='https://ark.cards/collect.html?' + event.source.user_id), ])
+        line_bot_api.reply_message(
+            event.reply_token,
+            TemplateSendMessage(
+                alt_text="Receive",
+                template=button_template_message))
     else:
         button_template_message = ButtonsTemplate(
             title=' ',
@@ -140,7 +153,7 @@ def message(event):
             actions=[
                 URITemplateAction(
                     label='ArkCard的官網',
-                    uri='http://ark.cards'),])
+                    uri='https://ark.cards'),])
         line_bot_api.reply_message(
             event.reply_token,
             TemplateSendMessage(
@@ -243,4 +256,4 @@ async def buy(userModel : models.BuyNft):
     return "您已購買成功！"
 
 if __name__ == '__main__':
-    uvicorn.run("main:app", host="0.0.0.0", port=8228, reload=True)
+    uvicorn.run("main:app", host="0.0.0.0", port=8228, reload=True,ssl_context=('/etc/letsencrypt/live/ark.cards/fullchain.pem', '/etc/letsencrypt/live/ark.cards/privkey.pem'))