zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-09-21 07:07:25 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 6e59eaa96c into 43f1727ef9

Browse source
This commit is contained in:
Haw Loeung 2026-09-13 05:27:04 +10:00 • committed by GitHub
commit b3f4be1dad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 91 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

91
src/irc/proxy/listen.c
View file

@ -164,6 +164,66 @@ static void grab_who(CLIENT_REC *client, const char *channel)
g_string_free(arg, TRUE);
}
static gboolean server_has_message_tags(IRC_SERVER_REC *server)
{
if (server == NULL || server->cap_supported == NULL)
return FALSE;
return g_hash_table_lookup_extended(server->cap_supported, "message-tags", NULL, NULL);
}
static void handle_client_cap(CLIENT_REC *client, const char *args)
{
char *subcmd, *cap_args;
const char *target_nick;
subcmd = g_strdup(args);
cap_args = strchr(subcmd, ' ');
if (cap_args != NULL) {
*cap_args++ = '\0';
while (*cap_args == ' ')
cap_args++;
} else {
cap_args = "";
}
target_nick = client->nick != NULL ? client->nick : "*";
if (g_ascii_strcasecmp(subcmd, "LS") == 0) {
if (server_has_message_tags(client->server)) {
proxy_outdata(client, ":%s CAP %s LS :message-tags\r\n", client->proxy_address, target_nick);
} else {
proxy_outdata(client, ":%s CAP %s LS :\r\n", client->proxy_address, target_nick);
}
} else if (g_ascii_strcasecmp(subcmd, "REQ") == 0) {
const char *req = cap_args;
while (*req == ' ' || *req == ':')
req++;
if (*req == '\0') {
g_free(subcmd);
return;
}
if (g_ascii_strcasecmp(req, "message-tags") == 0 && server_has_message_tags(client->server)) {
client->cap_message_tags = TRUE;
proxy_outdata(client, ":%s CAP %s ACK :%s\r\n", client->proxy_address,
target_nick, req);
} else {
proxy_outdata(client, ":%s CAP %s NAK :%s\r\n", client->proxy_address,
target_nick, req);
}
} else if (g_ascii_strcasecmp(subcmd, "LIST") == 0) {
proxy_outdata(client, ":%s CAP %s LIST :%s\r\n", client->proxy_address, target_nick,
client->cap_message_tags ? "message-tags" : "");
} else if (g_ascii_strcasecmp(subcmd, "END") == 0) {
/* CAP negotiation complete */
}
g_free(subcmd);
}
static void handle_client_connect_cmd(CLIENT_REC *client,
const char *cmd, const char *args)
{
@ -215,6 +275,8 @@ static void handle_client_connect_cmd(CLIENT_REC *client,
client->nick = g_strdup(args);
} else if (g_strcmp0(cmd, "USER") == 0) {
client->user_sent = TRUE;
} else if (g_strcmp0(cmd, "CAP") == 0) {
handle_client_cap(client, args);
}
if (client->nick != NULL && client->user_sent) {
@ -241,6 +303,11 @@ static void handle_client_cmd(CLIENT_REC *client, char *cmd, char *args,
return;
}
if (g_strcmp0(cmd, "CAP") == 0) {
handle_client_cap(client, args);
return;
}
if (g_strcmp0(cmd, "QUIT") == 0) {
remove_client(client);
return;
@ -559,7 +626,29 @@ static void sig_server_event(IRC_SERVER_REC *server, const char *line,
}
/* send the data to clients.. */
proxy_outdata_all(server, "%s", next_line->str);
for (tmp = proxy_clients; tmp != NULL; tmp = tmp->next) {
CLIENT_REC *rec = tmp->data;
if (!rec->connected || rec->server != server)
continue;
if (rec->cap_message_tags) {
net_sendbuffer_send(rec->handle, next_line->str, next_line->len);
} else if (g_strcmp0(event, "event tagmsg") != 0) {
const char *untagged = next_line->str;
if (*untagged == '@') {
untagged = strchr(untagged, ' ');
if (untagged != NULL) {
while (*untagged == ' ')
untagged++;
} else {
untagged = next_line->str;
}
}
net_sendbuffer_send(rec->handle, untagged, strlen(untagged));
}
}
g_free(event);
}

1
src/irc/proxy/proxy.h
View file

@ -31,6 +31,7 @@ typedef struct {
unsigned int connected:1;
unsigned int want_ctcp:1;
unsigned int multiplex:1;
unsigned int cap_message_tags:1;
} CLIENT_REC;
#endif