sc-common-interface 2.3.1__tar.gz → 2.3.3__tar.gz

{sc-common-interface-2.3.1 → sc-common-interface-2.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sc-common-interface
-Version: 2.3.1
+Version: 2.3.3
 Summary: SC贴文销售公用的接口
 Home-page: UNKNOWN
 Author: river

{sc-common-interface-2.3.1 → sc-common-interface-2.3.3}/sc_common_interface/LiveCommonInterface.py

@@ -53,11 +53,27 @@ def end_activity(data):
 def send__live_comment(data):
     env = data["env"]
     key = data["key"]
-    info = get_live_info(data)
-    related_post_list = info["data"]["relatedPostList"][0]
-    page_id = related_post_list["page_id"]
-    post_id = related_post_list["post_id"]
-    platform = related_post_list["platform"]
+    platform = "FACEBOOK"
+    page_id = ""
+    post_id = ""
+    if "page_id" in data:
+        page_id = data['page_id']
+    if "platform" in data:
+        platform = data['platform']
+    if "post_id" in data:
+        post_id = data['post_id']
+    if page_id == "" or post_id == "":
+        info = get_live_info(data)
+        platform_list = jsonpath(info, "$..relatedPostList..platform")
+        i = platform_list.index(platform)
+        page_id = info["data"]["relatedPostList"][i]["page_id"]
+        platform = info["data"]["relatedPostList"][i]["platform"]
+        post_id =  info["data"]["relatedPostList"][i]["post_id"]
+    # info = get_live_info(data)
+    # related_post_list = info["data"]["relatedPostList"][0]
+    # page_id = related_post_list["page_id"]
+    # post_id = related_post_list["post_id"]
+    # platform = related_post_list["platform"]
     stamp = int(time.time())
     num = random.randint(100000, 999999)
     user_id = "488864%d" % int(time.time())
@@ -72,29 +88,36 @@ def send__live_comment(data):
     keyword = "接口测试普通留言"
     if "keyword" in data:
         keyword = data['keyword']
-    body = {}
-    if platform == "FACEBOOK":
-        body = {"object": "page", "entry": [{"id": page_id, "time": stamp, "changes": [{"field": "feed", "value": {
+    body = {"object": "page", "entry": [{"id": page_id, "time": stamp, "changes": [{"field": "feed", "value": {
             "from": {"id": user_id, "name": name},
             "post": {"status_type": "added_video", "is_published": True, "updated_time": "2022-11-18T09:57:26+0000",
                      "permalink_url": "https://www.facebook.com/permalink.php?story_fbid=pfbid02jLK3e6YdFSXp2DmD7j7vtStLXoBzTi8rxKrp6jFhVMUTTEgz6qvZA8soR9Uwydd8l&id=107977035056574",
                      "promotion_status": "inactive", "id": post_id}, "message": keyword, "item": "comment",
             "verb": "add", "post_id": post_id, "comment_id": comment_id,
             "created_time": stamp, "parent_id": post_id}}]}]}
-    elif platform == "INSTAGRAM":
+    # if platform == "FACEBOOK":
+    #     body = {"object": "page", "entry": [{"id": page_id, "time": stamp, "changes": [{"field": "feed", "value": {
+    #         "from": {"id": user_id, "name": name},
+    #         "post": {"status_type": "added_video", "is_published": True, "updated_time": "2022-11-18T09:57:26+0000",
+    #                  "permalink_url": "https://www.facebook.com/permalink.php?story_fbid=pfbid02jLK3e6YdFSXp2DmD7j7vtStLXoBzTi8rxKrp6jFhVMUTTEgz6qvZA8soR9Uwydd8l&id=107977035056574",
+    #                  "promotion_status": "inactive", "id": post_id}, "message": keyword, "item": "comment",
+    #         "verb": "add", "post_id": post_id, "comment_id": comment_id,
+    #         "created_time": stamp, "parent_id": post_id}}]}]}
+    if platform == "INSTAGRAM":
         body = {"entry": [{"id": page_id, "time": stamp, "changes": [{"value": {"from": {"id": user_id,
                  "username": name},
                   "media": {"id": post_id,
                    "media_product_type": "FEED"},
                 "id": comment_id, "text": keyword},
                    "field": "comments"}]}], "object": "instagram"}
-
+    print(body)
     url = "%s/facebook/webhook" % env
     sign_text = hmac.new(key.encode("utf-8"), json.dumps(body).encode("utf-8"), sha1)
     signData = sign_text.hexdigest()
     # print("body", json.dumps(body))
     header = {"Content-Type": "application/json", "x-hub-signature": "sha1=%s" % signData}
     response = requests.post(url, headers=header, data=json.dumps(body))
+    print(response.text)
     return user_id, name, comment_id
 
 def send_mc_message(data):
@@ -122,12 +145,18 @@ def send_mc_message(data):
         i = platform_list.index(platform)
         page_id = info["data"]["relatedPostList"][i]["page_id"]
         platform = info["data"]["relatedPostList"][i]["platform"]
-    body = {}
-    if platform.upper()=="FACEBOOK":
-        body = {"entry":[{"id":"%s"%page_id,"messaging":[{"message":
-        {"mid":"m_hhAqPhSlMTY4En2oWjSB59T3BFjeU97DdDV4WHr3DLWnPrO0iCsjQlG3hBN%d-sBlT26-6oNg"%stamp,"text":"%s"%message},
-        "recipient":{"id":"%s"%page_id},"sender":{"id":"%s"%user_id},"timestamp":stamp}],"time":stamp}],"object":"page"}
-    elif platform.upper()=="INSTAGRAM":
+    body = {"entry": [{"id": "%s" % page_id, "messaging": [{"message":
+      {
+       "mid": "m_hhAqPhSlMTY4En2oWjSB59T3BFjeU97DdDV4WHr3DLWnPrO0iCsjQlG3hBN%d-sBlT26-6oNg" % stamp,
+        "text": "%s" % message},
+         "recipient": {"id": "%s" % page_id},
+         "sender": {"id": "%s" % user_id}, "timestamp": stamp}],
+         "time": stamp}], "object": "page"}
+    # if platform.upper()=="FACEBOOK":
+    #     body = {"entry":[{"id":"%s"%page_id,"messaging":[{"message":
+    #     {"mid":"m_hhAqPhSlMTY4En2oWjSB59T3BFjeU97DdDV4WHr3DLWnPrO0iCsjQlG3hBN%d-sBlT26-6oNg"%stamp,"text":"%s"%message},
+    #     "recipient":{"id":"%s"%page_id},"sender":{"id":"%s"%user_id},"timestamp":stamp}],"time":stamp}],"object":"page"}
+    if platform.upper()=="INSTAGRAM":
         body={"object":"instagram","entry":[{"time":stamp,"id":"%s"%page_id,"messaging":[{"sender":{"id":"%s"%user_id},"recipient":{"id":"%s"%page_id},
        "timestamp":stamp,"message":{"mid":"aWdfZAG1faXRlbToxOklHTWVzc2FnZAUlEOjE3ODQxNDUwMzgwODgwNTMzOjM0MDI4MjM2Njg0MTcxMDMwMTI0NDI3NjAyNDExMzcwMDc2NTA5MDozMTgzODU0Mzg3NTY4MDYwMTE3ODUxOTE2MD%d"%stamp,"text":"%s"%message}}]}]}
     url = "%s/facebook/webhook" % env
@@ -330,7 +359,7 @@ def get_broadcast_list(data):
         for i,value in enumerate(name_list):
             if value==name:
                 broadcast_id =broadcast_id_list[i]
-    return broadcast_id,name
+    return broadcast_id,reponse
 
 def get_broadcast_detail(data):
     env = data["env"]

{sc-common-interface-2.3.1 → sc-common-interface-2.3.3}/sc_common_interface.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sc-common-interface
-Version: 2.3.1
+Version: 2.3.3
 Summary: SC贴文销售公用的接口
 Home-page: UNKNOWN
 Author: river

{sc-common-interface-2.3.1 → sc-common-interface-2.3.3}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='sc-common-interface',
-    version='2.3.1',
+    version='2.3.3',
     description='SC贴文销售公用的接口',
     author='river',
     packages=find_packages(),