Ticket #725: notification.patch

0.10/tracdiscussion/api.py

@@ -1 +1 @@
-# -*- coding: utf8 -*-
-
+
-from trac.core import *
-from trac.web.chrome import add_stylesheet
-from trac.wiki import wiki_to_html, wiki_to_oneliner
@@ -735 +735 @@
-        sql = "UPDATE forum_group SET name = %s, description = %s WHERE id = %s"
-        self.log.debug(sql % (name, description, group))
-        cursor.execute(sql, (name, description, group))
+        self._get_notifier().notify('group_edited', group, name, 
+                                    description=description)
-
-    def edit_forum(self, cursor, forum, name, subject, description, moderators,
-      group):
@@ -747 +749 @@
-          group, forum))
-        cursor.execute(sql, (name, subject, description, moderators, group,
-          forum))
+        self._get_notifier().notify('forum_edited', forum, name, subject=subject, 
+                description=description, moderators=moderators, group=group,
+                cursor=cursor)
-
+
-    def edit_topic(self, cursor, topic, forum, subject, body):
-        sql = "UPDATE topic SET forum = %s, subject = %s, body = %s WHERE id" \
-          " = %s"
-        self.log.debug(sql % (forum, subject, body, topic))
-        cursor.execute(sql, (forum, subject, body, topic))
+        self._get_notifier().notify('topic_edited', topic, subject=subject,
+                                    body=body, forum=forum, cursor=cursor)
-
-    def edit_message(self, cursor, message, forum, topic, replyto, body):
-        sql = "UPDATE message SET forum = %s, topic = %s, replyto = %s, body" \
-          " = %s WHERE id = %s"
-        self.log.debug(sql % (forum, topic, replyto, body, message))
-        cursor.execute(sql, (forum, topic, replyto, body, message))
+        self._get_notifier().notify('message_edited', message, topic=topic,
+                    body=body, forum=forum, replyto=replyto, cursor=cursor)
-
-    # Get list functions
-
@@ -919 +929 @@
-        sql = "INSERT INTO forum_group (name, description) VALUES (%s, %s)"
-        self.log.debug(sql % (name, description))
-        cursor.execute(sql, (name, description))
+        id = self._get_db().get_last_id(cursor, 'forum_group')
+        self._get_notifier().notify('group_added', id, name, 
+                                    description=description)
-
-    def add_forum(self, cursor, name, author, subject, description, moderators,
-      group):
@@ -931 +944 @@
-          subject, description, group))
-        cursor.execute(sql, (name, author, str(int(time.time())), moderators,
-          subject, description, group))
+        id = self._get_db().get_last_id(cursor, 'forum')
+        self._get_notifier().notify('forum_added', id, name, author, 
+                subject, description, moderators, group, cursor)
-
-    def add_topic(self, cursor, forum, subject, author, body):
-        sql = "INSERT INTO topic (forum, time, author, subject, body) VALUES" \
-          " (%s, %s, %s, %s, %s)"
-        self.log.debug(sql % (forum, int(time.time()), author, subject, body))
-        cursor.execute(sql, (forum, int(time.time()), author, subject, body))
+        id = self._get_db().get_last_id(cursor, 'topic')
+        self._get_notifier().notify('topic_added', id, subject=subject,
+                        author=author, body=body, forum=forum, cursor=cursor)
-
-    def add_message(self, cursor, forum, topic, replyto, author, body):
-        sql = "INSERT INTO message (forum, topic, replyto, time, author," \
@@ -945 +964 @@
-          author, body))
-        cursor.execute(sql, (forum, topic, replyto, int(time.time()),
-          author, body))
+        id = self._get_db().get_last_id(cursor, 'message')
+        self._get_notifier().notify('message_added', id, topic=topic,
+                                    author=author, body=body, forum=forum,
+                                    replyto=replyto, cursor=cursor)
-
-    # Delete items functions
-
-    def delete_group(self, cursor, group):
+        self._get_notifier().notify('group_deleted', group, cursor=cursor)
-        sql = "DELETE FROM forum_group WHERE id = %s"
-        self.log.debug(sql % (group,))
-        cursor.execute(sql, (group,))
@@ -957 +981 @@
-        cursor.execute(sql, (group,))
-
-    def delete_forum(self, cursor, forum):
+        self._get_notifier().notify('forum_deleted', forum, cursor=cursor)
-        sql = "DELETE FROM message WHERE forum = %s"
-        self.log.debug(sql % (forum,))
-        cursor.execute(sql, (forum,))
@@ -971 +996 @@
-        sql = "DELETE FROM message WHERE topic = %s"
-        self.log.debug(sql % (topic,))
-        cursor.execute(sql, (topic,))
+        self._get_notifier().notify('topic_deleted', topic, cursor=cursor)
-        sql = "DELETE FROM topic WHERE id = %s"
-        self.log.debug(sql % (topic,))
-        cursor.execute(sql, (topic,))
@@ -981 +1007 @@
-        self.log.debug(sql % (message,))
-        cursor.execute(sql, (message,))
-        replies = []
+        
-        for row in cursor:
-            replies.append(row[0])
-
@@ -989 +1016 @@
-            self.delete_message(cursor, reply)
-
-        # Delete message itself
+        self._get_notifier().notify('message_deleted', message, cursor=cursor)
-        sql = "DELETE FROM message WHERE id = %s"
-        self.log.debug(sql % (message,))
-        cursor.execute(sql, (message,))
+
+    def _get_db(self):
+        return self.env.get_db_cnx()
+
+    def _get_notifier(self):
+        return DiscussionNotifyEmail(self)
+    

0.10/tracdiscussion/notification.py

@@ +1 @@
+from trac.notification import NotifyEmail
+
+class DiscussionNotifyEmail(NotifyEmail):
+    template_name = "notification-body.cs"
+    href = None
+    discussion_api = None
+    
+    def __init__(self, discussion_api):
+        NotifyEmail.__init__(self, discussion_api.env)
+        self.href = discussion_api.env.abs_href
+        self.discussion_api = discussion_api
+    def get_db_cnx(self):
+        if self.db_cnx == None:
+            self.db_cnx = self.env.get_db_cnx()
+        return self.db_cnx
+            
+    def notify(self, action, id=None, name=None, author=None, subject=None, 
+               description=None, moderators=None, group=None, cursor=None,
+               body=None, forum=None,replyto=None, topic=None):
+        item_type, action_type = action.split('_')
+        if item_type == 'forum':
+            if action_type == 'deleted':
+                name = self.discussion_api.get_forum(cursor, id)['name']
+            else:
+                self.hdf.set_unescaped('forum_url', self.href.discussion(id))
+                if not group == '0':
+                    self.hdf.set_unescaped('group_name', 
+                       self.discussion_api.get_group(cursor, group)['name'])
+        elif action == 'group_deleted':
+            name = self.discussion_api.get_group(cursor, id)['name']
+        elif item_type == 'topic':
+            if action_type == 'deleted':
+                topic_obj = self.discussion_api.get_topic(cursor, id)
+                subject = topic_obj['subject']
+                forum = topic_obj['forum']
+                body = topic_obj['body']
+            else:
+                self.hdf.set_unescaped('topic_url', 
+                       self.href.discussion(`forum` + '/' + `id`))
+            name = subject
+        elif item_type == 'message':
+            if action_type == 'deleted':
+                message_obj = self.discussion_api.get_message(cursor, id)
+                forum = message_obj['forum']
+                topic = message_obj['topic']
+                body = message_obj['body']
+            else:
+                self.hdf.setValue('message_url',
+                       self.href.discussion(`forum` + '/' + `topic` + '/' 
+                                            + `id`) + '#' + `id`)
+            self.hdf.set_unescaped('topic_subject',
+                       self.discussion_api.get_topic(cursor, topic)['subject'])
+        if item_type == 'topic' or item_type == 'message':
+            self.hdf.set_unescaped('forum_name',
+                       self.discussion_api.get_forum(cursor, forum)['name'])
+            
+        # Set remaining template data
+        self.hdf.set_unescaped('author', author)
+        self.hdf.set_unescaped('subject', subject)
+        self.hdf.set_unescaped('description', description)
+        self.hdf.set_unescaped('discussion_url', self.href.discussion())
+        self.hdf.set_unescaped('body', body)
+        self.hdf.set_unescaped('forum', forum)
+        self.hdf.set_unescaped('group', group)
+        self.hdf.set_unescaped('topic', topic)
+        if moderators and len(moderators) > 0:
+            self.hdf.set_unescaped('moderators', moderators)
+        self.hdf.set_unescaped('action', action_type)
+        self.hdf.set_unescaped('name', name)
+        self.hdf.set_unescaped('id', id)
+        self.hdf.set_unescaped('item_type', item_type.capitalize())
+        
+        # Render subject and start notification
+        subject = self.hdf.render('notification-subject.cs')
+        NotifyEmail.notify(self, id, subject)
+
+    def get_recipients(self, resid):
+        return ([], [])

0.10/tracdiscussion/templates/notification-body.cs

@@ +1 @@
+<?cs var:item_type ?> #<?cs var:id ?> <?cs var:action ?><?cs if:author ?> by <?cs var:author ?><?cs /if ?>
+
+<?cs if:(name && item_type != 'Topic') ?>Name: <?cs var:name ?>
+<?cs /if ?><?cs if:subject ?>Subject: <?cs var:subject ?>
+<?cs /if ?><?cs if:forum_name ?>Forum: <?cs var:forum_name ?>
+<?cs /if ?><?cs if:topic_subject ?>Topic: <?cs var:topic_subject ?>
+<?cs /if ?><?cs if:description ?>Description: <?cs var:description ?>
+<?cs /if ?><?cs if:moderators ?>Moderators: <?cs var:moderators ?>
+<?cs /if ?><?cs if:group_name ?>Group: <?cs var:group_name ?>
+<?cs /if ?><?cs if:forum_url ?>Forum URL: <<?cs var:forum_url ?>>
+<?cs /if ?><?cs if:topic_url ?>Topic URL: <<?cs var:topic_url ?>>
+<?cs /if ?><?cs if:message_url ?>Message URL: <<?cs var:message_url ?>>
+<?cs /if ?><?cs if:body ?>Body: 
+
+<?cs var:body ?>
+<?cs /if ?>
+-- 
+Discussion URL: <<?cs var:discussion_url ?>>
+<?cs var:project.name ?> <<?cs var:project.url ?>>
+<?cs var:project.descr ?>