diff --git a/Spectrum2/backend.py b/Spectrum2/backend.py index b2e5891..9638834 100644 --- a/Spectrum2/backend.py +++ b/Spectrum2/backend.py @@ -154,13 +154,14 @@ class SpectrumBackend: self.send(message); - def handleParticipantChanged(self, user, nickname, room, flags, status, statusMessage = "", newname = ""): + def handleParticipantChanged(self, user, nickname, room, flags, status, statusMessage = "", newname = "", iconHash = ""): d = protocol_pb2.Participant() d.userName = user d.nickname = nickname d.room = room d.flag = flags d.newname = newname + d.iconHash = iconHash d.status = status d.statusMessage = statusMessage diff --git a/Spectrum2/protocol.proto b/Spectrum2/protocol.proto index 78a3b9a..cce2a39 100644 --- a/Spectrum2/protocol.proto +++ b/Spectrum2/protocol.proto @@ -110,6 +110,7 @@ message Participant { required StatusType status = 5; optional string statusMessage = 6; optional string newname = 7; + optional string iconHash = 8; } message VCard { diff --git a/Spectrum2/protocol_pb2.py b/Spectrum2/protocol_pb2.py index 13f0c5f..83d9d0a 100644 --- a/Spectrum2/protocol_pb2.py +++ b/Spectrum2/protocol_pb2.py @@ -1,27 +1,20 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: protocol.proto -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) from google.protobuf.internal import enum_type_wrapper from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection -from google.protobuf import symbol_database as _symbol_database from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) -_sym_db = _symbol_database.Default() - DESCRIPTOR = _descriptor.FileDescriptor( name='protocol.proto', package='pbnetwork', - serialized_pb=_b('\n\x0eprotocol.proto\x12\tpbnetwork\"\x19\n\tConnected\x12\x0c\n\x04user\x18\x01 \x02(\t\"<\n\x0c\x44isconnected\x12\x0c\n\x04user\x18\x01 \x02(\t\x12\r\n\x05\x65rror\x18\x02 \x02(\x05\x12\x0f\n\x07message\x18\x03 \x01(\t\"P\n\x05Login\x12\x0c\n\x04user\x18\x01 \x02(\t\x12\x12\n\nlegacyName\x18\x02 \x02(\t\x12\x10\n\x08password\x18\x03 \x02(\t\x12\x13\n\x0b\x65xtraFields\x18\x04 \x03(\t\"*\n\x06Logout\x12\x0c\n\x04user\x18\x01 \x02(\t\x12\x12\n\nlegacyName\x18\x02 \x02(\t\"\xab\x01\n\x05\x42uddy\x12\x10\n\x08userName\x18\x01 \x02(\t\x12\x11\n\tbuddyName\x18\x02 \x02(\t\x12\r\n\x05\x61lias\x18\x03 \x01(\t\x12\r\n\x05group\x18\x04 \x03(\t\x12%\n\x06status\x18\x05 \x01(\x0e\x32\x15.pbnetwork.StatusType\x12\x15\n\rstatusMessage\x18\x06 \x01(\t\x12\x10\n\x08iconHash\x18\x07 \x01(\t\x12\x0f\n\x07\x62locked\x18\x08 \x01(\x08\"*\n\x07\x42uddies\x12\x1f\n\x05\x62uddy\x18\x01 \x03(\x0b\x32\x10.pbnetwork.Buddy\"\xa9\x01\n\x13\x43onversationMessage\x12\x10\n\x08userName\x18\x01 \x02(\t\x12\x11\n\tbuddyName\x18\x02 \x02(\t\x12\x0f\n\x07message\x18\x03 \x02(\t\x12\x10\n\x08nickname\x18\x04 \x01(\t\x12\r\n\x05xhtml\x18\x05 \x01(\t\x12\x11\n\ttimestamp\x18\x06 \x01(\t\x12\x10\n\x08headline\x18\x07 \x01(\x08\x12\n\n\x02id\x18\x08 \x01(\t\x12\n\n\x02pm\x18\t \x01(\x08\"J\n\x04Room\x12\x10\n\x08userName\x18\x01 \x02(\t\x12\x10\n\x08nickname\x18\x02 \x02(\t\x12\x0c\n\x04room\x18\x03 \x02(\t\x12\x10\n\x08password\x18\x04 \x01(\t\"&\n\x08RoomList\x12\x0c\n\x04room\x18\x01 \x03(\t\x12\x0c\n\x04name\x18\x02 \x03(\t\"\x9c\x01\n\x0bParticipant\x12\x10\n\x08userName\x18\x01 \x02(\t\x12\x0c\n\x04room\x18\x02 \x02(\t\x12\x10\n\x08nickname\x18\x03 \x02(\t\x12\x0c\n\x04\x66lag\x18\x04 \x02(\x05\x12%\n\x06status\x18\x05 \x02(\x0e\x32\x15.pbnetwork.StatusType\x12\x15\n\rstatusMessage\x18\x06 \x01(\t\x12\x0f\n\x07newname\x18\x07 \x01(\t\"k\n\x05VCard\x12\x10\n\x08userName\x18\x01 \x02(\t\x12\x11\n\tbuddyName\x18\x02 \x02(\t\x12\n\n\x02id\x18\x03 \x02(\x05\x12\x10\n\x08\x66ullname\x18\x04 \x01(\t\x12\x10\n\x08nickname\x18\x05 \x01(\t\x12\r\n\x05photo\x18\x06 \x01(\x0c\"X\n\x06Status\x12\x10\n\x08userName\x18\x01 \x02(\t\x12%\n\x06status\x18\x03 \x02(\x0e\x32\x15.pbnetwork.StatusType\x12\x15\n\rstatusMessage\x18\x04 \x01(\t\"B\n\x05Stats\x12\x0b\n\x03res\x18\x01 \x02(\x05\x12\x10\n\x08init_res\x18\x02 \x02(\x05\x12\x0e\n\x06shared\x18\x03 \x02(\x05\x12\n\n\x02id\x18\x04 \x02(\t\"Y\n\x04\x46ile\x12\x10\n\x08userName\x18\x01 \x02(\t\x12\x11\n\tbuddyName\x18\x02 \x02(\t\x12\x10\n\x08\x66ileName\x18\x03 \x02(\t\x12\x0c\n\x04size\x18\x04 \x02(\x05\x12\x0c\n\x04\x66tID\x18\x05 \x01(\x05\".\n\x10\x46ileTransferData\x12\x0c\n\x04\x66tID\x18\x01 \x02(\x05\x12\x0c\n\x04\x64\x61ta\x18\x02 \x02(\x0c\"\x1f\n\rBackendConfig\x12\x0e\n\x06\x63onfig\x18\x01 \x02(\t\"\xac\x06\n\x0eWrapperMessage\x12,\n\x04type\x18\x01 \x02(\x0e\x32\x1e.pbnetwork.WrapperMessage.Type\x12\x0f\n\x07payload\x18\x02 \x01(\x0c\"\xda\x05\n\x04Type\x12\x12\n\x0eTYPE_CONNECTED\x10\x01\x12\x15\n\x11TYPE_DISCONNECTED\x10\x02\x12\x0e\n\nTYPE_LOGIN\x10\x03\x12\x0f\n\x0bTYPE_LOGOUT\x10\x04\x12\x16\n\x12TYPE_BUDDY_CHANGED\x10\x06\x12\x16\n\x12TYPE_BUDDY_REMOVED\x10\x07\x12\x15\n\x11TYPE_CONV_MESSAGE\x10\x08\x12\r\n\tTYPE_PING\x10\t\x12\r\n\tTYPE_PONG\x10\n\x12\x12\n\x0eTYPE_JOIN_ROOM\x10\x0b\x12\x13\n\x0fTYPE_LEAVE_ROOM\x10\x0c\x12\x1c\n\x18TYPE_PARTICIPANT_CHANGED\x10\r\x12\x1e\n\x1aTYPE_ROOM_NICKNAME_CHANGED\x10\x0e\x12\x1d\n\x19TYPE_ROOM_SUBJECT_CHANGED\x10\x0f\x12\x0e\n\nTYPE_VCARD\x10\x10\x12\x17\n\x13TYPE_STATUS_CHANGED\x10\x11\x12\x15\n\x11TYPE_BUDDY_TYPING\x10\x12\x12\x1d\n\x19TYPE_BUDDY_STOPPED_TYPING\x10\x13\x12\x14\n\x10TYPE_BUDDY_TYPED\x10\x14\x12\x15\n\x11TYPE_AUTH_REQUEST\x10\x15\x12\x12\n\x0eTYPE_ATTENTION\x10\x16\x12\x0e\n\nTYPE_STATS\x10\x17\x12\x11\n\rTYPE_FT_START\x10\x18\x12\x12\n\x0eTYPE_FT_FINISH\x10\x19\x12\x10\n\x0cTYPE_FT_DATA\x10\x1a\x12\x11\n\rTYPE_FT_PAUSE\x10\x1b\x12\x14\n\x10TYPE_FT_CONTINUE\x10\x1c\x12\r\n\tTYPE_EXIT\x10\x1d\x12\x17\n\x13TYPE_BACKEND_CONFIG\x10\x1e\x12\x0e\n\nTYPE_QUERY\x10\x1f\x12\x12\n\x0eTYPE_ROOM_LIST\x10 \x12\x19\n\x15TYPE_CONV_MESSAGE_ACK\x10!\x12\x10\n\x0cTYPE_RAW_XML\x10\"\x12\x10\n\x0cTYPE_BUDDIES\x10#*\xb3\x05\n\x0f\x43onnectionError\x12\"\n\x1e\x43ONNECTION_ERROR_NETWORK_ERROR\x10\x00\x12%\n!CONNECTION_ERROR_INVALID_USERNAME\x10\x01\x12*\n&CONNECTION_ERROR_AUTHENTICATION_FAILED\x10\x02\x12.\n*CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE\x10\x03\x12#\n\x1f\x43ONNECTION_ERROR_NO_SSL_SUPPORT\x10\x04\x12%\n!CONNECTION_ERROR_ENCRYPTION_ERROR\x10\x05\x12 \n\x1c\x43ONNECTION_ERROR_NAME_IN_USE\x10\x06\x12%\n!CONNECTION_ERROR_INVALID_SETTINGS\x10\x07\x12&\n\"CONNECTION_ERROR_CERT_NOT_PROVIDED\x10\x08\x12#\n\x1f\x43ONNECTION_ERROR_CERT_UNTRUSTED\x10\t\x12!\n\x1d\x43ONNECTION_ERROR_CERT_EXPIRED\x10\n\x12\'\n#CONNECTION_ERROR_CERT_NOT_ACTIVATED\x10\x0b\x12+\n\'CONNECTION_ERROR_CERT_HOSTNAME_MISMATCH\x10\x0c\x12.\n*CONNECTION_ERROR_CERT_FINGERPRINT_MISMATCH\x10\r\x12%\n!CONNECTION_ERROR_CERT_SELF_SIGNED\x10\x0e\x12%\n!CONNECTION_ERROR_CERT_OTHER_ERROR\x10\x0f\x12 \n\x1c\x43ONNECTION_ERROR_OTHER_ERROR\x10\x10*\x86\x01\n\nStatusType\x12\x11\n\rSTATUS_ONLINE\x10\x00\x12\x0f\n\x0bSTATUS_AWAY\x10\x01\x12\x0e\n\nSTATUS_FFC\x10\x02\x12\r\n\tSTATUS_XA\x10\x03\x12\x0e\n\nSTATUS_DND\x10\x04\x12\x0f\n\x0bSTATUS_NONE\x10\x05\x12\x14\n\x10STATUS_INVISIBLE\x10\x06*\x88\x02\n\x0fParticipantFlag\x12\x19\n\x15PARTICIPANT_FLAG_NONE\x10\x00\x12\x1e\n\x1aPARTICIPANT_FLAG_MODERATOR\x10\x01\x12\x1d\n\x19PARTICIPANT_FLAG_CONFLICT\x10\x02\x12\x1b\n\x17PARTICIPANT_FLAG_BANNED\x10\x04\x12#\n\x1fPARTICIPANT_FLAG_NOT_AUTHORIZED\x10\x08\x12\x17\n\x13PARTICIPANT_FLAG_ME\x10\x10\x12\x1b\n\x17PARTICIPANT_FLAG_KICKED\x10 \x12#\n\x1fPARTICIPANT_FLAG_ROOM_NOT_FOUND\x10@') -) -_sym_db.RegisterFileDescriptor(DESCRIPTOR) + serialized_pb='\n\x0eprotocol.proto\x12\tpbnetwork\"\x19\n\tConnected\x12\x0c\n\x04user\x18\x01 \x02(\t\"<\n\x0c\x44isconnected\x12\x0c\n\x04user\x18\x01 \x02(\t\x12\r\n\x05\x65rror\x18\x02 \x02(\x05\x12\x0f\n\x07message\x18\x03 \x01(\t\"P\n\x05Login\x12\x0c\n\x04user\x18\x01 \x02(\t\x12\x12\n\nlegacyName\x18\x02 \x02(\t\x12\x10\n\x08password\x18\x03 \x02(\t\x12\x13\n\x0b\x65xtraFields\x18\x04 \x03(\t\"*\n\x06Logout\x12\x0c\n\x04user\x18\x01 \x02(\t\x12\x12\n\nlegacyName\x18\x02 \x02(\t\"\xab\x01\n\x05\x42uddy\x12\x10\n\x08userName\x18\x01 \x02(\t\x12\x11\n\tbuddyName\x18\x02 \x02(\t\x12\r\n\x05\x61lias\x18\x03 \x01(\t\x12\r\n\x05group\x18\x04 \x03(\t\x12%\n\x06status\x18\x05 \x01(\x0e\x32\x15.pbnetwork.StatusType\x12\x15\n\rstatusMessage\x18\x06 \x01(\t\x12\x10\n\x08iconHash\x18\x07 \x01(\t\x12\x0f\n\x07\x62locked\x18\x08 \x01(\x08\"*\n\x07\x42uddies\x12\x1f\n\x05\x62uddy\x18\x01 \x03(\x0b\x32\x10.pbnetwork.Buddy\"\xa9\x01\n\x13\x43onversationMessage\x12\x10\n\x08userName\x18\x01 \x02(\t\x12\x11\n\tbuddyName\x18\x02 \x02(\t\x12\x0f\n\x07message\x18\x03 \x02(\t\x12\x10\n\x08nickname\x18\x04 \x01(\t\x12\r\n\x05xhtml\x18\x05 \x01(\t\x12\x11\n\ttimestamp\x18\x06 \x01(\t\x12\x10\n\x08headline\x18\x07 \x01(\x08\x12\n\n\x02id\x18\x08 \x01(\t\x12\n\n\x02pm\x18\t \x01(\x08\"J\n\x04Room\x12\x10\n\x08userName\x18\x01 \x02(\t\x12\x10\n\x08nickname\x18\x02 \x02(\t\x12\x0c\n\x04room\x18\x03 \x02(\t\x12\x10\n\x08password\x18\x04 \x01(\t\"&\n\x08RoomList\x12\x0c\n\x04room\x18\x01 \x03(\t\x12\x0c\n\x04name\x18\x02 \x03(\t\"\xae\x01\n\x0bParticipant\x12\x10\n\x08userName\x18\x01 \x02(\t\x12\x0c\n\x04room\x18\x02 \x02(\t\x12\x10\n\x08nickname\x18\x03 \x02(\t\x12\x0c\n\x04\x66lag\x18\x04 \x02(\x05\x12%\n\x06status\x18\x05 \x02(\x0e\x32\x15.pbnetwork.StatusType\x12\x15\n\rstatusMessage\x18\x06 \x01(\t\x12\x0f\n\x07newname\x18\x07 \x01(\t\x12\x10\n\x08iconHash\x18\x08 \x01(\t\"k\n\x05VCard\x12\x10\n\x08userName\x18\x01 \x02(\t\x12\x11\n\tbuddyName\x18\x02 \x02(\t\x12\n\n\x02id\x18\x03 \x02(\x05\x12\x10\n\x08\x66ullname\x18\x04 \x01(\t\x12\x10\n\x08nickname\x18\x05 \x01(\t\x12\r\n\x05photo\x18\x06 \x01(\x0c\"X\n\x06Status\x12\x10\n\x08userName\x18\x01 \x02(\t\x12%\n\x06status\x18\x03 \x02(\x0e\x32\x15.pbnetwork.StatusType\x12\x15\n\rstatusMessage\x18\x04 \x01(\t\"B\n\x05Stats\x12\x0b\n\x03res\x18\x01 \x02(\x05\x12\x10\n\x08init_res\x18\x02 \x02(\x05\x12\x0e\n\x06shared\x18\x03 \x02(\x05\x12\n\n\x02id\x18\x04 \x02(\t\"Y\n\x04\x46ile\x12\x10\n\x08userName\x18\x01 \x02(\t\x12\x11\n\tbuddyName\x18\x02 \x02(\t\x12\x10\n\x08\x66ileName\x18\x03 \x02(\t\x12\x0c\n\x04size\x18\x04 \x02(\x05\x12\x0c\n\x04\x66tID\x18\x05 \x01(\x05\".\n\x10\x46ileTransferData\x12\x0c\n\x04\x66tID\x18\x01 \x02(\x05\x12\x0c\n\x04\x64\x61ta\x18\x02 \x02(\x0c\"\x1f\n\rBackendConfig\x12\x0e\n\x06\x63onfig\x18\x01 \x02(\t\"\xac\x06\n\x0eWrapperMessage\x12,\n\x04type\x18\x01 \x02(\x0e\x32\x1e.pbnetwork.WrapperMessage.Type\x12\x0f\n\x07payload\x18\x02 \x01(\x0c\"\xda\x05\n\x04Type\x12\x12\n\x0eTYPE_CONNECTED\x10\x01\x12\x15\n\x11TYPE_DISCONNECTED\x10\x02\x12\x0e\n\nTYPE_LOGIN\x10\x03\x12\x0f\n\x0bTYPE_LOGOUT\x10\x04\x12\x16\n\x12TYPE_BUDDY_CHANGED\x10\x06\x12\x16\n\x12TYPE_BUDDY_REMOVED\x10\x07\x12\x15\n\x11TYPE_CONV_MESSAGE\x10\x08\x12\r\n\tTYPE_PING\x10\t\x12\r\n\tTYPE_PONG\x10\n\x12\x12\n\x0eTYPE_JOIN_ROOM\x10\x0b\x12\x13\n\x0fTYPE_LEAVE_ROOM\x10\x0c\x12\x1c\n\x18TYPE_PARTICIPANT_CHANGED\x10\r\x12\x1e\n\x1aTYPE_ROOM_NICKNAME_CHANGED\x10\x0e\x12\x1d\n\x19TYPE_ROOM_SUBJECT_CHANGED\x10\x0f\x12\x0e\n\nTYPE_VCARD\x10\x10\x12\x17\n\x13TYPE_STATUS_CHANGED\x10\x11\x12\x15\n\x11TYPE_BUDDY_TYPING\x10\x12\x12\x1d\n\x19TYPE_BUDDY_STOPPED_TYPING\x10\x13\x12\x14\n\x10TYPE_BUDDY_TYPED\x10\x14\x12\x15\n\x11TYPE_AUTH_REQUEST\x10\x15\x12\x12\n\x0eTYPE_ATTENTION\x10\x16\x12\x0e\n\nTYPE_STATS\x10\x17\x12\x11\n\rTYPE_FT_START\x10\x18\x12\x12\n\x0eTYPE_FT_FINISH\x10\x19\x12\x10\n\x0cTYPE_FT_DATA\x10\x1a\x12\x11\n\rTYPE_FT_PAUSE\x10\x1b\x12\x14\n\x10TYPE_FT_CONTINUE\x10\x1c\x12\r\n\tTYPE_EXIT\x10\x1d\x12\x17\n\x13TYPE_BACKEND_CONFIG\x10\x1e\x12\x0e\n\nTYPE_QUERY\x10\x1f\x12\x12\n\x0eTYPE_ROOM_LIST\x10 \x12\x19\n\x15TYPE_CONV_MESSAGE_ACK\x10!\x12\x10\n\x0cTYPE_RAW_XML\x10\"\x12\x10\n\x0cTYPE_BUDDIES\x10#*\xb3\x05\n\x0f\x43onnectionError\x12\"\n\x1e\x43ONNECTION_ERROR_NETWORK_ERROR\x10\x00\x12%\n!CONNECTION_ERROR_INVALID_USERNAME\x10\x01\x12*\n&CONNECTION_ERROR_AUTHENTICATION_FAILED\x10\x02\x12.\n*CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE\x10\x03\x12#\n\x1f\x43ONNECTION_ERROR_NO_SSL_SUPPORT\x10\x04\x12%\n!CONNECTION_ERROR_ENCRYPTION_ERROR\x10\x05\x12 \n\x1c\x43ONNECTION_ERROR_NAME_IN_USE\x10\x06\x12%\n!CONNECTION_ERROR_INVALID_SETTINGS\x10\x07\x12&\n\"CONNECTION_ERROR_CERT_NOT_PROVIDED\x10\x08\x12#\n\x1f\x43ONNECTION_ERROR_CERT_UNTRUSTED\x10\t\x12!\n\x1d\x43ONNECTION_ERROR_CERT_EXPIRED\x10\n\x12\'\n#CONNECTION_ERROR_CERT_NOT_ACTIVATED\x10\x0b\x12+\n\'CONNECTION_ERROR_CERT_HOSTNAME_MISMATCH\x10\x0c\x12.\n*CONNECTION_ERROR_CERT_FINGERPRINT_MISMATCH\x10\r\x12%\n!CONNECTION_ERROR_CERT_SELF_SIGNED\x10\x0e\x12%\n!CONNECTION_ERROR_CERT_OTHER_ERROR\x10\x0f\x12 \n\x1c\x43ONNECTION_ERROR_OTHER_ERROR\x10\x10*\x86\x01\n\nStatusType\x12\x11\n\rSTATUS_ONLINE\x10\x00\x12\x0f\n\x0bSTATUS_AWAY\x10\x01\x12\x0e\n\nSTATUS_FFC\x10\x02\x12\r\n\tSTATUS_XA\x10\x03\x12\x0e\n\nSTATUS_DND\x10\x04\x12\x0f\n\x0bSTATUS_NONE\x10\x05\x12\x14\n\x10STATUS_INVISIBLE\x10\x06*\x88\x02\n\x0fParticipantFlag\x12\x19\n\x15PARTICIPANT_FLAG_NONE\x10\x00\x12\x1e\n\x1aPARTICIPANT_FLAG_MODERATOR\x10\x01\x12\x1d\n\x19PARTICIPANT_FLAG_CONFLICT\x10\x02\x12\x1b\n\x17PARTICIPANT_FLAG_BANNED\x10\x04\x12#\n\x1fPARTICIPANT_FLAG_NOT_AUTHORIZED\x10\x08\x12\x17\n\x13PARTICIPANT_FLAG_ME\x10\x10\x12\x1b\n\x17PARTICIPANT_FLAG_KICKED\x10 \x12#\n\x1fPARTICIPANT_FLAG_ROOM_NOT_FOUND\x10@') _CONNECTIONERROR = _descriptor.EnumDescriptor( name='ConnectionError', @@ -100,10 +93,9 @@ _CONNECTIONERROR = _descriptor.EnumDescriptor( ], containing_type=None, options=None, - serialized_start=2164, - serialized_end=2855, + serialized_start=2182, + serialized_end=2873, ) -_sym_db.RegisterEnumDescriptor(_CONNECTIONERROR) ConnectionError = enum_type_wrapper.EnumTypeWrapper(_CONNECTIONERROR) _STATUSTYPE = _descriptor.EnumDescriptor( @@ -143,10 +135,9 @@ _STATUSTYPE = _descriptor.EnumDescriptor( ], containing_type=None, options=None, - serialized_start=2858, - serialized_end=2992, + serialized_start=2876, + serialized_end=3010, ) -_sym_db.RegisterEnumDescriptor(_STATUSTYPE) StatusType = enum_type_wrapper.EnumTypeWrapper(_STATUSTYPE) _PARTICIPANTFLAG = _descriptor.EnumDescriptor( @@ -190,10 +181,9 @@ _PARTICIPANTFLAG = _descriptor.EnumDescriptor( ], containing_type=None, options=None, - serialized_start=2995, - serialized_end=3259, + serialized_start=3013, + serialized_end=3277, ) -_sym_db.RegisterEnumDescriptor(_PARTICIPANTFLAG) ParticipantFlag = enum_type_wrapper.EnumTypeWrapper(_PARTICIPANTFLAG) CONNECTION_ERROR_NETWORK_ERROR = 0 @@ -375,10 +365,9 @@ _WRAPPERMESSAGE_TYPE = _descriptor.EnumDescriptor( ], containing_type=None, options=None, - serialized_start=1431, - serialized_end=2161, + serialized_start=1449, + serialized_end=2179, ) -_sym_db.RegisterEnumDescriptor(_WRAPPERMESSAGE_TYPE) _CONNECTED = _descriptor.Descriptor( @@ -391,7 +380,7 @@ _CONNECTED = _descriptor.Descriptor( _descriptor.FieldDescriptor( name='user', full_name='pbnetwork.Connected.user', index=0, number=1, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -404,8 +393,6 @@ _CONNECTED = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - oneofs=[ - ], serialized_start=29, serialized_end=54, ) @@ -421,7 +408,7 @@ _DISCONNECTED = _descriptor.Descriptor( _descriptor.FieldDescriptor( name='user', full_name='pbnetwork.Disconnected.user', index=0, number=1, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -435,7 +422,7 @@ _DISCONNECTED = _descriptor.Descriptor( _descriptor.FieldDescriptor( name='message', full_name='pbnetwork.Disconnected.message', index=2, number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -448,8 +435,6 @@ _DISCONNECTED = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - oneofs=[ - ], serialized_start=56, serialized_end=116, ) @@ -465,21 +450,21 @@ _LOGIN = _descriptor.Descriptor( _descriptor.FieldDescriptor( name='user', full_name='pbnetwork.Login.user', index=0, number=1, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='legacyName', full_name='pbnetwork.Login.legacyName', index=1, number=2, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='password', full_name='pbnetwork.Login.password', index=2, number=3, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -499,8 +484,6 @@ _LOGIN = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - oneofs=[ - ], serialized_start=118, serialized_end=198, ) @@ -516,14 +499,14 @@ _LOGOUT = _descriptor.Descriptor( _descriptor.FieldDescriptor( name='user', full_name='pbnetwork.Logout.user', index=0, number=1, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='legacyName', full_name='pbnetwork.Logout.legacyName', index=1, number=2, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -536,8 +519,6 @@ _LOGOUT = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - oneofs=[ - ], serialized_start=200, serialized_end=242, ) @@ -553,21 +534,21 @@ _BUDDY = _descriptor.Descriptor( _descriptor.FieldDescriptor( name='userName', full_name='pbnetwork.Buddy.userName', index=0, number=1, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='buddyName', full_name='pbnetwork.Buddy.buddyName', index=1, number=2, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='alias', full_name='pbnetwork.Buddy.alias', index=2, number=3, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -588,14 +569,14 @@ _BUDDY = _descriptor.Descriptor( _descriptor.FieldDescriptor( name='statusMessage', full_name='pbnetwork.Buddy.statusMessage', index=5, number=6, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='iconHash', full_name='pbnetwork.Buddy.iconHash', index=6, number=7, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -615,8 +596,6 @@ _BUDDY = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - oneofs=[ - ], serialized_start=245, serialized_end=416, ) @@ -645,8 +624,6 @@ _BUDDIES = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - oneofs=[ - ], serialized_start=418, serialized_end=460, ) @@ -662,42 +639,42 @@ _CONVERSATIONMESSAGE = _descriptor.Descriptor( _descriptor.FieldDescriptor( name='userName', full_name='pbnetwork.ConversationMessage.userName', index=0, number=1, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='buddyName', full_name='pbnetwork.ConversationMessage.buddyName', index=1, number=2, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='message', full_name='pbnetwork.ConversationMessage.message', index=2, number=3, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='nickname', full_name='pbnetwork.ConversationMessage.nickname', index=3, number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='xhtml', full_name='pbnetwork.ConversationMessage.xhtml', index=4, number=5, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='timestamp', full_name='pbnetwork.ConversationMessage.timestamp', index=5, number=6, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -711,7 +688,7 @@ _CONVERSATIONMESSAGE = _descriptor.Descriptor( _descriptor.FieldDescriptor( name='id', full_name='pbnetwork.ConversationMessage.id', index=7, number=8, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -731,8 +708,6 @@ _CONVERSATIONMESSAGE = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - oneofs=[ - ], serialized_start=463, serialized_end=632, ) @@ -748,28 +723,28 @@ _ROOM = _descriptor.Descriptor( _descriptor.FieldDescriptor( name='userName', full_name='pbnetwork.Room.userName', index=0, number=1, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='nickname', full_name='pbnetwork.Room.nickname', index=1, number=2, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='room', full_name='pbnetwork.Room.room', index=2, number=3, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='password', full_name='pbnetwork.Room.password', index=3, number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -782,8 +757,6 @@ _ROOM = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - oneofs=[ - ], serialized_start=634, serialized_end=708, ) @@ -819,8 +792,6 @@ _ROOMLIST = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - oneofs=[ - ], serialized_start=710, serialized_end=748, ) @@ -836,21 +807,21 @@ _PARTICIPANT = _descriptor.Descriptor( _descriptor.FieldDescriptor( name='userName', full_name='pbnetwork.Participant.userName', index=0, number=1, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='room', full_name='pbnetwork.Participant.room', index=1, number=2, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='nickname', full_name='pbnetwork.Participant.nickname', index=2, number=3, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -871,14 +842,21 @@ _PARTICIPANT = _descriptor.Descriptor( _descriptor.FieldDescriptor( name='statusMessage', full_name='pbnetwork.Participant.statusMessage', index=5, number=6, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='newname', full_name='pbnetwork.Participant.newname', index=6, number=7, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='iconHash', full_name='pbnetwork.Participant.iconHash', index=7, + number=8, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -891,10 +869,8 @@ _PARTICIPANT = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - oneofs=[ - ], serialized_start=751, - serialized_end=907, + serialized_end=925, ) @@ -908,14 +884,14 @@ _VCARD = _descriptor.Descriptor( _descriptor.FieldDescriptor( name='userName', full_name='pbnetwork.VCard.userName', index=0, number=1, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='buddyName', full_name='pbnetwork.VCard.buddyName', index=1, number=2, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -929,21 +905,21 @@ _VCARD = _descriptor.Descriptor( _descriptor.FieldDescriptor( name='fullname', full_name='pbnetwork.VCard.fullname', index=3, number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='nickname', full_name='pbnetwork.VCard.nickname', index=4, number=5, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='photo', full_name='pbnetwork.VCard.photo', index=5, number=6, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value="", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -956,10 +932,8 @@ _VCARD = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - oneofs=[ - ], - serialized_start=909, - serialized_end=1016, + serialized_start=927, + serialized_end=1034, ) @@ -973,7 +947,7 @@ _STATUS = _descriptor.Descriptor( _descriptor.FieldDescriptor( name='userName', full_name='pbnetwork.Status.userName', index=0, number=1, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -987,7 +961,7 @@ _STATUS = _descriptor.Descriptor( _descriptor.FieldDescriptor( name='statusMessage', full_name='pbnetwork.Status.statusMessage', index=2, number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -1000,10 +974,8 @@ _STATUS = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - oneofs=[ - ], - serialized_start=1018, - serialized_end=1106, + serialized_start=1036, + serialized_end=1124, ) @@ -1038,7 +1010,7 @@ _STATS = _descriptor.Descriptor( _descriptor.FieldDescriptor( name='id', full_name='pbnetwork.Stats.id', index=3, number=4, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -1051,10 +1023,8 @@ _STATS = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - oneofs=[ - ], - serialized_start=1108, - serialized_end=1174, + serialized_start=1126, + serialized_end=1192, ) @@ -1068,21 +1038,21 @@ _FILE = _descriptor.Descriptor( _descriptor.FieldDescriptor( name='userName', full_name='pbnetwork.File.userName', index=0, number=1, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='buddyName', full_name='pbnetwork.File.buddyName', index=1, number=2, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='fileName', full_name='pbnetwork.File.fileName', index=2, number=3, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -1109,10 +1079,8 @@ _FILE = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - oneofs=[ - ], - serialized_start=1176, - serialized_end=1265, + serialized_start=1194, + serialized_end=1283, ) @@ -1133,7 +1101,7 @@ _FILETRANSFERDATA = _descriptor.Descriptor( _descriptor.FieldDescriptor( name='data', full_name='pbnetwork.FileTransferData.data', index=1, number=2, type=12, cpp_type=9, label=2, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value="", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -1146,10 +1114,8 @@ _FILETRANSFERDATA = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - oneofs=[ - ], - serialized_start=1267, - serialized_end=1313, + serialized_start=1285, + serialized_end=1331, ) @@ -1163,7 +1129,7 @@ _BACKENDCONFIG = _descriptor.Descriptor( _descriptor.FieldDescriptor( name='config', full_name='pbnetwork.BackendConfig.config', index=0, number=1, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=unicode("", "utf-8"), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -1176,10 +1142,8 @@ _BACKENDCONFIG = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - oneofs=[ - ], - serialized_start=1315, - serialized_end=1346, + serialized_start=1333, + serialized_end=1364, ) @@ -1200,7 +1164,7 @@ _WRAPPERMESSAGE = _descriptor.Descriptor( _descriptor.FieldDescriptor( name='payload', full_name='pbnetwork.WrapperMessage.payload', index=1, number=2, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), + has_default_value=False, default_value="", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -1214,10 +1178,8 @@ _WRAPPERMESSAGE = _descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - oneofs=[ - ], - serialized_start=1349, - serialized_end=2161, + serialized_start=1367, + serialized_end=2179, ) _BUDDY.fields_by_name['status'].enum_type = _STATUSTYPE @@ -1225,7 +1187,7 @@ _BUDDIES.fields_by_name['buddy'].message_type = _BUDDY _PARTICIPANT.fields_by_name['status'].enum_type = _STATUSTYPE _STATUS.fields_by_name['status'].enum_type = _STATUSTYPE _WRAPPERMESSAGE.fields_by_name['type'].enum_type = _WRAPPERMESSAGE_TYPE -_WRAPPERMESSAGE_TYPE.containing_type = _WRAPPERMESSAGE +_WRAPPERMESSAGE_TYPE.containing_type = _WRAPPERMESSAGE; DESCRIPTOR.message_types_by_name['Connected'] = _CONNECTED DESCRIPTOR.message_types_by_name['Disconnected'] = _DISCONNECTED DESCRIPTOR.message_types_by_name['Login'] = _LOGIN @@ -1243,128 +1205,108 @@ DESCRIPTOR.message_types_by_name['File'] = _FILE DESCRIPTOR.message_types_by_name['FileTransferData'] = _FILETRANSFERDATA DESCRIPTOR.message_types_by_name['BackendConfig'] = _BACKENDCONFIG DESCRIPTOR.message_types_by_name['WrapperMessage'] = _WRAPPERMESSAGE -DESCRIPTOR.enum_types_by_name['ConnectionError'] = _CONNECTIONERROR -DESCRIPTOR.enum_types_by_name['StatusType'] = _STATUSTYPE -DESCRIPTOR.enum_types_by_name['ParticipantFlag'] = _PARTICIPANTFLAG -Connected = _reflection.GeneratedProtocolMessageType('Connected', (_message.Message,), dict( - DESCRIPTOR = _CONNECTED, - __module__ = 'protocol_pb2' +class Connected(_message.Message): + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _CONNECTED + # @@protoc_insertion_point(class_scope:pbnetwork.Connected) - )) -_sym_db.RegisterMessage(Connected) -Disconnected = _reflection.GeneratedProtocolMessageType('Disconnected', (_message.Message,), dict( - DESCRIPTOR = _DISCONNECTED, - __module__ = 'protocol_pb2' +class Disconnected(_message.Message): + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _DISCONNECTED + # @@protoc_insertion_point(class_scope:pbnetwork.Disconnected) - )) -_sym_db.RegisterMessage(Disconnected) -Login = _reflection.GeneratedProtocolMessageType('Login', (_message.Message,), dict( - DESCRIPTOR = _LOGIN, - __module__ = 'protocol_pb2' +class Login(_message.Message): + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _LOGIN + # @@protoc_insertion_point(class_scope:pbnetwork.Login) - )) -_sym_db.RegisterMessage(Login) -Logout = _reflection.GeneratedProtocolMessageType('Logout', (_message.Message,), dict( - DESCRIPTOR = _LOGOUT, - __module__ = 'protocol_pb2' +class Logout(_message.Message): + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _LOGOUT + # @@protoc_insertion_point(class_scope:pbnetwork.Logout) - )) -_sym_db.RegisterMessage(Logout) -Buddy = _reflection.GeneratedProtocolMessageType('Buddy', (_message.Message,), dict( - DESCRIPTOR = _BUDDY, - __module__ = 'protocol_pb2' +class Buddy(_message.Message): + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _BUDDY + # @@protoc_insertion_point(class_scope:pbnetwork.Buddy) - )) -_sym_db.RegisterMessage(Buddy) -Buddies = _reflection.GeneratedProtocolMessageType('Buddies', (_message.Message,), dict( - DESCRIPTOR = _BUDDIES, - __module__ = 'protocol_pb2' +class Buddies(_message.Message): + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _BUDDIES + # @@protoc_insertion_point(class_scope:pbnetwork.Buddies) - )) -_sym_db.RegisterMessage(Buddies) -ConversationMessage = _reflection.GeneratedProtocolMessageType('ConversationMessage', (_message.Message,), dict( - DESCRIPTOR = _CONVERSATIONMESSAGE, - __module__ = 'protocol_pb2' +class ConversationMessage(_message.Message): + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _CONVERSATIONMESSAGE + # @@protoc_insertion_point(class_scope:pbnetwork.ConversationMessage) - )) -_sym_db.RegisterMessage(ConversationMessage) -Room = _reflection.GeneratedProtocolMessageType('Room', (_message.Message,), dict( - DESCRIPTOR = _ROOM, - __module__ = 'protocol_pb2' +class Room(_message.Message): + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _ROOM + # @@protoc_insertion_point(class_scope:pbnetwork.Room) - )) -_sym_db.RegisterMessage(Room) -RoomList = _reflection.GeneratedProtocolMessageType('RoomList', (_message.Message,), dict( - DESCRIPTOR = _ROOMLIST, - __module__ = 'protocol_pb2' +class RoomList(_message.Message): + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _ROOMLIST + # @@protoc_insertion_point(class_scope:pbnetwork.RoomList) - )) -_sym_db.RegisterMessage(RoomList) -Participant = _reflection.GeneratedProtocolMessageType('Participant', (_message.Message,), dict( - DESCRIPTOR = _PARTICIPANT, - __module__ = 'protocol_pb2' +class Participant(_message.Message): + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _PARTICIPANT + # @@protoc_insertion_point(class_scope:pbnetwork.Participant) - )) -_sym_db.RegisterMessage(Participant) -VCard = _reflection.GeneratedProtocolMessageType('VCard', (_message.Message,), dict( - DESCRIPTOR = _VCARD, - __module__ = 'protocol_pb2' +class VCard(_message.Message): + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _VCARD + # @@protoc_insertion_point(class_scope:pbnetwork.VCard) - )) -_sym_db.RegisterMessage(VCard) -Status = _reflection.GeneratedProtocolMessageType('Status', (_message.Message,), dict( - DESCRIPTOR = _STATUS, - __module__ = 'protocol_pb2' +class Status(_message.Message): + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _STATUS + # @@protoc_insertion_point(class_scope:pbnetwork.Status) - )) -_sym_db.RegisterMessage(Status) -Stats = _reflection.GeneratedProtocolMessageType('Stats', (_message.Message,), dict( - DESCRIPTOR = _STATS, - __module__ = 'protocol_pb2' +class Stats(_message.Message): + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _STATS + # @@protoc_insertion_point(class_scope:pbnetwork.Stats) - )) -_sym_db.RegisterMessage(Stats) -File = _reflection.GeneratedProtocolMessageType('File', (_message.Message,), dict( - DESCRIPTOR = _FILE, - __module__ = 'protocol_pb2' +class File(_message.Message): + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _FILE + # @@protoc_insertion_point(class_scope:pbnetwork.File) - )) -_sym_db.RegisterMessage(File) -FileTransferData = _reflection.GeneratedProtocolMessageType('FileTransferData', (_message.Message,), dict( - DESCRIPTOR = _FILETRANSFERDATA, - __module__ = 'protocol_pb2' +class FileTransferData(_message.Message): + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _FILETRANSFERDATA + # @@protoc_insertion_point(class_scope:pbnetwork.FileTransferData) - )) -_sym_db.RegisterMessage(FileTransferData) -BackendConfig = _reflection.GeneratedProtocolMessageType('BackendConfig', (_message.Message,), dict( - DESCRIPTOR = _BACKENDCONFIG, - __module__ = 'protocol_pb2' +class BackendConfig(_message.Message): + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _BACKENDCONFIG + # @@protoc_insertion_point(class_scope:pbnetwork.BackendConfig) - )) -_sym_db.RegisterMessage(BackendConfig) -WrapperMessage = _reflection.GeneratedProtocolMessageType('WrapperMessage', (_message.Message,), dict( - DESCRIPTOR = _WRAPPERMESSAGE, - __module__ = 'protocol_pb2' +class WrapperMessage(_message.Message): + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _WRAPPERMESSAGE + # @@protoc_insertion_point(class_scope:pbnetwork.WrapperMessage) - )) -_sym_db.RegisterMessage(WrapperMessage) # @@protoc_insertion_point(module_scope) diff --git a/buddy.py b/buddy.py index d8d3da7..62a216b 100644 --- a/buddy.py +++ b/buddy.py @@ -172,15 +172,29 @@ class BuddyList(dict): return None def requestVCard(self, buddy, ID=None): - if buddy == self.user or buddy == self.user.split('@')[0]: - buddy = self.session.legacyName + if "/" in buddy: + room, nick = buddy.split("/") + group = self.session.groups[room] + buddynr = None + for othernumber, othernick in group.participants.iteritems(): + if othernick == nick: + buddynr = othernumber + break + if buddynr is None: + return + else: + buddynr = buddy + + + if buddynr == self.user or buddynr == self.user.split('@')[0]: + buddynr = self.session.legacyName # Get profile picture - self.logger.debug('Requesting profile picture of %s', buddy) + self.logger.debug('Requesting profile picture of %s', buddynr) response = deferred.Deferred() # Error probably means image doesn't exist error = deferred.Deferred() - self.session.requestProfilePicture(buddy, onSuccess=response.run, + self.session.requestProfilePicture(buddynr, onSuccess=response.run, onFailure=error.run) response = response.arg(0) @@ -196,9 +210,9 @@ class BuddyList(dict): error.when(self.backend.handleVCard, self.user, ID, buddy, "", "", "") # Send image hash - if not buddy == self.session.legacyName: + if not buddynr == self.session.legacyName: try: - obuddy = self[buddy] + obuddy = self[buddynr] nick = obuddy.nick groups = obuddy.groups except KeyError: @@ -206,10 +220,10 @@ class BuddyList(dict): groups = [] image_hash = pictureData.then(utils.sha1hash) call(self.logger.debug, 'Image hash is %s', image_hash) - call(self.update, buddy, nick, groups, image_hash) + call(self.update, buddynr, nick, groups, image_hash) # No image error.when(self.logger.debug, 'No image') - error.when(self.update, buddy, nick, groups, '') + error.when(self.update, buddynr, nick, groups, '') def refresh(self, number): self.session.unsubscribePresence(number) diff --git a/group.py b/group.py index 224b183..a571d35 100644 --- a/group.py +++ b/group.py @@ -67,8 +67,12 @@ class Group(): flags = protocol_pb2.PARTICIPANT_FLAG_NONE if number == yourNumber: flags = flags | protocol_pb2.PARTICIPANT_FLAG_ME - - self._updateParticipant(number, flags, protocol_pb2.STATUS_ONLINE) + + try: + self._updateParticipant(number, flags, protocol_pb2.STATUS_ONLINE, + self.backend.sessions[self.user].buddies[number].image_hash) + except KeyError: + self._updateParticipant(number, flags, protocol_pb2.STATUS_ONLINE) def removeParticipants(self, participants): for jid in participants: @@ -94,10 +98,10 @@ class Group(): self._updateParticipant(number, flags, protocol_pb2.STATUS_ONLINE, new_nick) self.participants[number] = new_nick - def _updateParticipant(self, number, flags, status, newNick = ""): + def _updateParticipant(self, number, flags, status, imageHash = "", newNick = ""): nick = self.participants[number] # Notice the status message is the buddy's number if self.joined: self.backend.handleParticipantChanged( self.user, nick, self.id, flags, - status, number, newname = newNick) + status, number, newname = newNick, iconHash = imageHash)