comments fixes (#504)

Author: Peter Bengtsson

adminui/build.zip

@@ -1,6 +1,5 @@
 import React from 'react';
 import md5 from 'md5';
-// import { Link } from 'react-router-dom';
 import {
   Button,
   Checkbox,
@@ -13,10 +12,6 @@ import {
   Message,
   TextArea,
   Form
-  //   Table,
-  //   Button,
-  //   Label,
-  //   Input
 } from 'semantic-ui-react';
 import { DisplayDate, ShowServerError } from './Common';
 import { BASE_URL } from './Config';
@@ -110,21 +105,6 @@ class Comments extends React.Component {
     });
   };
 
-  // deleteComment = async oid => {
-  //   const deleting = Object.assign({}, this.state.deleting);
-  //   deleting[oid] = true;
-  //   return this.setState({ deleting }, this._deleteComments);
-  // };
-
-  // _deleteComments = async () => {
-  //   const data = { oids: [] };
-  //   console.log('DATA:', data);
-  // };
-  // _approveComments = async () => {
-  //   console.warn('NOT YET');
-  //   throw new Error('work harder');
-  // };
-
   _deleteOrApproveComments = async (type, data) => {
     const { accessToken } = this.props;
     if (!accessToken) {
@@ -225,7 +205,6 @@ class Comments extends React.Component {
           <form
             onSubmit={event => {
               event.preventDefault();
-              console.log(this.refs.q.inputRef.value);
               this.setState(
                 { search: this.refs.q.inputRef.value },
                 this.fetchComments
@@ -358,46 +337,28 @@ class Checked extends React.PureComponent {
 
 class CommentsTree extends React.PureComponent {
   render() {
-    const {
-      comments,
-      count,
-      loading,
-      editing,
-      approving,
-      deleting,
-      approved,
-      deleted,
-      approveComment,
-      deleteComment,
-      editComment
-    } = this.props;
+    const { comments, count } = this.props;
+
+    let lastBlogitem = null;
     return (
       <Comment.Group>
         <Header as="h2" dividing>
           {count.toLocaleString()} Comments
         </Header>
 
         {comments.map(comment => {
-          // XXX Use {...props} instead!
+          const differentBlogitem = lastBlogitem !== comment.blogitem.id;
+          lastBlogitem = comment.blogitem.id;
           return (
             <CommentTree
               key={comment.id}
               comment={comment}
-              editing={editing}
-              approving={approving}
-              deleting={deleting}
-              approved={approved}
-              deleted={deleted}
               root={true}
-              loading={loading}
+              showBlogitem={differentBlogitem}
               addToSearch={term => {
                 this.props.updateFilterSearch(term);
               }}
-              setChecked={this.props.setChecked}
-              setEditing={this.props.setEditing}
-              approveComment={approveComment}
-              deleteComment={deleteComment}
-              editComment={editComment}
+              {...this.props}
             />
           );
         })}
@@ -408,7 +369,8 @@ class CommentsTree extends React.PureComponent {
 
 class CommentTree extends React.PureComponent {
   static defaultProps = {
-    root: false
+    root: false,
+    showBlogitem: false
   };
   hotness = seconds => {
     if (seconds < 60) {
@@ -435,6 +397,7 @@ class CommentTree extends React.PureComponent {
     const {
       comment,
       root,
+      showBlogitem,
       addToSearch,
       setChecked,
       setEditing,
@@ -450,7 +413,7 @@ class CommentTree extends React.PureComponent {
 
     return (
       <Comment>
-        {root && (
+        {root && showBlogitem && (
           <Header as="h4" dividing>
             <a
               href={BASE_URL + comment.blogitem._absolute_url}
@@ -604,7 +567,6 @@ class EditComment extends React.PureComponent {
       <Form
         onSubmit={event => {
           event.preventDefault();
-          console.log(this.state.text);
           this.props.editComment(this.props.comment, this.state.text);
         }}
       >

adminui/src/Comments.js

@@ -306,11 +306,11 @@ class Records extends React.PureComponent {
                       <pre className="exception">{record.exception}</pre>
                     ) : null}
 
-                    <ul style={{ margin: 0 }}>
+                    <ol style={{ margin: 0 }}>
                       {record.notes.map((note, i) => {
                         return <li key={i}>{note}</li>;
                       })}
-                    </ul>
+                    </ol>
                   </Table.Cell>
                 </Table.Row>
               );

adminui/src/PostProcessings.js

@@ -11,15 +11,14 @@
 
 
 def get_urls(base_url, exclude=set()):
+    urls = []
     if base_url.endswith("/"):
         base_url = base_url[:-1]
     doc = PyQuery(base_url + "/plog/")
     doc.make_links_absolute(base_url=base_url)
-    urls = []
     for a in doc("dd a"):
         href = a.attrib["href"]
         if href in exclude:
-            # print("EXCLUDE", href)
             continue
         urls.append(href)
 
@@ -36,7 +35,10 @@ def get_urls(base_url, exclude=set()):
             continue
         if href not in urls and href not in exclude:
             urls.append(href)
-    url_start = base_url + "/?page="
+            urls.append(href)
+            urls.append(href)
+
+    url_start = base_url + "/p"
     for i in range(2, 10):
         url = url_start + str(i)
         if url in exclude:

download-all-plogs.py

@@ -284,18 +284,19 @@ def _post_thumbnails(blogitem):
 def postprocessings(request):
 
     context = {
-        "statistics": _postprocessing_statistics(),
+        "statistics": _postprocessing_statistics(request.GET),
         "records": _postprocessing_records(request.GET),
     }
 
     return _response(context)
 
 
-def _postprocessing_statistics():
+def _postprocessing_statistics(request_GET):
 
     context = {"groups": []}
 
     base_qs = PostProcessing.objects.filter(duration__isnull=False)
+    base_qs = _filter_postprocessing_queryset(base_qs, request_GET)
 
     ongoing = (
         PostProcessing.ongoing()
@@ -404,10 +405,21 @@ def serialize_record(each):
             "_previous": None,
         }
 
-    duration_regex = re.compile(r"duration:?\s*(>|<)\s*([\d\.]+)s?")
-
     qs = PostProcessing.objects.all()
+    qs = _filter_postprocessing_queryset(qs, request_GET)
+
+    for each in qs.order_by("-created")[:limit]:
+        record = serialize_record(each)
+        if each.previous:
+            record["_previous"] = serialize_record(each.previous)
+        records.append(record)
+
+    return records
+
+
+def _filter_postprocessing_queryset(qs, request_GET):
     q = request_GET.get("q")
+    duration_regex = re.compile(r"duration:?\s*(>|<)\s*([\d\.]+)s?")
     if q:
         duration = re.findall(duration_regex, q)
         if duration:
@@ -423,14 +435,7 @@ def serialize_record(each):
             qs = qs.filter(url__endswith=q[:-1])
         elif q:
             qs = qs.filter(url__contains=q)
-
-    for each in qs.order_by("-created")[:limit]:
-        record = serialize_record(each)
-        if each.previous:
-            record["_previous"] = serialize_record(each.previous)
-        records.append(record)
-
-    return records
+    return qs
 
 
 @api_superuser_required
@@ -444,7 +449,7 @@ def searchresults(request):
     return _response(context)
 
 
-def _searchresults_statistics():
+def _searchresults_statistics(request_GET):
 
     context = {"groups": []}
 
@@ -588,7 +593,7 @@ def blogcomments(request):
     for each in (
         BlogComment.objects.filter(parent__isnull=False).values("parent_id").distinct()
     ):
-        all_parent_ids.add(each['parent_id'])
+        all_parent_ids.add(each["parent_id"])
 
     def _serialize_comment(item, blogitem=None):
         all_ids.add(item.id)
@@ -604,7 +609,7 @@ def _serialize_comment(item, blogitem=None):
             "email": item.email,
             "user_agent": item.user_agent,
             "ip_address": item.ip_address,
-            "_clues": rate_blog_comment(item),
+            "_clues": not item.approved and rate_blog_comment(item) or None,
             "replies": [],
         }
         if blogitem:
@@ -632,7 +637,7 @@ def _serialize_comment(item, blogitem=None):
     if since:
         base_qs = base_qs.filter(add_date__lt=since)
 
-    if request.GET.get('unapproved') == 'only':
+    if request.GET.get("unapproved") == "only":
         base_qs = base_qs.filter(approved=False)
 
     search = request.GET.get("search", "").lower().strip()

peterbecom/api/views.py

@@ -97,33 +97,37 @@ amqp==2.3.2 \
     --hash=sha256:eed41946890cd43e8dee44a316b85cf6fee5a1a34bb4a562b660a358eb529e1b
 anyjson==0.3.3 \
     --hash=sha256:37812d863c9ad3e35c0734c42e0bf0320ce8c3bed82cd20ad54cb34d158157ba
-lxml==4.3.0 \
-    --hash=sha256:f726444b8e909c4f41b4fde416e1071cf28fa84634bfb4befdf400933b6463af \
-    --hash=sha256:dd185cde2ccad7b649593b0cda72021bc8a91667417001dbaf24cd746ecb7c11 \
-    --hash=sha256:241fb7bdf97cb1df1edfa8f0bcdfd80525d4023dac4523a241907c8b2f44e541 \
-    --hash=sha256:99fdce94aeaa3ccbdfcb1e23b34273605c5853aa92ec23d84c84765178662c6c \
-    --hash=sha256:1afbac344aa68c29e81ab56c1a9411c3663157b5aee5065b7fa030b398d4f7e0 \
-    --hash=sha256:1f179dc8b2643715f020f4d119d5529b02cd794c1c8f305868b73b8674d2a03f \
-    --hash=sha256:69d83de14dbe8fe51dccfd36f88bf0b40f5debeac763edf9f8325180190eba6e \
-    --hash=sha256:3aa3f5288af349a0f3a96448ebf2e57e17332d99f4f30b02093b7948bd9f94cc \
-    --hash=sha256:de2e5b0828a9d285f909b5d2e9d43f1cf6cf21fe65bc7660bdaa1780c7b58298 \
-    --hash=sha256:a7c0cd5b8a20f3093ee4a67374ccb3b8a126743b15a4d759e2a1bf098faac2b2 \
-    --hash=sha256:c6f24149a19f611a415a51b9bc5f17b6c2f698e0d6b41ffb3fa9f24d35d05d73 \
-    --hash=sha256:bdd7c1658475cc1b867b36d5c4ed4bc316be8d3368abe03d348ba906a1f83b0e \
-    --hash=sha256:d6520aa965773bbab6cb7a791d5895b00d02cf9adc93ac2bf4edb9ac1a6addc5 \
-    --hash=sha256:1baad9d073692421ad5dbbd81430aba6c7f5fdc347f03537ae046ddf2c9b2297 \
-    --hash=sha256:56115fc2e2a4140e8994eb9585119a1ae9223b506826089a3ba753a62bd194a6 \
-    --hash=sha256:1d8736421a2358becd3edf20260e41a06a0bf08a560480d3a5734a6bcbacf591 \
-    --hash=sha256:b4f67b5183bd5f9bafaeb76ad119e977ba570d2b0e61202f534ac9b5c33b4485 \
-    --hash=sha256:1e1d9bddc5afaddf0de76246d3f2152f961697ad7439c559f179002682c45801 \
-    --hash=sha256:51102e160b9d83c1cc435162d90b8e3c8c93b28d18d87b60c56522d332d26879 \
-    --hash=sha256:34dfaa8c02891f9a246b17a732ca3e99c5e42802416628e740a5d1cb2f50ff49 \
-    --hash=sha256:2f9765ee5acd3dbdcdc0d0c79309e01f7c16bc8d39b49250bf88de7b46daaf58 \
-    --hash=sha256:abe12886554634ed95416a46701a917784cb2b4c77bfacac6916681d49bbf83d \
-    --hash=sha256:3273db1a8055ca70257fd3691c6d2c216544e1a70b673543e15cc077d8e9c730 \
-    --hash=sha256:0dd6589fa75d369ba06d2b5f38dae107f76ea127f212f6a7bee134f6df2d1d21 \
-    --hash=sha256:312e1e1b1c3ce0c67e0b8105317323e12807955e8186872affb667dbd67971f6 \
-    --hash=sha256:d1e111b3ab98613115a208c1017f266478b0ab224a67bc8eac670fa0bad7d488
+lxml==4.2.6 \
+    --hash=sha256:51a9a441aefc8c93512bad5efe867d2ff086e7249ce0fc3b47c310644b352936 \
+    --hash=sha256:29b8acd8ecdf772266dbac491f203c71664b0b07ad4309ba2c3bb131306332fc \
+    --hash=sha256:a07447e46fffa5bb4d7a0af0a6505c8517e9bd197cfd2aec79e499b6e86cde49 \
+    --hash=sha256:a378fd61022cf4d3b492134c3bc48204ac2ff19e0813b23e07c3dd95ae8df0bc \
+    --hash=sha256:cc039668f91d8af8c4094cfb5a67c7ae733967fdc84c0507fe271db81480d367 \
+    --hash=sha256:3ce5488121eb15513c4b239dadd67f9e7959511bd766aac6be0c35e80274f298 \
+    --hash=sha256:60a5323b2bc893ca1059d283d6695a172d51cc95a70c25b3e587e1aad5459c38 \
+    --hash=sha256:f52fe795e08858192eea167290033b5ff24f50f51781cb78d989e8d63cfe73d1 \
+    --hash=sha256:2b05e5e06f8e8c63595472dc887d0d6e0250af754a35ba690f6a6abf2ef85691 \
+    --hash=sha256:16cf8bac33ec17049617186d63006ba49da7c5be417042877a49f0ef6d7a195d \
+    --hash=sha256:4e9822fad564d82035f0b6d701a890444560210f8a8648b8f15850f8fe883cd9 \
+    --hash=sha256:30d6ec05fb607a5b7345549f642c7c7a5b747b634f6d5e935596b910f243f96f \
+    --hash=sha256:eca305b200549906ea25648463aeb1b3b220b716415183eaa99c998a846936d9 \
+    --hash=sha256:76d62cc048bda0ebf476689ad3eb8e65e6827e43a7521be3b163071020667b8c \
+    --hash=sha256:aa7d096a44ae3d475c5ed763e24cf302d32462e78b61bba73ce1ad0efb8f522a \
+    --hash=sha256:48be0c375350a5519bb9474b42a9c0e7ab709fb45f11bfcd33de876791137896 \
+    --hash=sha256:3bf683f0237449ebc1851098f664410e3c99ba3faa8c9cc82c6acfe857df1767 \
+    --hash=sha256:260868f69d14a64dd1de9cf92e133d2f71514d288de4906f109bdf48ca9b756a \
+    --hash=sha256:ade8785c93a985956ba6499d5ea6d0a362e24b4a9ba07dd18920fd67cccf63ea \
+    --hash=sha256:5bbed9efc8aeb69929140f71a30e655bf496b45b766861513960e1b11168d475 \
+    --hash=sha256:83b58b2b5904d50de03a47e2f56d24e9da4cf7e3b0d66fb4510b18fca0faf910 \
+    --hash=sha256:78163b578e6d1836012febaa1865e095ccc7fc826964dd69a2dbfe401618a1f7 \
+    --hash=sha256:49bc343ca3b30cd860845433bb9f62448a54ff87b632175108bacbc5dc63e49e \
+    --hash=sha256:18f2d8f14cc61e66e8a45f740d15b6fc683c096f733db1f8d0ee15bcac9843de \
+    --hash=sha256:d89f1ffe98744c4b5c11f00fb843a4e72f68a6279b5e38168167f1b3c0fdd84c \
+    --hash=sha256:4cc7531e86a43ea66601763c5914c3d3adb297f32e4284957609b90d41825fca \
+    --hash=sha256:e750da6ac3ca624ae3303df448664012f9b6f9dfbc5d50048ea8a12ce2f8bc29 \
+    --hash=sha256:e691b6ef6e27437860016bd6c32e481bdc2ed3af03289707a38b9ca422105f40 \
+    --hash=sha256:a17d808b3edca4aaf6b295b5a388c844a0b7f79aca2d79eec5acc1461db739e3 \
+    --hash=sha256:7035d9361f3ceec9ccc1dd3482094d1174580e7e1bf6870b77ea758f7cad15d2
 django-semanticui-form==0.0.1 \
     --hash=sha256:2a08d5fe4afadfe48ad8077092cfa1de2ecb14404358b6daad5fb47a4efaeb3a \
     --hash=sha256:d3fe71ea4586b1bfb214f7b549321879cc4104bbf7e73f1d64f81a27322ef8c9 \