From b60ac863b4c947d1ef8d611ec1bac0e7a52541ec Mon Sep 17 00:00:00 2001
From: zhanhuasheng <zhanhuasheng@channelwill.cn>
Date: Fri, 8 Mar 2024 09:50:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E4=B8=8D=E5=90=8C=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Utils/websocket_handler.py | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/Utils/websocket_handler.py b/Utils/websocket_handler.py
index 7b2652d..9c844e5 100644
--- a/Utils/websocket_handler.py
+++ b/Utils/websocket_handler.py
@@ -95,24 +95,14 @@ async def ws_action(ws,case):
 
 async def ws_send_handler(case,ws):
     data = case['data']  # 消息数据
-    msgType = 'newstext'
     if data['type'] in ['text', 'emoji']:
         content = r'{"contentList":"%s","attachmentList":[]}' % data['content']
-    elif data['type'] == 'image':
-        content = "{\"contentList\":\"<div data-type=\\\"willdesk-image\\\" class=\\\"willdesk-chat-image\\\" contenteditable=\\\"false\\\"><img src=\\\"%s\\\" data-width=\\\"64\\\" data-height=\\\"64\\\" data-size=\\\"1268\\\" data-chattagtype=\\\"wd-img\\\" style=\\\"max-height: 200px; max-width: 200px; vertical-align: bottom; margin: 2px 0px; border-radius: 4px; width: 64px; height: 64px;\\\"></div> <br>\",\"attachmentList\":[]}"%livechatData.imgSrc
-    elif data['type'] == 'file':
-        content = r'{"contentList":"","attachmentList":[{"src":"%s","blobSrc":"%s","name":"新建 文本文档.txt","size":0,"type":"text/plain"}]}'%(livechatData.fileSrc,livechatData.fileSrc)
-    elif data['type'] == 'article':
-        content = r'{"contentList":"<div data-type="willdesk-faq" style="background: rgb(255, 255, 255); border-radius: 8px; min-width: 230px; max-width: 100%; width: 300px; box-sizing: border-box; position: relative; border: 0.5px solid rgb(229, 229, 235);"><div style="padding: 12px 16px 0px; color: rgb(18, 17, 39); font-size: 16px; font-weight: 600; line-height: 24px; overflow: hidden; display: -webkit-box; text-overflow: ellipsis; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">article title</div><div style="padding: 4px 16px 12px; color: rgb(108, 107, 128); font-size: 14px; max-height: 48px; font-weight: 400; line-height: 24px; overflow: hidden; display: -webkit-box; text-overflow: ellipsis; -webkit-box-orient: vertical; -webkit-line-clamp: 2;"><p>article_detail</p></div><a href="%s" title="faq" target="_blank" style="box-sizing: border-box; margin-top: 8px; text-decoration: none; padding: 8px 16px; background: rgb(243, 243, 246); color: rgb(44, 35, 229); font-size: 14px; font-family: Inter; line-height: 22px; width: 100%; border-radius: 0px 0px 8px 8px; display: inline-block;">View all →</a></div>","attachmentList":[]}' %data['content']
-    elif data['type'] == 'rate':
-        content = r'[&*{"reviewContent":"%s","thumbsReviews":{"good":"","bad":"FeedbackURL"},"startReviews":{"one_start":"FeedbackURL","two_start":"FeedbackURL","three_start":"FeedbackURL","four_start":"","five_start":"www.baidu.com"},"reviewTitle":"%s","reviewChoose":"thumbs","askSendReview":"true","autoSendReview":"false","primaryColor":"#2C23E5"}]'%(livechatData.rateContent,livechatData.rateTitle)
+    else:
+        content = getattr(livechatData,data['type'])
+    if data['type'] != 'rate':
+        msgType = 'newstext'
+    else:
         msgType = 'rate'
-    elif data['type'] == 'link':
-        content =  "{\"contentList\":\"<a class=\\\"wd-chat-link\\\" data-type=\\\"willdesk-link\\\" href=\\\"%s\\\" contenteditable=\\\"false\\\" target=\\\"_blank\\\">%s</a>\",\"attachmentList\":[]}"%(livechatData.linkHref,livechatData.linkTitle)
-    elif data['type'] == 'product':
-        content =  "{\"contentList\":\"<a href=\\\"https://zhs-test.myshopify.com/products/selling-plans-ski-wax\\\" title=\\\"https://zhs-test.myshopify.com/products/selling-plans-ski-wax\\\" data-type=\\\"willdesk-product\\\" target=\\\"_blank\\\" style=\\\"display: flex; background: rgb(255, 255, 255); border-radius: 8px; min-height: 80px; max-height: 150px; min-width: 100px; max-width: 100%; width: 300px; box-sizing: border-box; position: relative; text-decoration: none; padding: 12px 16px; border: 1px solid rgb(231, 233, 236);\\\"><img src=\\\"https://cdn.shopify.com/s/files/1/0690/4551/8586/products/snowboard_wax.png?v=1708331992\\\" style=\\\"width: 110px; height: 110px; max-height: 150px; object-fit: cover; border-radius: 8px; margin-right: 4%; flex-shrink: 0; border: 0.5px solid rgb(231, 233, 236);\\\"><div style=\\\"width: calc(100% - 118px); display: flex; flex-direction: column; position: relative; justify-content: center;\\\"><div style=\\\"width: 100%; max-height: 48px; line-height: 24px; color: rgb(18, 17, 39); font-size: 14px; font-weight: bold; overflow: hidden; display: -webkit-box; text-overflow: ellipsis; -webkit-box-orient: vertical; -webkit-line-clamp: 2;\\\">Selling Plans Ski Wax</div></div></a>\",\"attachmentList\":[]}"
-    elif data['type'] == 'coupon':
-        content = r'{"contentList":"<a class="wd-chat-link" data-type="willdesk-link" href="https://tt-zldev003.myshopify.com/discount/V-0QE73BP5" contenteditable="false" style="margin-right: 8px" target="_blank">优惠券</a>","attachmentList":[]}'
     fromId = data['fromId'] if data.get('fromId') else getattr(Global, 'customerId')
     siteId = data['siteId'] if data.get('siteId') else getattr(Global, 'shopId')
     uid = data['uid'] if data.get('uid') else getattr(Global, 'userId')
-- 
GitLab