emdee/tox-weechat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

migration to TokTok c-toxcore

Browse source
This commit is contained in:
Gordon Quad 2016-12-22 12:35:08 +00:00
parent 8d395d8011
commit cc9d370105
11 changed files with 141 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/twc-chat.c
View file

@ -80,6 +80,7 @@ twc_chat_new(struct t_twc_profile *profile, const char *name)
twc_chat_buffer_close_callback);
weechat_buffer_set_pointer(chat->buffer, "close_callback_pointer", chat);
}
free(full_name);
if (!(chat->buffer))
@ -152,6 +153,9 @@ twc_chat_refresh(const struct t_twc_chat *chat)
{
char *name = NULL;
char *title = NULL;
bool rc = false;
TOX_ERR_CONFERENCE_TITLE err = TOX_ERR_CONFERENCE_TITLE_OK;
if (chat->friend_number >= 0)
{
name = twc_get_name_nt(chat->profile->tox,
@ -162,10 +166,12 @@ twc_chat_refresh(const struct t_twc_chat *chat)
else if (chat->group_number >= 0)
{
char group_name[TOX_MAX_NAME_LENGTH + 1] = {0};
int len = tox_group_get_title(chat->profile->tox, chat->group_number,
(uint8_t *)group_name,
TOX_MAX_NAME_LENGTH);
if (len <= 0)
int len = tox_conference_get_title_size(chat->profile->tox, chat->group_number,
&err);
if ((err == TOX_ERR_CONFERENCE_TITLE_OK) && (len <= TOX_MAX_NAME_LENGTH))
rc = tox_conference_get_title(chat->profile->tox, chat->group_number,
(uint8_t *)group_name, &err);
if (!rc)
sprintf(group_name, "Group Chat %d", chat->group_number);
name = title = strdup((char *)group_name);
@ -278,17 +284,17 @@ twc_chat_print_message(struct t_twc_chat *chat,
const char *color,
const char *sender,
const char *message,
enum TWC_MESSAGE_TYPE message_type)
TOX_MESSAGE_TYPE message_type)
{
switch (message_type)
{
case TWC_MESSAGE_TYPE_MESSAGE:
case TOX_MESSAGE_TYPE_NORMAL:
weechat_printf_date_tags(chat->buffer, 0, tags,
"%s%s%s\t%s",
color, sender,
weechat_color("reset"), message);
break;
case TWC_MESSAGE_TYPE_ACTION:
case TOX_MESSAGE_TYPE_ACTION:
weechat_printf_date_tags(chat->buffer, 0, tags,
"%s%s%s%s %s",
weechat_prefix("action"),
@ -303,9 +309,9 @@ twc_chat_print_message(struct t_twc_chat *chat,
*/
void
twc_chat_send_message(struct t_twc_chat *chat, const char *message,
enum TWC_MESSAGE_TYPE message_type)
TOX_MESSAGE_TYPE message_type)
{
int64_t rc = 0;
TOX_ERR_CONFERENCE_SEND_MESSAGE err = TOX_ERR_CONFERENCE_SEND_MESSAGE_OK;
if (chat->friend_number >= 0)
{
twc_message_queue_add_friend_message(chat->profile,
@ -319,29 +325,26 @@ twc_chat_send_message(struct t_twc_chat *chat, const char *message,
}
else if (chat->group_number >= 0)
{
if (message_type == TWC_MESSAGE_TYPE_MESSAGE)
int len = strlen(message);
while (len > 0)
{
int len = strlen(message);
while (len > 0)
{
int fit_len = twc_fit_utf8(message, TWC_MAX_GROUP_MESSAGE_LENGTH);
rc = tox_group_message_send(chat->profile->tox, chat->group_number,
(uint8_t *)message, fit_len);
if (rc < 0)
break;
message += fit_len;
len -= fit_len;
}
int fit_len = twc_fit_utf8(message, TWC_MAX_GROUP_MESSAGE_LENGTH);
err = TOX_ERR_CONFERENCE_SEND_MESSAGE_OK;
tox_conference_send_message(chat->profile->tox, chat->group_number,
message_type, (uint8_t *)message, fit_len,
&err);
if (err != TOX_ERR_CONFERENCE_SEND_MESSAGE_OK)
break;
message += fit_len;
len -= fit_len;
}
else if (message_type == TWC_MESSAGE_TYPE_ACTION)
rc = tox_group_action_send(chat->profile->tox, chat->group_number,
(uint8_t *)message, strlen(message));
if (rc < 0)
if (err != TOX_ERR_CONFERENCE_SEND_MESSAGE_OK)
{
weechat_printf(chat->buffer,
"%s%sFailed to send message%s",
"%s%sFailed to send message with error %d%s",
weechat_prefix("error"),
weechat_color("chat_highlight"),
err,
weechat_color("reset"));
}
}
@ -357,7 +360,7 @@ twc_chat_buffer_input_callback(const void *pointer, void *data,
{
/* TODO: don't strip the const */
struct t_twc_chat *chat = (void *)pointer;
twc_chat_send_message(chat, input_data, TWC_MESSAGE_TYPE_MESSAGE);
twc_chat_send_message(chat, input_data, TOX_MESSAGE_TYPE_NORMAL);
return WEECHAT_RC_OK;
}
@ -370,16 +373,17 @@ twc_chat_buffer_close_callback(const void *pointer, void *data,
struct t_gui_buffer *weechat_buffer)
{
/* TODO: don't strip the const */
TOX_ERR_CONFERENCE_DELETE err = TOX_ERR_CONFERENCE_DELETE_OK;
struct t_twc_chat *chat = (void *)pointer;
if (chat->profile->tox && chat->group_number >= 0)
{
int rc = tox_del_groupchat(chat->profile->tox, chat->group_number);
if (rc != 0)
tox_conference_delete(chat->profile->tox, chat->group_number, &err);
if (err != TOX_ERR_CONFERENCE_DELETE_OK)
{
weechat_printf(chat->profile->buffer,
"%swarning: failed to leave group chat",
weechat_prefix("error"));
"%swarning: failed to leave group chat with error %d",
weechat_prefix("error"), err);
}
}