diff --git a/solanaceae/core/tox_default_impl.cpp b/solanaceae/core/tox_default_impl.cpp index e5b5362..f7aea28 100644 --- a/solanaceae/core/tox_default_impl.cpp +++ b/solanaceae/core/tox_default_impl.cpp @@ -545,8 +545,8 @@ std::vector ToxDefaultImpl::toxGroupGetList(void) { std::tuple, Tox_Err_Group_Send_Message> ToxDefaultImpl::toxGroupSendMessage(uint32_t group_number, Tox_Message_Type type, std::string_view message) { Tox_Err_Group_Send_Message err = TOX_ERR_GROUP_SEND_MESSAGE_OK; uint32_t message_id = 0; - tox_group_send_message(_tox, group_number, type, reinterpret_cast(message.data()), message.size(), &message_id, &err); - if (err == TOX_ERR_GROUP_SEND_MESSAGE_OK) { + const bool res = tox_group_send_message(_tox, group_number, type, reinterpret_cast(message.data()), message.size(), &message_id, &err); + if (res) { return {message_id, err}; } else { return {std::nullopt, err}; diff --git a/solanaceae/core/tox_event_logger.cpp b/solanaceae/core/tox_event_logger.cpp index bb48cef..a0b6c0e 100644 --- a/solanaceae/core/tox_event_logger.cpp +++ b/solanaceae/core/tox_event_logger.cpp @@ -40,8 +40,14 @@ bool ToxEventLogger::onToxEvent(const Tox_Event_File_Chunk_Request* e) { return false; } -bool ToxEventLogger::onToxEvent(const Tox_Event_File_Recv*) { - _out << "TOX_EVENT: " << tox_event_to_string(TOX_EVENT_FILE_RECV) << "\n"; +bool ToxEventLogger::onToxEvent(const Tox_Event_File_Recv* e) { + _out << "TOX_EVENT: " << tox_event_to_string(TOX_EVENT_FILE_RECV) + << " frd:" << tox_event_file_recv_get_friend_number(e) + << " fnb:" << tox_event_file_recv_get_file_number(e) + << " fnm:" << std::string_view{reinterpret_cast(tox_event_file_recv_get_filename(e)), tox_event_file_recv_get_filename_length(e)} + << " sze:" << tox_event_file_recv_get_file_size(e) + << " knd:" << tox_event_file_recv_get_kind(e) + << "\n"; return false; }