pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-08 02:33:12 +02:00
Code Activity

irc: return arraylist instead of hashtable in function irc_server_sendf (issue #1923)

Browse Source
This commit is contained in:
Sébastien Helleu
2023-05-05 00:58:12 +02:00
parent 2154b440d2
commit e8b5d73421
5 changed files with 109 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/irc/irc-input.c
+18 -18
View File
@@ -51,6 +51,9 @@ irc_input_user_message_display (struct t_gui_buffer *buffer, int action,
char *pos, *text2, *text_decoded, str_tags[256], *str_color;
const char *ptr_text;
if (!buffer || !text)
return;
/* if message is an action, force "action" to 1 and extract message */
if (strncmp (text, "\01ACTION ", 8) == 0)
{
@@ -155,9 +158,8 @@ void
irc_input_send_user_message (struct t_gui_buffer *buffer, int flags,
const char *tags, char *message)
{
int number, action;
char hash_key[32], *str_args;
struct t_hashtable *hashtable;
int i, action, list_size;
struct t_arraylist *list_messages;
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
@@ -171,25 +173,23 @@ irc_input_send_user_message (struct t_gui_buffer *buffer, int flags,
weechat_prefix ("error"), IRC_PLUGIN_NAME);
return;
}
hashtable = irc_server_sendf (ptr_server,
flags | IRC_SERVER_SEND_RETURN_HASHTABLE,
tags,
"PRIVMSG %s :%s",
ptr_channel->name, message);
if (hashtable)
list_messages = irc_server_sendf (ptr_server,
flags | IRC_SERVER_SEND_RETURN_LIST,
tags,
"PRIVMSG %s :%s",
ptr_channel->name, message);
if (list_messages)
{
action = (strncmp (message, "\01ACTION ", 8) == 0);
number = 1;
while (1)
list_size = weechat_arraylist_size (list_messages);
for (i = 0; i < list_size; i++)
{
snprintf (hash_key, sizeof (hash_key), "args%d", number);
str_args = weechat_hashtable_get (hashtable, hash_key);
if (!str_args)
break;
irc_input_user_message_display (buffer, action, str_args);
number++;
irc_input_user_message_display (
buffer,
action,
(const char *)weechat_arraylist_get (list_messages, i));
}
weechat_hashtable_free (hashtable);
weechat_arraylist_free (list_messages);
}
}