X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fnotify.py;h=3b5d874b5239a6e05390307b5449c41edc867d9a;hb=208bc91fbcd12576310cb405f0a713f14429b2a1;hp=f078bc9fff03fa62862ae786ac00049ef4e675b0;hpb=418b5c205ca4a9c2bdf502c7e2c1d37d0fb7a203;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/influences/notify.py b/influences/notify.py
index f078bc9..3b5d874 100644
--- a/influences/notify.py
+++ b/influences/notify.py
@@ -1,16 +1,53 @@
 from django.db.models import signals
 from django.dispatch import dispatcher
-from ee.influences.models import Character,Influence
-from ee.tools.notify import notify
+from django.conf import settings
+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):
-    notify([instance.player, 'lextalionis@evolution-events.nl'], 'influences/email/character_changed.html', {'character' : instance, 'created' : 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):
-    # 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})
+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(recipients, 'influences/email/influence_changed.html', {'influence' : instance, 'created' : created})
 
-dispatcher.connect(influence_saved, signals.post_save, 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)
+
+# vim: set sts=4 sw=4 expandtab: