zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-22 18:12:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge c9aae766f5 into 672f127544

Browse source
This commit is contained in:
ailin-nemui 2021-02-25 00:17:51 +01:00 • committed by GitHub
commit 18f3da48fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 383 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/irc/core/irc-expandos.c
View file

@ -141,6 +141,34 @@ static char *expando_cumode_space(SERVER_REC *server, void *item, int *free_ret)
return *ret == '\0' ? " " : ret;
}
static char *expando_account_tag(SERVER_REC *server, void *item, int *free_ret)
{
const char *ret;
if (!IS_IRC_SERVER(server))
return "";
ret = server_meta_stash_find(server, "account");
return ret == NULL ? "" : (char *) ret;
}
static char *expando_has_account_tag(SERVER_REC *server, void *item, int *free_ret)
{
const char *ret;
if (!IS_IRC_SERVER(server))
return "";
if (gslist_find_string(IRC_SERVER(server)->cap_active, CAP_ACCOUNT_TAG) == NULL)
return "";
ret = server_meta_stash_find(server, "account");
return (char *) settings_get_str(ret == NULL ? "format_has_no_account_tag" :
"format_has_account_tag");
}
static void event_join(IRC_SERVER_REC *server, const char *data,
const char *nick, const char *address)
{
@ -155,6 +183,8 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
void irc_expandos_init(void)
{
last_join = NULL;
settings_add_str("lookandfeel", "format_has_no_account_tag", "~");
settings_add_str("lookandfeel", "format_has_account_tag", "ª");
expando_create(":", expando_lastjoin,
"event join", EXPANDO_ARG_SERVER, NULL);
@ -183,8 +213,12 @@ void irc_expandos_init(void)
"window item changed", EXPANDO_ARG_WINDOW,
"nick mode changed", EXPANDO_ARG_WINDOW_ITEM,
"channel joined", EXPANDO_ARG_WINDOW_ITEM, NULL);
expando_create("account_tag", expando_account_tag, "server event", EXPANDO_ARG_SERVER,
NULL);
expando_create("has_account_tag", expando_has_account_tag, "server event",
EXPANDO_ARG_SERVER, NULL);
expando_add_signal("I", "event invite", EXPANDO_ARG_SERVER);
expando_add_signal("I", "event invite", EXPANDO_ARG_SERVER);
signal_add("event join", (SIGNAL_FUNC) event_join);
}
@ -200,6 +234,8 @@ void irc_expandos_deinit(void)
expando_destroy("x", expando_hostname);
expando_destroy("usermode", expando_usermode);
expando_destroy("cumode", expando_cumode);
expando_destroy("account_tag", expando_account_tag);
expando_destroy("has_account_tag", expando_has_account_tag);
signal_remove("event join", (SIGNAL_FUNC) event_join);
}

2
src/irc/core/irc-servers.c
View file

@ -242,6 +242,8 @@ static void server_init(IRC_SERVER_REC *server)
irc_cap_toggle(server, CAP_CHGHOST, TRUE);
irc_cap_toggle(server, CAP_ACCOUNT_NOTIFY, TRUE);
irc_cap_toggle(server, CAP_SELF_MESSAGE, TRUE);
irc_cap_toggle(server, CAP_SERVER_TIME, TRUE);
irc_cap_toggle(server, CAP_ACCOUNT_TAG, TRUE);
irc_send_cmd_now(server, "CAP LS " CAP_LS_VERSION);

2
src/irc/core/irc-servers.h
View file

@ -26,6 +26,8 @@
#define CAP_CHGHOST "chghost"
#define CAP_ACCOUNT_NOTIFY "account-notify"
#define CAP_SELF_MESSAGE "znc.in/self-message"
#define CAP_SERVER_TIME "server-time"
#define CAP_ACCOUNT_TAG "account-tag"
/* returns IRC_SERVER_REC if it's IRC server, NULL if it isn't */
#define IRC_SERVER(server) \

95
src/irc/core/irc.c
View file

@ -19,14 +19,15 @@
*/
#include "module.h"
#include <irssi/src/core/modules.h>
#include <irssi/src/core/network.h>
#include <irssi/src/core/net-sendbuffer.h>
#include <irssi/src/core/rawlog.h>
#include <irssi/src/core/misc.h>
#include <irssi/src/core/modules.h>
#include <irssi/src/core/net-sendbuffer.h>
#include <irssi/src/core/network.h>
#include <irssi/src/core/rawlog.h>
#include <irssi/src/core/refstrings.h>
#include <irssi/src/irc/core/irc-servers.h>
#include <irssi/src/irc/core/irc-channels.h>
#include <irssi/src/irc/core/irc-servers.h>
#include <irssi/src/irc/core/servers-redirect.h>
char *current_server_event;
@ -383,11 +384,89 @@ static void irc_server_event(IRC_SERVER_REC *server, const char *line,
g_free(event);
}
static void irc_server_event_tags(IRC_SERVER_REC *server, const char *line,
const char *nick, const char *address, const char *tags)
static void unescape_tag(char *tag)
{
char *tmp;
if (tag == NULL)
return;
tmp = tag;
for (; *tmp != '\0'; tmp++, tag++) {
if (*tmp == '\\') {
tmp++;
switch (*tmp) {
case ':':
*tag = ';';
break;
case 'n':
*tag = '\n';
break;
case 'r':
*tag = '\r';
break;
case 's':
*tag = ' ';
break;
default:
*tag = *tmp;
break;
}
} else {
*tag = *tmp;
}
}
*tag = '\0';
}
static gboolean i_str0_equal(const char *s1, const char *s2)
{
return g_strcmp0(s1, s2) == 0;
}
GHashTable *irc_parse_message_tags(const char *tags)
{
char **split, **tmp, **kv;
GHashTable *hash;
hash = g_hash_table_new_full(g_str_hash, (GEqualFunc) i_str0_equal,
(GDestroyNotify) i_refstr_release, (GDestroyNotify) g_free);
split = g_strsplit(tags, ";", -1);
for (tmp = split; *tmp != NULL; tmp++) {
kv = g_strsplit(*tmp, "=", 2);
unescape_tag(kv[1]);
g_hash_table_replace(hash, i_refstr_intern(kv[0]),
g_strdup(kv[1] == NULL ? "" : kv[1]));
g_strfreev(kv);
}
g_strfreev(split);
return hash;
}
static void irc_server_event_tags(IRC_SERVER_REC *server, const char *line, const char *nick,
const char *address, const char *tags)
{
char *timestr, *accountstr;
GHashTable *tags_hash = NULL;
if (tags != NULL && *tags != '\0') {
tags_hash = irc_parse_message_tags(tags);
if ((timestr = g_hash_table_lookup(tags_hash, "time")) != NULL) {
server_meta_stash(SERVER(server), "time", timestr);
}
accountstr = g_hash_table_lookup(tags_hash, "account");
if (accountstr != NULL) {
server_meta_stash(SERVER(server), "account", accountstr);
g_free(accountstr);
}
}
if (*line != '\0')
signal_emit_id(signal_server_event, 4, server, line, nick, address);
if (tags_hash != NULL)
g_hash_table_destroy(tags_hash);
}
static char *irc_parse_prefix(char *line, char **nick, char **address, char **tags)
@ -449,6 +528,8 @@ static void irc_parse_incoming_line(IRC_SERVER_REC *server, char *line)
line = irc_parse_prefix(line, &nick, &address, &tags);
if (*line != '\0' || tags != NULL)
signal_emit_id(signal_server_event_tags, 5, server, line, nick, address, tags);
server_meta_clear_all(SERVER(server));
}
/* input function: handle incoming server messages */

3
src/irc/core/irc.h
View file

@ -48,6 +48,9 @@ void irc_send_cmd_first(IRC_SERVER_REC *server, const char *cmd);
void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd,
int send_now, int immediate, int raw);
/* Extract a tag value from tags */
GHashTable *irc_parse_message_tags(const char *tags);
/* Get count parameters from data */
#include <irssi/src/core/commands.h>
char *event_get_param(char **data);