Skip to content

Commit

Permalink
ext: notifications: Add link logging for management of new comments i…
Browse files Browse the repository at this point in the history
…n Stdout

Fixes #138
  • Loading branch information
pkvach committed Apr 24, 2024
1 parent e3ee8fb commit 1f6a96e
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 5 deletions.
2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,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
Expand All @@ -42,6 +43,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)
------------------------
Expand Down
2 changes: 1 addition & 1 deletion isso/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
22 changes: 18 additions & 4 deletions isso/ext/notifications.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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"]
Expand Down Expand Up @@ -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):

Expand All @@ -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',
Expand Down

0 comments on commit 1f6a96e

Please sign in to comment.