From e2441a8d284ad3177fac5af9a8bb0c94903f8abb Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Dec 07 2017 11:03:13 +0000
Subject: Let the SSE server to send the notifications so they can be displayed live


Fixes https://pagure.io/pagure/issue/2830

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index 851b792..5fb8fac 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -4483,6 +4483,21 @@ def add_metadata_update_notif(session, obj, messages, user, gitfolder):
     # Make sure we won't have SQLAlchemy error before we continue
     session.commit()
 
+    REDIS.publish(
+        'pagure.%s' % obj.uid, json.dumps({
+            'comment_id': obj_comment.id,
+            '%s_id' % obj.isa: obj.id,
+            'project': obj.project.fullname,
+            'comment_added': text2markdown(obj_comment.comment),
+            'comment_user': obj_comment.user.user,
+            'avatar_url': avatar_url_from_email(
+                obj_comment.user.default_email, size=16),
+            'comment_date': obj_comment.date_created.strftime(
+                '%Y-%m-%d %H:%M:%S'),
+            'notification': True,
+        })
+    )
+
     if gitfolder:
         pagure.lib.git.update_git(
             obj, repo=obj.project, repofolder=gitfolder)
diff --git a/pagure/static/issue_ev.js b/pagure/static/issue_ev.js
index 1eb0afa..286bb48 100644
--- a/pagure/static/issue_ev.js
+++ b/pagure/static/issue_ev.js
@@ -131,47 +131,60 @@ remove_deps = function(data, issue_uid, _issue_url) {
 add_comment = function(data, username) {
   console.log('Adding comment ' + data.comment_added);
   var field = $('#comments');
-  var _data = '<div class="card clearfix"> \
-    <div id="comment-' + data.comment_id + '" class="card-header"> \
-    <img class="avatar circle" src="' + data.avatar_url + '"/> \
-    <a href="/user/' + data.comment_user + '"> ' + data.comment_user + '\
-      </a> \
-      <a class="headerlink pull-xs-right" title="Permalink to this headline" \
-        href="#comment-' + data.comment_id + '"> \
-        <span title="">seconds ago</span> \
-       </a>\
-    </div>\
-    <div class="card-block">\
-      <section class="issue_comment"> \
-        <div class="comment_body"> \
-          <span class="edit_date" title=""> \
-          </span>\
-      ' + emojione.toImage(data.comment_added) + '\
+  if (data.notification){
+    var _data = '<div class="card">'
+          + '<div class="card-header">'
+             + '<div>'
+                + '<div class="pull-xs-right text-muted">'
+                    + '<span title="'+ data.comment_date + ' ">seconds ago</span>'
+                + '</div>'
+                + '<small>' + data.comment_added + '</small>'
+              + '</div>'
+            + '</div>'
+          + '</div>';
+  } else {
+    var _data = '<div class="card clearfix"> \
+      <div id="comment-' + data.comment_id + '" class="card-header"> \
+      <img class="avatar circle" src="' + data.avatar_url + '"/> \
+      <a href="/user/' + data.comment_user + '"> ' + data.comment_user + '\
+        </a> \
+        <a class="headerlink pull-xs-right" title="Permalink to this headline" \
+          href="#comment-' + data.comment_id + '"> \
+          <span title="">seconds ago</span> \
+         </a>\
+      </div>\
+      <div class="card-block">\
+        <section class="issue_comment"> \
+          <div class="comment_body"> \
+            <span class="edit_date" title=""> \
+            </span>\
+        ' + emojione.toImage(data.comment_added) + '\
+          </div> \
+        </section> \
+        <div class="issue_actions m-t-2"> \
+          <aside class="issue_action icon pull-xs-right p-b-1"> \
+          <div class="btn-group" aria-label="Basic example" role="group"> \
+          <a class="reply btn btn-secondary btn-sm" title="" data-toggle="tooltip" data-original-title="Reply to this comment - lose formatting"> \
+              <span class="oi" data-glyph="share-boxed"></span> \
+          </a>';
+      if ( data.comment_user == username) {
+            _data += '<a class="btn btn-secondary btn-sm" data-objid="' + data.issue_id
+            + '" data-comment="' + data.comment_id
+            + '" href="/' + data.project + '/issue/' + data.issue_id + '/comment/' + data.comment_id + '/edit"> \
+              <span class="oi" data-glyph="pencil"></span> \
+            </a> \
+            <button class="btn btn-secondary btn-sm" \
+              title="Remove comment" \
+              name="drop_comment" value="' + data.comment_id + '" type="submit"  \
+              onclick="return confirm(\'Do you really want to remove this comment?\');" \
+              ><span class="oi" data-glyph="trash"></span> \
+            </button>';
+      }
+      _data += '</aside> \
         </div> \
-      </section> \
-      <div class="issue_actions m-t-2"> \
-        <aside class="issue_action icon pull-xs-right p-b-1"> \
-        <div class="btn-group" aria-label="Basic example" role="group"> \
-        <a class="reply btn btn-secondary btn-sm" title="" data-toggle="tooltip" data-original-title="Reply to this comment - lose formatting"> \
-            <span class="oi" data-glyph="share-boxed"></span> \
-        </a>';
-    if ( data.comment_user == username) {
-          _data += '<a class="btn btn-secondary btn-sm" data-objid="' + data.issue_id
-          + '" data-comment="' + data.comment_id
-          + '" href="/' + data.project + '/issue/' + data.issue_id + '/comment/' + data.comment_id + '/edit"> \
-            <span class="oi" data-glyph="pencil"></span> \
-          </a> \
-          <button class="btn btn-secondary btn-sm" \
-            title="Remove comment" \
-            name="drop_comment" value="' + data.comment_id + '" type="submit"  \
-            onclick="return confirm(\'Do you really want to remove this comment?\');" \
-            ><span class="oi" data-glyph="trash"></span> \
-          </button>';
-    }
-    _data += '</aside> \
       </div> \
-    </div> \
-    </div>';
+      </div>';
+  }
 
   field.html(field.html() + _data);
 }