From e964957abcf9861f2460ca3598852bdc5f48ef81 Mon Sep 17 00:00:00 2001
From: baoliang <j2eer@163.com>
Date: Thu, 22 Oct 2020 00:29:06 +0800
Subject: [PATCH] add message

---
 dashboard/models.py                           |   2 +-
 polls/utils.py                                |  44 ++++++++----------
 polls/views/__pycache__/notice.cpython-38.pyc | Bin 4273 -> 4277 bytes
 polls/views/__pycache__/task.cpython-38.pyc   | Bin 3879 -> 3877 bytes
 polls/views/notice.py                         |   4 +-
 polls/views/task.py                           |   2 +-
 6 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/dashboard/models.py b/dashboard/models.py
index 63eb3b2..c97319c 100644
--- a/dashboard/models.py
+++ b/dashboard/models.py
@@ -170,7 +170,7 @@ class Userprofile(models.Model):
         return Userprofile.objects.filter(organization__level__level=1)
 
     def __str__(self):
-        if self.is_leve1:
+        if self.is_level1:
             return '省级管理员%s' % (self.name,)
         elif self.is_level2:
             return '市级管理员%s' % (self.name,)
diff --git a/polls/utils.py b/polls/utils.py
index 00b388e..2974b24 100644
--- a/polls/utils.py
+++ b/polls/utils.py
@@ -4,7 +4,6 @@ import requests
 import random
 from parsel import Selector
 from channels.db import database_sync_to_async
-from .exceptions import ClientError
 from django.conf import settings
 from itertools import chain
 
@@ -40,6 +39,8 @@ def detect_type(url):
         return 'toutiao'
     elif 'ixigua.com' in url:
         return 'xigua'
+    elif 'gansudaily.com.cn' in url:
+        return 'xgs'
     else:
         return 'other'
 
@@ -51,6 +52,8 @@ def parse(url):
         "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8",
     }
     r = requests.get(url, headers=headers)
+    r.encoding='utf-8'
+    print(r.text)
     selector = Selector(text=r.text)
     if t == 'weixin':
         og_title = selector.xpath(
@@ -61,23 +64,20 @@ def parse(url):
             '//head/meta[@property="og:url"]/@content').get()
         og_image = selector.xpath(
             '//head/meta[@property="og:image"]/@content').get()
-    elif t == 'xigua':
-        og_title = selector.xpath(
-            '//head/meta[@property="og:title"]/@content').get()
-        og_description = selector.xpath(
-            '//head/meta[@property="og:description"]/@content').get()
-        og_url = selector.xpath(
-            '//head/meta[@property="og:url"]/@content').get()
-        og_image = selector.xpath(
-            '//head/meta[@property="og:image"]/@content').get()
     elif t == 'toutiao':
-        og_title = selector.xpath('//head/title/text()')
+        og_title = selector.xpath('//head/title/text()').get()
+        og_description = selector.xpath(
+            '//head/meta[@name="description"]/@content').get()
+        og_url = url
+        og_image = None
+    elif t == 'xgs':
+        og_title = selector.xpath('//head/title/text()').get()
         og_description = selector.xpath(
             '//head/meta[@name="description"]/@content').get()
         og_url = url
         og_image = None
     else:
-        og_title = selector.xpath('//head/title/text()')
+        og_title = selector.xpath('//head/title/text()').get()
         og_description = selector.xpath(
             '//head/meta[@name="description"]/@content').get()
         og_url = url
@@ -85,17 +85,6 @@ def parse(url):
     return (og_title, og_description, og_url, og_image)
 
 
-@database_sync_to_async
-def get_room_or_error(room_id, user):
-    """
-    Tries to fetch a room for the user, checking permissions along the way.
-    """
-    # Check if the user is logged in
-    if not user.is_authenticated:
-        raise ClientError("USER_HAS_TO_LOGIN")
-
-
-
 def model_to_dict(instance, fields):
     opts = instance._meta
     data = {}
@@ -121,6 +110,13 @@ def queryset_to_list(q, fields):
 
 if __name__ == '__main__':
     # sent_sms_code('13993199566')
+    # og_title, og_description, og_url, og_image = parse(
+    #     'https://mp.weixin.qq.com/s/EhX0Pm1e0FAfse0zz9ow8Q')
+    # og_title, og_description, og_url, og_image = parse(
+    #     'https://m.toutiao.com/i6883651337003729420/?tt_from=weixin&utm_campaign=client_share&app=news_article&utm_source=weixin&iid=1494959660475024&utm_medium=toutiao_android&wxshare_count=1')
+    # og_title, og_description, og_url, og_image = parse(
+    #     'http://www.gov.cn/xinwen/2020-10/13/content_5550906.htm')
     og_title, og_description, og_url, og_image = parse(
-        'https://mp.weixin.qq.com/s/EhX0Pm1e0FAfse0zz9ow8Q')
+        'http://xgs.gansudaily.com.cn/pages/h5/hot/b3297046a53e47f594ed19db90c1183c.html')
+
     print(og_title, og_description, og_url, og_image)
diff --git a/polls/views/__pycache__/notice.cpython-38.pyc b/polls/views/__pycache__/notice.cpython-38.pyc
index 3eea7172c8f9ba6e799a1e6078d1b8b0ae04341f..61c10729548247f297fd678560e858b8afbe46ea 100644
GIT binary patch
delta 143
zcmdm}xK)uWl$V!_0SF>PH*#HPmt@TntYJ$Lw_&JZt6@%&uwlsKs$t3!s$rh|i~XfY
z5g$<HE!N!Bl+45^_Vl9s(gM%PKR8;&ZgGG)@tG+_qCh1@N+7~@av$d;W-dmq&B|O#
gOaks8F%J;o2_n2Uhw`K|F}hE7<PqL{f$t$B0FqlJd;kCd

delta 128
zcmdn0xKWWSl$V!_0SHPgH*#HPmt?D9P7$|ZsA0_#tYJ%$uwlsKs$t3!s$rY_i~XhO
zE!N!Bl+45;KA?tM9O*^*r3LYslfQGc3KqEng^EN$gc68wn>>kg5;F%Q&t`QlC8o(o
T`S=;VH%IcM!<ZNNo-zUearh#|

diff --git a/polls/views/__pycache__/task.cpython-38.pyc b/polls/views/__pycache__/task.cpython-38.pyc
index 43d23af1a5d52633a3fc312edd2b2b9357357158..5daed367c4f8091afd1fae98bf93c8ff0b1ffc69 100644
GIT binary patch
delta 69
zcmZ23w^WWdl$V!_0SH1vCd5D6$h(n+F>mvJ770dipIU(uku0t((Hemi;a<jC!5Tpq
YhFGJ??^v}qOR)(uGfHgM;rz`C0EMX%fB*mh

delta 72
zcmZ1~w_J`ll$V!_0SL-1C&a(p$h(n+v0(Fl770dizgmG3ku0t((Hemi;a<jC!5Tpq
bhFFuy?^v~%viLSjun96VN^RES{LKmgzBUsG

diff --git a/polls/views/notice.py b/polls/views/notice.py
index 845a28a..323eaae 100644
--- a/polls/views/notice.py
+++ b/polls/views/notice.py
@@ -96,10 +96,10 @@ def detail_notice(request, notice_id):
                 detail['type'] = 'douyin'
             else:
                 detail['type'] = 'qita'
-            results['media'] = detail
             detail['status'] = m.status
+            results['media'] = detail
         else:
-            detail['group_id'] = notice.group_id
+            results['groupId'] = notice.group_id
         results['added'] = notice.added.strftime("%Y-%m-%d %H:%M:%S")
         results['updated'] = notice.updated.strftime("%Y-%m-%d %H:%M:%S")
         return JsonResponse({'status': 'success', 'message': results})
diff --git a/polls/views/task.py b/polls/views/task.py
index 6771733..f13e4ea 100644
--- a/polls/views/task.py
+++ b/polls/views/task.py
@@ -72,7 +72,7 @@ def create_task(request):
         for u in users:
             g = Group.objects.get(id=group)
             content = '%s在群组“%s”发布了任务，请查收消息' % (profile, g.name)
-            Notice.create_normal_notice(u.user_id, content, group.id)
+            Notice.create_normal_notice(u.user_id, content, group)
     return JsonResponse({'status': 'success'})