Skip to content

Commit 5cdbef9

Browse files
iphydfiphydf
committed
refactor: Update group private message API function.
1 parent 0cc7616 commit 5cdbef9

File tree

3 files changed

+34
-38
lines changed

3 files changed

+34
-38
lines changed

‎pytox/toxcore/tox.pxd‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -289,16 +289,15 @@ cdef extern from "tox/tox.h":
289289
TOX_ERR_GROUP_SEND_PRIVATE_MESSAGE_PEER_NOT_FOUND
290290
TOX_ERR_GROUP_SEND_PRIVATE_MESSAGE_TOO_LONG
291291
TOX_ERR_GROUP_SEND_PRIVATE_MESSAGE_EMPTY
292+
TOX_ERR_GROUP_SEND_PRIVATE_MESSAGE_BAD_TYPE
292293
TOX_ERR_GROUP_SEND_PRIVATE_MESSAGE_PERMISSIONS
293294
TOX_ERR_GROUP_SEND_PRIVATE_MESSAGE_FAIL_SEND
294295
TOX_ERR_GROUP_SEND_PRIVATE_MESSAGE_DISCONNECTED
295-
TOX_ERR_GROUP_SEND_PRIVATE_MESSAGE_BAD_TYPE
296296
cpdef enum Tox_Err_Group_Send_Custom_Packet:
297297
TOX_ERR_GROUP_SEND_CUSTOM_PACKET_OK
298298
TOX_ERR_GROUP_SEND_CUSTOM_PACKET_GROUP_NOT_FOUND
299299
TOX_ERR_GROUP_SEND_CUSTOM_PACKET_TOO_LONG
300300
TOX_ERR_GROUP_SEND_CUSTOM_PACKET_EMPTY
301-
TOX_ERR_GROUP_SEND_CUSTOM_PACKET_PERMISSIONS
302301
TOX_ERR_GROUP_SEND_CUSTOM_PACKET_DISCONNECTED
303302
TOX_ERR_GROUP_SEND_CUSTOM_PACKET_FAIL_SEND
304303
cpdef enum Tox_Err_Group_Send_Custom_Private_Packet:
@@ -307,7 +306,6 @@ cdef extern from "tox/tox.h":
307306
TOX_ERR_GROUP_SEND_CUSTOM_PRIVATE_PACKET_TOO_LONG
308307
TOX_ERR_GROUP_SEND_CUSTOM_PRIVATE_PACKET_EMPTY
309308
TOX_ERR_GROUP_SEND_CUSTOM_PRIVATE_PACKET_PEER_NOT_FOUND
310-
TOX_ERR_GROUP_SEND_CUSTOM_PRIVATE_PACKET_PERMISSIONS
311309
TOX_ERR_GROUP_SEND_CUSTOM_PRIVATE_PACKET_FAIL_SEND
312310
TOX_ERR_GROUP_SEND_CUSTOM_PRIVATE_PACKET_DISCONNECTED
313311
cpdef enum Tox_Err_Group_Invite_Friend:
@@ -434,21 +432,21 @@ cdef extern from "tox/tox.h":
434432
ctypedef void tox_conference_message_cb(Tox* tox, Tox_Conference_Number conference_number, Tox_Conference_Peer_Number peer_number, Tox_Message_Type type_, const uint8_t* message, size_t length, void* user_data) except *
435433
ctypedef void tox_conference_title_cb(Tox* tox, Tox_Conference_Number conference_number, Tox_Conference_Peer_Number peer_number, const uint8_t* title, size_t length, void* user_data) except *
436434
ctypedef void tox_group_self_join_cb(Tox* tox, Tox_Group_Number group_number, void* user_data) except *
437-
ctypedef void tox_group_peer_name_cb(Tox* tox, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id, const uint8_t* name, size_t length, void* user_data) except *
435+
ctypedef void tox_group_peer_name_cb(Tox* tox, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id, const uint8_t* name, size_t name_length, void* user_data) except *
438436
ctypedef void tox_group_peer_status_cb(Tox* tox, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id, Tox_User_Status status, void* user_data) except *
439437
ctypedef void tox_group_peer_limit_cb(Tox* tox, Tox_Group_Number group_number, uint32_t peer_limit, void* user_data) except *
440438
ctypedef void tox_group_peer_join_cb(Tox* tox, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id, void* user_data) except *
441439
ctypedef void tox_group_peer_exit_cb(Tox* tox, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id, Tox_Group_Exit_Type exit_type, const uint8_t* name, size_t name_length, const uint8_t* part_message, size_t part_message_length, void* user_data) except *
442-
ctypedef void tox_group_topic_cb(Tox* tox, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id, const uint8_t* topic, size_t length, void* user_data) except *
440+
ctypedef void tox_group_topic_cb(Tox* tox, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id, const uint8_t* topic, size_t topic_length, void* user_data) except *
443441
ctypedef void tox_group_privacy_state_cb(Tox* tox, Tox_Group_Number group_number, Tox_Group_Privacy_State privacy_state, void* user_data) except *
444442
ctypedef void tox_group_voice_state_cb(Tox* tox, Tox_Group_Number group_number, Tox_Group_Voice_State voice_state, void* user_data) except *
445443
ctypedef void tox_group_topic_lock_cb(Tox* tox, Tox_Group_Number group_number, Tox_Group_Topic_Lock topic_lock, void* user_data) except *
446-
ctypedef void tox_group_password_cb(Tox* tox, Tox_Group_Number group_number, const uint8_t* password, size_t length, void* user_data) except *
447-
ctypedef void tox_group_message_cb(Tox* tox, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id, Tox_Message_Type type_, const uint8_t* message, size_t length, Tox_Group_Message_Id message_id, void* user_data) except *
448-
ctypedef void tox_group_private_message_cb(Tox* tox, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id, Tox_Message_Type type_, const uint8_t* message, size_t length, void* user_data) except *
449-
ctypedef void tox_group_custom_packet_cb(Tox* tox, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id, const uint8_t* data, size_t length, void* user_data) except *
450-
ctypedef void tox_group_custom_private_packet_cb(Tox* tox, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id, const uint8_t* data, size_t length, void* user_data) except *
451-
ctypedef void tox_group_invite_cb(Tox* tox, Tox_Friend_Number friend_number, const uint8_t* invite_data, size_t length, const uint8_t* group_name, size_t group_name_length, void* user_data) except *
444+
ctypedef void tox_group_password_cb(Tox* tox, Tox_Group_Number group_number, const uint8_t* password, size_t password_length, void* user_data) except *
445+
ctypedef void tox_group_message_cb(Tox* tox, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id, Tox_Message_Type message_type, const uint8_t* message, size_t message_length, Tox_Group_Message_Id message_id, void* user_data) except *
446+
ctypedef void tox_group_private_message_cb(Tox* tox, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id, Tox_Message_Type message_type, const uint8_t* message, size_t message_length, Tox_Group_Message_Id message_id, void* user_data) except *
447+
ctypedef void tox_group_custom_packet_cb(Tox* tox, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id, const uint8_t* data, size_t data_length, void* user_data) except *
448+
ctypedef void tox_group_custom_private_packet_cb(Tox* tox, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id, const uint8_t* data, size_t data_length, void* user_data) except *
449+
ctypedef void tox_group_invite_cb(Tox* tox, Tox_Friend_Number friend_number, const uint8_t* invite_data, size_t invite_data_length, const uint8_t* group_name, size_t group_name_length, void* user_data) except *
452450
ctypedef void tox_group_join_fail_cb(Tox* tox, Tox_Group_Number group_number, Tox_Group_Join_Fail fail_type, void* user_data) except *
453451
ctypedef void tox_group_moderation_cb(Tox* tox, Tox_Group_Number group_number, Tox_Group_Peer_Number source_peer_id, Tox_Group_Peer_Number target_peer_id, Tox_Group_Mod_Event mod_type, void* user_data) except *
454452
cdef bool tox_options_get_ipv6_enabled(const Tox_Options* self)
@@ -660,8 +658,8 @@ cdef extern from "tox/tox.h":
660658
cdef void tox_callback_group_voice_state(Tox* self, tox_group_voice_state_cb* callback)
661659
cdef void tox_callback_group_topic_lock(Tox* self, tox_group_topic_lock_cb* callback)
662660
cdef void tox_callback_group_password(Tox* self, tox_group_password_cb* callback)
663-
cdef Tox_Group_Message_Id tox_group_send_message(const Tox* self, Tox_Group_Number group_number, Tox_Message_Type type_, const uint8_t* message, size_t length, Tox_Err_Group_Send_Message* error)
664-
cdef bool tox_group_send_private_message(const Tox* self, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id, Tox_Message_Type type_, const uint8_t* message, size_t length, Tox_Err_Group_Send_Private_Message* error)
661+
cdef Tox_Group_Message_Id tox_group_send_message(const Tox* self, Tox_Group_Number group_number, Tox_Message_Type message_type, const uint8_t* message, size_t length, Tox_Err_Group_Send_Message* error)
662+
cdef Tox_Group_Message_Id tox_group_send_private_message(const Tox* self, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id, Tox_Message_Type message_type, const uint8_t* message, size_t length, Tox_Err_Group_Send_Private_Message* error)
665663
cdef bool tox_group_send_custom_packet(const Tox* self, Tox_Group_Number group_number, bool lossless, const uint8_t* data, size_t length, Tox_Err_Group_Send_Custom_Packet* error)
666664
cdef bool tox_group_send_custom_private_packet(const Tox* self, Tox_Group_Number group_number, Tox_Group_Peer_Number peer_id, bool lossless, const uint8_t* data, size_t length, Tox_Err_Group_Send_Custom_Private_Packet* error)
667665
cdef void tox_callback_group_message(Tox* self, tox_group_message_cb* callback)

‎pytox/toxcore/tox.pyi‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ class Tox_Ptr:
230230
def handle_group_peer_name(self, group_number: Tox_Group_Number, peer_id: Tox_Group_Peer_Number, name: bytes) -> None: ...
231231
def handle_group_peer_status(self, group_number: Tox_Group_Number, peer_id: Tox_Group_Peer_Number, status: Tox_User_Status) -> None: ...
232232
def handle_group_privacy_state(self, group_number: Tox_Group_Number, privacy_state: Tox_Group_Privacy_State) -> None: ...
233-
def handle_group_private_message(self, group_number: Tox_Group_Number, peer_id: Tox_Group_Peer_Number, type_: Tox_Message_Type, message: bytes) -> None: ...
233+
def handle_group_private_message(self, group_number: Tox_Group_Number, peer_id: Tox_Group_Peer_Number, type_: Tox_Message_Type, message: bytes, message_id: Tox_Group_Message_Id) -> None: ...
234234
def handle_group_self_join(self, group_number: Tox_Group_Number) -> None: ...
235235
def handle_group_topic(self, group_number: Tox_Group_Number, peer_id: Tox_Group_Peer_Number, topic: bytes) -> None: ...
236236
def handle_group_topic_lock(self, group_number: Tox_Group_Number, topic_lock: Tox_Group_Topic_Lock) -> None: ...
@@ -448,15 +448,13 @@ TOX_ERR_GROUP_SEND_CUSTOM_PACKET_EMPTY: Tox_Err_Group_Send_Custom_Packet
448448
TOX_ERR_GROUP_SEND_CUSTOM_PACKET_FAIL_SEND: Tox_Err_Group_Send_Custom_Packet
449449
TOX_ERR_GROUP_SEND_CUSTOM_PACKET_GROUP_NOT_FOUND: Tox_Err_Group_Send_Custom_Packet
450450
TOX_ERR_GROUP_SEND_CUSTOM_PACKET_OK: Tox_Err_Group_Send_Custom_Packet
451-
TOX_ERR_GROUP_SEND_CUSTOM_PACKET_PERMISSIONS: Tox_Err_Group_Send_Custom_Packet
452451
TOX_ERR_GROUP_SEND_CUSTOM_PACKET_TOO_LONG: Tox_Err_Group_Send_Custom_Packet
453452
TOX_ERR_GROUP_SEND_CUSTOM_PRIVATE_PACKET_DISCONNECTED: Tox_Err_Group_Send_Custom_Private_Packet
454453
TOX_ERR_GROUP_SEND_CUSTOM_PRIVATE_PACKET_EMPTY: Tox_Err_Group_Send_Custom_Private_Packet
455454
TOX_ERR_GROUP_SEND_CUSTOM_PRIVATE_PACKET_FAIL_SEND: Tox_Err_Group_Send_Custom_Private_Packet
456455
TOX_ERR_GROUP_SEND_CUSTOM_PRIVATE_PACKET_GROUP_NOT_FOUND: Tox_Err_Group_Send_Custom_Private_Packet
457456
TOX_ERR_GROUP_SEND_CUSTOM_PRIVATE_PACKET_OK: Tox_Err_Group_Send_Custom_Private_Packet
458457
TOX_ERR_GROUP_SEND_CUSTOM_PRIVATE_PACKET_PEER_NOT_FOUND: Tox_Err_Group_Send_Custom_Private_Packet
459-
TOX_ERR_GROUP_SEND_CUSTOM_PRIVATE_PACKET_PERMISSIONS: Tox_Err_Group_Send_Custom_Private_Packet
460458
TOX_ERR_GROUP_SEND_CUSTOM_PRIVATE_PACKET_TOO_LONG: Tox_Err_Group_Send_Custom_Private_Packet
461459
TOX_ERR_GROUP_SEND_MESSAGE_BAD_TYPE: Tox_Err_Group_Send_Message
462460
TOX_ERR_GROUP_SEND_MESSAGE_DISCONNECTED: Tox_Err_Group_Send_Message

0 commit comments

Comments
 (0)