Merge pull request #1016 from pkvach/fix/add-stdout-logging-for-new-c…

…omments

ext: notifications: Add link logging for management of new comments in Stdout

CHANGES.rst

@@ -41,6 +41,7 @@ Bugfixes & Improvements
 - Handle deleted comments in Disqus migration (`#994`_, pkvach)
 - Fix total comments count calculation (`#997`_, pkvach)
 - Fix newline character handling in data-isso-* i18n strings (`#992`_, pkvach)
+- Add link logging for management of new comments in Stdout (`#1016`_, pkvach)
 
 .. _#951: https://github.com/posativ/isso/pull/951
 .. _#967: https://github.com/posativ/isso/pull/967
@@ -50,6 +51,7 @@ Bugfixes & Improvements
 .. _#994: https://github.com/isso-comments/isso/pull/994
 .. _#997: https://github.com/isso-comments/isso/pull/997
 .. _#992: https://github.com/isso-comments/isso/pull/992
+.. _#1016: https://github.com/isso-comments/isso/pull/1016
 
 0.13.1.dev0 (2023-02-05)
 ------------------------

isso/__init__.py

@@ -110,7 +110,7 @@ def __init__(self, conf):
         smtp_backend = False
         for backend in conf.getlist("general", "notify"):
             if backend == "stdout":
-                subscribers.append(Stdout(None))
+                subscribers.append(Stdout(self))
             elif backend in ("smtp", "SMTP"):
                 smtp_backend = True
             else:

isso/ext/notifications.py

@@ -22,6 +22,10 @@
 from isso import local
 
 
+def create_comment_action_url(uri, action, key):
+    return uri + "/" + action + "/" + key
+
+
 class SMTPConnection(object):
 
     def __init__(self, conf):
@@ -118,10 +122,10 @@ def format(self, thread, comment, parent_comment, recipient=None, admin=False):
             uri = self.public_endpoint + "/id/%i" % comment["id"]
             key = self.isso.sign(comment["id"])
 
-            rv.write("Delete comment: %s\n" % (uri + "/delete/" + key))
+            rv.write("Delete comment: %s\n" % create_comment_action_url(uri, "delete", key))
 
             if comment["mode"] == 2:
-                rv.write("Activate comment: %s\n" % (uri + "/activate/" + key))
+                rv.write("Activate comment: %s\n" % create_comment_action_url(uri, "activate", key))
 
         else:
             uri = self.public_endpoint + "/id/%i" % parent_comment["id"]
@@ -208,8 +212,9 @@ def _retry(self, subject, body, to, headers):
 
 class Stdout(object):
 
-    def __init__(self, conf):
-        pass
+    def __init__(self, isso):
+        self.isso = isso
+        self.public_endpoint = isso.conf.get("server", "public-endpoint") or local("host")
 
     def __iter__(self):
 
@@ -224,6 +229,15 @@ def _new_thread(self, thread):
 
     def _new_comment(self, thread, comment):
         logger.info("comment created: %s", json.dumps(comment))
+        logger.info("Link to comment: %s" % (local("origin") + thread["uri"] + "#isso-%i" % comment["id"]))
+
+        uri = self.public_endpoint + "/id/%i" % comment["id"]
+        key = self.isso.sign(comment["id"])
+
+        logger.info("Delete comment: %s" % create_comment_action_url(uri, "delete", key))
+
+        if comment["mode"] == 2:
+            logger.info("Activate comment: %s" % create_comment_action_url(uri, "activate", key))
 
     def _edit_comment(self, comment):
         logger.info('comment %i edited: %s',