Changeset 3160
- Timestamp:
- 01/30/08 04:04:52 (10 months ago)
- Files:
-
- discussionplugin/0.10/tracdiscussion/notification.py (modified) (3 diffs)
- discussionplugin/0.11/tracdiscussion/api.py (modified) (1 diff)
- discussionplugin/0.11/tracdiscussion/notification.py (modified) (3 diffs)
- discussionplugin/0.11/tracdiscussion/timeline.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
discussionplugin/0.10/tracdiscussion/notification.py
r2836 r3160 13 13 torcpts = [] 14 14 ccrcpts = [] 15 from_email = 'trac+discussion@localhost' 15 16 COLS = 75 16 17 … … 95 96 NotifyEmail.notify(self, id, subject) 96 97 97 def get_topic_id(self, forum_id, topic_id): 98 return "%s-%s-%s" % (forum_id, topic_id, 0) 98 def get_message_id(self, forum_id, topic_id, message_id): 99 # Fix ID of messages replying to topic. 100 if message_id < 0: 101 message_id = 0 99 102 100 def get_message_id(self, forum_id, topic_id, message_id): 101 return "%s-%s-%s" % (forum_id, topic_id, message_id) 103 #Â Construct Message-ID according to RFC 2822. 104 id = '%s.%s.%s' % (forum_id, topic_id, message_id) 105 host = self.from_email[self.from_email.find('@') + 1:] 106 return '<%s@%s>' % (id, host) 102 107 103 108 def get_recipients(self, resid): … … 112 117 header['Message-ID'] = self.get_message_id(self.forum['id'], 113 118 self.topic['id'], self.message['id']) 114 header['X-Trac-Message-ID'] = str(self.message['id'])119 header['X-Trac-Message-ID'] = to_unicode(self.message['id']) 115 120 header['X-Trac-Discussion-URL'] = self.message['link'] 116 121 117 122 # Get replied message ID. 118 if self.message['replyto'] == -1: 119 reply_id = self.get_topic_id(self.forum['id'], 120 self.topic['id']) 121 else: 122 reply_id = self.get_message_id(self.forum['id'], 123 self.topic['id'], self.message['replyto']) 123 reply_id = self.get_message_id(self.forum['id'], self.topic['id'], 124 self.message['replyto']) 124 125 header['In-Reply-To'] = reply_id 125 126 header['References'] = reply_id 126 127 else: 127 128 # Get this message ID. 128 header['Message-ID'] = self.get_ topic_id(self.forum['id'],129 self.topic['id'] )130 header['X-Trac-Topic-ID'] = str(self.topic['id'])129 header['Message-ID'] = self.get_message_id(self.forum['id'], 130 self.topic['id'], 0) 131 header['X-Trac-Topic-ID'] = to_unicode(self.topic['id']) 131 132 header['X-Trac-Discussion-URL'] = self.topic['link'] 132 133 discussionplugin/0.11/tracdiscussion/api.py
r3056 r3160 4 4 5 5 from trac.core import * 6 from trac.mimeview import Context 6 7 from trac.perm import PermissionError 7 8 from trac.web.chrome import add_stylesheet, add_script, add_ctxtnav discussionplugin/0.11/tracdiscussion/notification.py
r2837 r3160 19 19 torcpts = [] 20 20 ccrcpts = [] 21 from_email = 'trac+discussion@localhost' 21 22 COLS = 75 22 23 … … 84 85 NotifyEmail.notify(self, id, subject) 85 86 86 def get_topic_id(self, forum_id, topic_id): 87 return "%s-%s-%s" % (forum_id, topic_id, 0) 87 def get_message_id(self, forum_id, topic_id, message_id): 88 # Fix ID of messages replying to topic. 89 if message_id < 0: 90 message_id = 0 88 91 89 def get_message_id(self, forum_id, topic_id, message_id): 90 return "%s-%s-%s" % (forum_id, topic_id, message_id) 92 #Â Construct Message-ID according to RFC 2822. 93 id = '%s.%s.%s' % (forum_id, topic_id, message_id) 94 host = self.from_email[self.from_email.find('@') + 1:] 95 return '<%s@%s>' % (id, host) 91 96 92 97 def get_recipients(self, resid): … … 105 110 106 111 # Get replied message ID. 107 if self.message['replyto'] == -1: 108 reply_id = self.get_topic_id(self.forum['id'], 109 self.topic['id']) 110 else: 111 reply_id = self.get_message_id(self.forum['id'], 112 self.topic['id'], self.message['replyto']) 112 reply_id = self.get_message_id(self.forum['id'], self.topic['id'], 113 self.message['replyto']) 113 114 header['In-Reply-To'] = reply_id 114 115 header['References'] = reply_id 115 116 else: 116 117 # Get this message ID. 117 header['Message-ID'] = self.get_ topic_id(self.forum['id'],118 self.topic['id'] )118 header['Message-ID'] = self.get_message_id(self.forum['id'], 119 self.topic['id'], 0) 119 120 header['X-Trac-Topic-ID'] = to_unicode(self.topic['id']) 120 121 header['X-Trac-Discussion-URL'] = self.topic['link'] discussionplugin/0.11/tracdiscussion/timeline.py
r2837 r3160 6 6 from trac.mimeview import Context 7 7 from trac.config import Option 8 from trac.timeline import ITimelineEventProvider9 8 from trac.wiki.formatter import format_to_html, format_to_oneliner 10 9 from trac.util.datefmt import to_timestamp, to_datetime, utc 11 10 from trac.util.text import to_unicode 11 12 from trac.timeline import ITimelineEventProvider 12 13 13 14 class DiscussionTimeline(Component):
