summaryrefslogtreecommitdiff
path: root/sunshine/channel
diff options
context:
space:
mode:
authorKrzysztof Klinikowski <kkszysiu@gmail.com>2010-08-04 16:53:07 +0200
committerKrzysztof Klinikowski <kkszysiu@gmail.com>2010-08-04 16:53:07 +0200
commitce3a7acc60427ad4d6f18f5829f694d5bc39b66c (patch)
tree2ec47120f32021d44b3795fff6ed0dd1944cf58e /sunshine/channel
parent79e7712303c21d02d789b5c8b3ac890516a3c593 (diff)
Some works related to synchronisation. Some bugfixes.
Diffstat (limited to 'sunshine/channel')
-rw-r--r--sunshine/channel/contact_list.py2
-rw-r--r--sunshine/channel/text.py117
2 files changed, 3 insertions, 116 deletions
diff --git a/sunshine/channel/contact_list.py b/sunshine/channel/contact_list.py
index cc2b321..4d3f0f5 100644
--- a/sunshine/channel/contact_list.py
+++ b/sunshine/channel/contact_list.py
@@ -101,7 +101,7 @@ def SunshineContactListChannelFactory(connection, manager, handle, props):
props[telepathy.CHANNEL_INTERFACE + '.TargetHandleType'],
props[telepathy.CHANNEL_INTERFACE + '.TargetHandle'])
- if handle.get_name() == 'stored':
+ if handle.get_name() == 'subscribe':
channel_class = SunshineSubscribeListChannel
#hacky & tricky
# elif handle.get_name() == 'publish':
diff --git a/sunshine/channel/text.py b/sunshine/channel/text.py
index 2e5fb80..e74bf64 100644
--- a/sunshine/channel/text.py
+++ b/sunshine/channel/text.py
@@ -152,8 +152,6 @@ class SunshineRoomTextChannel(telepathy.server.ChannelTypeText, telepathy.server
# del self._pending_offline_messages[id]
# self._oim_box_ref().delete_messages(messages)
- # Rededefine ListPendingMessages to remove offline messages
- # from the oim box.
def ListPendingMessages(self, clear):
return telepathy.server.ChannelTypeText.ListPendingMessages(self, clear)
@@ -164,116 +162,5 @@ class SunshineRoomTextChannel(telepathy.server.ChannelTypeText, telepathy.server
# messages = self._pending_offline_messages.values()
# self._oim_box_ref().delete_messages(messages)
# return telepathy.server.ChannelTypeText.ListPendingMessages(self, clear)
-#
-# # papyon.event.ConversationEventInterface
-# def on_conversation_user_joined(self, contact):
-# handle = ButterflyHandleFactory(self._conn_ref(), 'contact',
-# contact.account, contact.network_id)
-# logger.info("User %s joined" % unicode(handle))
-# if handle not in self._members:
-# self.MembersChanged('', [handle], [], [], [],
-# handle, telepathy.CHANNEL_GROUP_CHANGE_REASON_INVITED)
-#
-# # papyon.event.ConversationEventInterface
-# def on_conversation_user_left(self, contact):
-# handle = ButterflyHandleFactory(self._conn_ref(), 'contact',
-# contact.account, contact.network_id)
-# logger.info("User %s left" % unicode(handle))
-# # There was only us and we are leaving, is it necessary?
-# if len(self._members) == 1:
-# self.ChatStateChanged(handle, telepathy.CHANNEL_CHAT_STATE_GONE)
-# elif len(self._members) == 2:
-# # Add the last user who left as the offline contact so we may still send
-# # him offlines messages and destroy the conversation
-# self._conversation.leave()
-# self._conversation = None
-# self._offline_handle = handle
-# self._offline_contact = contact
-# else:
-# #If there is only us and a offline contact don't remove him from
-# #the members since we still send him messages
-# self.MembersChanged('', [], [handle], [], [],
-# handle, telepathy.CHANNEL_GROUP_CHANGE_REASON_NONE)
-#
-# # papyon.event.ConversationEventInterface
-# def on_conversation_user_typing(self, contact):
-# handle = ButterflyHandleFactory(self._conn_ref(), 'contact',
-# contact.account, contact.network_id)
-# logger.info("User %s is typing" % unicode(handle))
-# self.ChatStateChanged(handle, telepathy.CHANNEL_CHAT_STATE_COMPOSING)
-#
-# # papyon.event.ConversationEventInterface
-# def on_conversation_message_received(self, sender, message):
-# id = self._recv_id
-# timestamp = int(time.time())
-# handle = ButterflyHandleFactory(self._conn_ref(), 'contact',
-# sender.account, sender.network_id)
-# type = telepathy.CHANNEL_TEXT_MESSAGE_TYPE_NORMAL
-# message = message.content
-# logger.info("User %s sent a message" % unicode(handle))
-# self.Received(id, timestamp, handle, type, 0, message)
-# self._recv_id += 1
-#
-# # papyon.event.ConversationEventInterface
-# def on_conversation_nudge_received(self, sender):
-# id = self._recv_id
-# timestamp = int(time.time())
-# handle = ButterflyHandleFactory(self._conn_ref(), 'contact',
-# sender.account, sender.network_id)
-# type = telepathy.CHANNEL_TEXT_MESSAGE_TYPE_ACTION
-# text = unicode("sends you a nudge", "utf-8")
-# logger.info("User %s sent a nudge" % unicode(handle))
-# self.Received(id, timestamp, handle, type, 0, text)
-# self._recv_id += 1
-#
-# # papyon.event.ContactEventInterface
-# def on_contact_presence_changed(self, contact):
-# handle = ButterflyHandleFactory(self._conn_ref(), 'contact',
-# contact.account, contact.network_id)
-# # Recreate a conversation if our contact join
-# if self._offline_contact == contact and contact.presence != papyon.Presence.OFFLINE:
-# logger.info('Contact %s connected, inviting him to the text channel' % unicode(contact))
-# client = self._conn_ref().msn_client
-# self._conversation = papyon.Conversation(client, [contact])
-# papyon.event.ConversationEventInterface.__init__(self, self._conversation)
-# self._offline_contact = None
-# self._offline_handle = None
-# #FIXME : I really hope there is no race condition between the time
-# # the contact accept the invitation and the time we send him a message
-# # Can a user refuse an invitation? what happens then?
-#
-#
-# # Public API
-# def offline_message_received(self, message):
-# # @message a papyon.OfflineIM.OfflineMessage
-# id = self._recv_id
-# sender = message.sender
-# timestamp = time.mktime(message.date.timetuple())
-# text = message.text
-#
-# # Map the id to the offline message so we can remove it
-# # when acked by the client
-# self._pending_offline_messages[id] = message
-#
-# handle = ButterflyHandleFactory(self._conn_ref(), 'contact',
-# sender.account, sender.network_id)
-# type = telepathy.CHANNEL_TEXT_MESSAGE_TYPE_NORMAL
-# logger.info("User %r sent a offline message" % handle)
-# self.Received(id, timestamp, handle, type, 0, text)
-#
-# self._recv_id += 1
-#
-# @async
-# def __add_initial_participants(self):
-# handles = []
-# handles.append(self._conn.GetSelfHandle())
-# if self._conversation:
-# for participant in self._conversation.participants:
-# handle = ButterflyHandleFactory(self._conn_ref(), 'contact',
-# participant.account, participant.network_id)
-# handles.append(handle)
-# else:
-# handles.append(self._offline_handle)
-#
-# self.MembersChanged('', handles, [], [], [],
-# 0, telepathy.CHANNEL_GROUP_CHANGE_REASON_NONE)
+
+