X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fnotify.py;h=6aae6f28bb0cfb5548032d7cddc4f5566d38f97f;hb=HEAD;hp=6ce979c582f183af1a9142fd05624b8f4a022829;hpb=7358c0855ff87a97e989f8793208d941002f7202;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/influences/notify.py b/influences/notify.py
index 6ce979c..6aae6f2 100644
--- a/influences/notify.py
+++ b/influences/notify.py
@@ -1,20 +1,57 @@
 from django.db.models import signals
 from django.dispatch import dispatcher
 from django.conf import settings
-from ee.influences.models import Character,Influence
-from ee.tools.notify import notify
+from xerxes.influences.models import Character,Influence
+from xerxes.tools.notify import notify
 from django.contrib.auth.models import Group
+from threadedcomments.models import ThreadedComment
 
-def character_saved(instance, created):
+def character_saved(**kwargs):
+    instance = kwargs['instance']
+    created  = kwargs['created']
     if (not settings.DEBUG):
         notify([instance.player, 'lextalionis@evolution-events.nl'], 'influences/email/character_changed.html', {'character' : instance, 'created' : created})
 
-dispatcher.connect(character_saved, signals.post_save, Character)
+signals.post_save.connect(character_saved, sender=Character)
 
-def influence_saved(instance, created):
+def influence_saved(**kwargs):
+    instance = kwargs['instance']
+    created  = kwargs['created']
+    recipients = ['lextalionis@evolution-events.nl']
+    recipients.extend(instance.related_players.keys())
     if (not settings.DEBUG):
-        # TODO: Perhaps only notify when the status is / becomes Done?
-        notify([instance.character.player, 'lextalionis@evolution-events.nl'], 'influences/email/influence_changed.html', {'influence' : instance, 'created' : created})
+        recipients = ['lextalionis@evolution-events.nl']
+        if instance.status == 'D':
+            recipients.append(instance.character.player)
+        notify(recipients, 'influences/email/influence_changed.html', {'influence' : instance, 'created' : created})
+
+signals.post_save.connect(influence_saved, sender=Influence)
+
+def comment_saved(**kwargs):
+    if (settings.DEBUG):
+        return
+
+    comment = kwargs['instance']
+
+    # We don't support comment editing, but let's check this anyway
+    if not kwargs['created']:
+        return
+
+    object = comment.content_object
+    if isinstance(object, Influence):
+        recipients = ['lextalionis@evolution-events.nl']
+        if comment.is_public:
+            recipients.extend(object.related_players.keys())
+
+        notify(
+            recipients,
+            'influences/email/influence_comment_added.html',
+            {'comment'   : comment, 
+             'influence' : object,
+             'commenter' : comment.user
+            }
+        )
+
+signals.post_save.connect(comment_saved, sender=ThreadedComment)
 
-dispatcher.connect(influence_saved, signals.post_save, Influence)
 # vim: set sts=4 sw=4 expandtab: