Changeset 9602 for trunk/src/message_control.py

Timestamp:

05/09/08 14:35:25 (7 months ago)

Author:

js

Message:

Added OTR support.
Work done by Kjell Braden <fnord@…>.
Some fixes done by me.

Files:

• trunk/src/message_control.py (modified) (2 diffs)

trunk/src/message_control.py

@@ -144 +144 @@
                 '''
                 jid = self.contact.jid
+                original_message = message
 
                 if not self.session:
@@ -151 +152 @@
                         self.set_session(new_session)
 
+                if gajim.otr_module:
+                        if type == 'chat' and isinstance(message, unicode):
+                                d = {'kwargs':{'keyID':keyID, 'type':type,
+                                                'chatstate':chatstate, 'msg_id':msg_id,
+                                                'composing_xep':composing_xep, 'resource':self.resource,
+                                                'user_nick':user_nick, 'session':self.session,
+                                                'original_message':original_message}, 'account':self.account}
+        
+                                new_msg = gajim.otr_module.otrl_message_sending(
+                                        gajim.otr_userstates[self.account],
+                                        (gajim.otr_ui_ops, d),
+                                        gajim.get_jid_from_account(self.account).encode(), gajim.OTR_PROTO,
+                                        self.contact.get_full_jid().encode(), message.encode(), None)
+
+                                context = gajim.otr_module.otrl_context_find(
+                                                gajim.otr_userstates[self.account],
+                                                self.contact.get_full_jid().encode(),
+                                                gajim.get_jid_from_account(self.account).encode(),
+                                                gajim.OTR_PROTO, 1)[0]
+
+                                print repr(context.accountname), repr(context.username)
+
+                                # we send all because inject_message can filter on HTML stuff then
+                                gajim.otr_module.otrl_message_fragment_and_send(
+                                                (gajim.otr_ui_ops, d),
+                                                context, new_msg, gajim.otr_module.OTRL_FRAGMENT_SEND_ALL)
+                                return
+
                 # Send and update history
                 return gajim.connections[self.account].send_message(jid, message, keyID,
                         type = type, chatstate = chatstate, msg_id = msg_id,
                         composing_xep = composing_xep, resource = self.resource,
-                        user_nick = user_nick, session = self.session)
+                        user_nick = user_nick, session = self.session, original_message = original_message)