Merge lp:~mgorven/ibid/smtp-fixes into lp:~ibid-core/ibid/old-trunk-1.6

[Michael Gorven]

[lp:~mgorven/ibid/smtp-fixes]

832. By Michael Gorven on 2010-01-05

Forgot the actual method...

[Stefano Rivera (stefanor)]

Seems fine, although I've never used/tested SMTP

review: Approve

[lp:~mgorven/ibid/smtp-fixes]

833. By Michael Gorven on 2010-01-06

Set Content-Type headers for HTTP and email responses.

834. By Michael Gorven on 2010-01-06

Set References header.

835. By Michael Gorven on 2010-01-06

Use title case for outgoing header names.

836. By Michael Gorven on 2010-01-06

Correct header names when retrieving values.

[Michael Gorven (mgorven)]

Set Content-Type headers for HTTP and email, and add References header in
replies.

[Stefano Rivera (stefanor)]

Still approve

review: Approve

[Jonathan Hitchcock (vhata)]

Line 40: isn't "References" supposed to be the previous mail's References + the previous mail's Message-ID?

Line 52: why are you checking for camelcase "Subject" now? Should you not be case-insensitive?

[Michael Gorven (mgorven)]

On Thursday 07 January 2010 00:23:45 Jonathan Hitchcock wrote:
> Line 40: isn't "References" supposed to be the previous mail's References
> + the previous mail's Message-ID?

Technically yes, but then you also need proper length handling and whatnot.
Since most of the time the bot will be responding to the first message in a
thread it would hardly be used.

> Line 52: why are you checking for camelcase "Subject" now? Should you not
> be case-insensitive?

Because I set it as "Subject" earlier. Should probably be case-insensitive,
but it's not really necessary.

[lp:~mgorven/ibid/smtp-fixes]

837. By Michael Gorven on 2010-01-07

Set References header properly.

[Michael Gorven (mgorven)]

On Thursday 07 January 2010 10:15:25 Michael Gorven wrote:
> On Thursday 07 January 2010 00:23:45 Jonathan Hitchcock wrote:
> > Line 40: isn't "References" supposed to be the previous mail's
> > References + the previous mail's Message-ID?
>
> Technically yes, but then you also need proper length handling and whatnot.
> Since most of the time the bot will be responding to the first message in a
> thread it would hardly be used.

r837. I haven't done the length handling -- RFC 2822 doesn't require it.

[Jonathan Hitchcock (vhata)]

Bon.

review: Approve

=== modified file 'ibid/source/http.py'
--- ibid/source/http.py	2009-02-23 20:29:44 +0000
+++ ibid/source/http.py	2010-01-07 08:31:19 +0000
@@ -50,6 +50,7 @@
 
     def respond(self, event, request):
         output = '\n'.join([response['reply'].encode('utf-8') for response in event.responses])
+        request.setHeader('Content-Type', 'text/plain; charset=utf-8')
         request.write(output)
         request.finish()
         self.log.debug(u"Responded to request from %s: %s", event.sender['connection'], output)

=== modified file 'ibid/source/smtp.py'
--- ibid/source/smtp.py	2009-12-30 16:29:10 +0000
+++ ibid/source/smtp.py	2010-01-07 08:31:19 +0000
@@ -58,14 +58,13 @@
         event.public = False
         event.addressed = True
         event.subject = unicode(mail['subject'], 'utf-8', 'replace')
-        event.headers = dict((i[0], unicode(i[1], 'utf-8', 'replace')) for i in mail.items())
+        event.headers = dict((i[0].lower(), unicode(i[1], 'utf-8', 'replace')) for i in mail.items())
 
         message = mail.is_multipart() and mail.get_payload()[0].get_payload() or mail.get_payload()
         if len(message) > 0:
-            event.message = stripsig.sub('', message).strip().replace('\n', ' ')
+            event.message = stripsig.sub('', unicode(message, 'utf-8', 'replace')).strip().replace('\n', ' ')
         else:
             event.message = event.subject
-        event.message = unicode(event.message, 'utf-8', 'replace')
 
         self.log.debug(u"Received message from %s: %s", event.sender['connection'], event.message)
         ibid.dispatcher.dispatch(event).addCallback(ibid.sources[self.name.lower()].respond)
@@ -113,15 +112,25 @@
 
         for message in messages.values():
             if 'subject' not in message:
-                message['subject'] = 'Re: ' + event['subject']
+                message['Subject'] = 'Re: ' + event['subject']
+            if 'message-id' in event.headers:
+                response['In-Reply-To'] = event.headers['message-id']
+                if 'references' in event.headers:
+                    response['References'] = '%(references)s %(message-id)s' % event.headers
+                elif 'in-reply-to' in event.headers:
+                    response['References'] = '%(in-reply-to)s %(message-id)s' % event.headers
+                else:
+                    response['References'] = '%(message-id)s' % event.headers
+                    
             self.send(message)
 
     def send(self, response):
         message = response['reply']
-        response['to'] = response['target']
-        response['date'] = smtp.rfc822date()
-        if 'subject' not in response:
-            response['subject'] = 'Message from %s' % ibid.config['botname']
+        response['To'] = response['target']
+        response['Date'] = smtp.rfc822date()
+        if 'Subject' not in response:
+            response['Subject'] = 'Message from %s' % ibid.config['botname']
+        response['Content-Type'] = 'text/plain; charset=utf-8'
 
         del response['target']
         del response['source']
@@ -133,7 +142,8 @@
         body += '\n'
         body += message
 
-        smtp.sendmail(self.relayhost, self.address, response['to'], body)
-        self.log.debug(u"Sent email to %s: %s", response['to'], response['subject'])
+        port = ':' in self.relayhost and int(self.relayhost.split(':')[1]) or 25
+        smtp.sendmail(self.relayhost.split(':')[0], self.address, response['To'], body.encode('utf-8'), port=port)
+        self.log.debug(u"Sent email to %s: %s", response['To'], response['Subject'])
 
 # vi: set et sta sw=4 ts=4: