mirror of
https://github.com/irssi/irssi.git
synced 2026-08-17 07:32:04 +02:00
Fixed handling WHOIS printing once and for all. Everything unknown between
"beginning of whois" and "end of whois" events is now printed as whois_special. Removed whois_registered and whois_help, they're printed with whois_special as well. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3263 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen
cras
parent
e9c3a217e3
commit
6f45115b5e
7 changed files with 389 additions and 401 deletions
379
src/fe-common/irc/fe-whois.c
Normal file
379
src/fe-common/irc/fe-whois.c
Normal file
|
|
@ -0,0 +1,379 @@
|
|||
/* Copyright (C) 1999-2004 Timo Sirainen */
|
||||
|
||||
#include "module.h"
|
||||
#include "module-formats.h"
|
||||
#include "signals.h"
|
||||
#include "levels.h"
|
||||
#include "misc.h"
|
||||
#include "settings.h"
|
||||
|
||||
#include "irc-servers.h"
|
||||
|
||||
#include "printtext.h"
|
||||
|
||||
static void event_whois(IRC_SERVER_REC *server, const char *data)
|
||||
{
|
||||
char *params, *nick, *user, *host, *realname;
|
||||
|
||||
g_return_if_fail(data != NULL);
|
||||
|
||||
params = event_get_params(data, 6, NULL, &nick, &user,
|
||||
&host, NULL, &realname);
|
||||
printformat(server, nick, MSGLEVEL_CRAP,
|
||||
IRCTXT_WHOIS, nick, user, host, realname);
|
||||
g_free(params);
|
||||
}
|
||||
|
||||
static void event_whois_special(IRC_SERVER_REC *server, const char *data)
|
||||
{
|
||||
char *params, *nick, *str;
|
||||
|
||||
g_return_if_fail(data != NULL);
|
||||
|
||||
params = event_get_params(data, 3, NULL, &nick, &str);
|
||||
printformat(server, nick, MSGLEVEL_CRAP,
|
||||
IRCTXT_WHOIS_SPECIAL, nick, str);
|
||||
g_free(params);
|
||||
}
|
||||
|
||||
static void event_whois_idle(IRC_SERVER_REC *server, const char *data)
|
||||
{
|
||||
char *params, *nick, *secstr, *signonstr, *rest, *timestr;
|
||||
long days, hours, mins, secs;
|
||||
time_t signon;
|
||||
|
||||
g_return_if_fail(data != NULL);
|
||||
|
||||
params = event_get_params(data, 5 | PARAM_FLAG_GETREST, NULL,
|
||||
&nick, &secstr, &signonstr, &rest);
|
||||
|
||||
secs = atol(secstr);
|
||||
signon = strstr(rest, "signon time") == NULL ? 0 :
|
||||
(time_t) atol(signonstr);
|
||||
|
||||
days = secs/3600/24;
|
||||
hours = (secs%(3600*24))/3600;
|
||||
mins = (secs%3600)/60;
|
||||
secs %= 60;
|
||||
|
||||
if (signon == 0)
|
||||
printformat(server, nick, MSGLEVEL_CRAP, IRCTXT_WHOIS_IDLE,
|
||||
nick, days, hours, mins, secs);
|
||||
else {
|
||||
timestr = my_asctime(signon);
|
||||
printformat(server, nick, MSGLEVEL_CRAP,
|
||||
IRCTXT_WHOIS_IDLE_SIGNON,
|
||||
nick, days, hours, mins, secs, timestr);
|
||||
g_free(timestr);
|
||||
}
|
||||
g_free(params);
|
||||
}
|
||||
|
||||
static void event_whois_server(IRC_SERVER_REC *server, const char *data)
|
||||
{
|
||||
char *params, *nick, *whoserver, *desc;
|
||||
|
||||
g_return_if_fail(data != NULL);
|
||||
|
||||
params = event_get_params(data, 4, NULL, &nick, &whoserver, &desc);
|
||||
printformat(server, nick, MSGLEVEL_CRAP,
|
||||
IRCTXT_WHOIS_SERVER, nick, whoserver, desc);
|
||||
g_free(params);
|
||||
}
|
||||
|
||||
static void event_whois_oper(IRC_SERVER_REC *server, const char *data)
|
||||
{
|
||||
char *params, *nick, *type;
|
||||
|
||||
g_return_if_fail(data != NULL);
|
||||
|
||||
params = event_get_params(data, 3, NULL, &nick, &type);
|
||||
/* type = "is an IRC Operator" */
|
||||
if (strlen(type) > 5) {
|
||||
type += 5;
|
||||
if (*type == ' ') type++;
|
||||
}
|
||||
if (*type == '\0') {
|
||||
/* shouldn't happen */
|
||||
type = "IRC Operator";
|
||||
}
|
||||
|
||||
printformat(server, nick, MSGLEVEL_CRAP,
|
||||
IRCTXT_WHOIS_OPER, nick, type);
|
||||
g_free(params);
|
||||
}
|
||||
|
||||
static void event_whois_modes(IRC_SERVER_REC *server, const char *data)
|
||||
{
|
||||
char *params, *nick, *modes;
|
||||
|
||||
g_return_if_fail(data != NULL);
|
||||
|
||||
params = event_get_params(data, 6, NULL, &nick,
|
||||
NULL, NULL, NULL, &modes);
|
||||
printformat(server, nick, MSGLEVEL_CRAP,
|
||||
IRCTXT_WHOIS_MODES, nick, modes);
|
||||
g_free(params);
|
||||
}
|
||||
|
||||
static void event_whois_realhost(IRC_SERVER_REC *server, const char *data)
|
||||
{
|
||||
char *params, *nick, *txt_real, *txt_hostname, *hostname;
|
||||
|
||||
g_return_if_fail(data != NULL);
|
||||
|
||||
/* <yournick> real hostname <nick> <hostname> */
|
||||
params = event_get_params(data, 5, NULL, &nick, &txt_real,
|
||||
&txt_hostname, &hostname);
|
||||
if (strcmp(txt_real, "real") != 0 ||
|
||||
strcmp(txt_hostname, "hostname") != 0) {
|
||||
/* <yournick> <nick> :... from <hostname> */
|
||||
g_free(params);
|
||||
params = event_get_params(data, 3, NULL, &nick, &hostname);
|
||||
|
||||
hostname = strstr(hostname, "from ");
|
||||
if (hostname != NULL) hostname += 5;
|
||||
}
|
||||
|
||||
if (hostname == NULL) {
|
||||
printformat(server, nick, MSGLEVEL_CRAP,
|
||||
IRCTXT_WHOIS_REALHOST, nick, hostname, "");
|
||||
} else {
|
||||
event_whois_special(server, data);
|
||||
}
|
||||
g_free(params);
|
||||
}
|
||||
|
||||
static void event_whois_usermode326(IRC_SERVER_REC *server, const char *data)
|
||||
{
|
||||
char *params, *nick, *usermode;
|
||||
|
||||
g_return_if_fail(data != NULL);
|
||||
|
||||
/* <yournick> <nick> :has oper privs: <mode> */
|
||||
params = event_get_params(data, 3, NULL, &nick, &usermode);
|
||||
printformat(server, nick, MSGLEVEL_CRAP,
|
||||
IRCTXT_WHOIS_USERMODE, nick, usermode);
|
||||
g_free(params);
|
||||
}
|
||||
|
||||
static void event_whois_realhost327(IRC_SERVER_REC *server, const char *data)
|
||||
{
|
||||
char *params, *nick, *hostname, *ip, *text;
|
||||
|
||||
g_return_if_fail(data != NULL);
|
||||
|
||||
/* <yournick> <hostname> <ip> :Real hostname/IP */
|
||||
params = event_get_params(data, 5, NULL, &nick, &hostname, &ip, &text);
|
||||
if (*text != '\0') {
|
||||
printformat(server, nick, MSGLEVEL_CRAP,
|
||||
IRCTXT_WHOIS_REALHOST, nick, hostname, ip);
|
||||
} else {
|
||||
event_whois_special(server, data);
|
||||
}
|
||||
g_free(params);
|
||||
}
|
||||
|
||||
static void event_whois_usermode(IRC_SERVER_REC *server, const char *data)
|
||||
{
|
||||
char *params, *txt_usermodes, *nick, *usermode;
|
||||
|
||||
g_return_if_fail(data != NULL);
|
||||
|
||||
params = event_get_params(data, 4, NULL, &txt_usermodes,
|
||||
&nick, &usermode);
|
||||
|
||||
if (strcmp(txt_usermodes, "usermodes") == 0) {
|
||||
/* <yournick> usermodes <nick> usermode */
|
||||
printformat(server, nick, MSGLEVEL_CRAP,
|
||||
IRCTXT_WHOIS_USERMODE, nick, usermode);
|
||||
} else {
|
||||
event_whois_special(server, data);
|
||||
}
|
||||
g_free(params);
|
||||
}
|
||||
|
||||
static void hide_safe_channel_id(IRC_SERVER_REC *server, char *chans)
|
||||
{
|
||||
const char *idchan;
|
||||
char *p, *dest, *end, id;
|
||||
int count, length;
|
||||
|
||||
if (!server->isupport_sent)
|
||||
idchan = "!:5";
|
||||
else {
|
||||
idchan = g_hash_table_lookup(server->isupport, "IDCHAN");
|
||||
if (idchan == NULL)
|
||||
return;
|
||||
}
|
||||
|
||||
while (*idchan != '\0') {
|
||||
id = *idchan;
|
||||
if (idchan[1] != ':')
|
||||
return;
|
||||
|
||||
length = strtoul(idchan+2, &end, 10);
|
||||
if (*end == ',')
|
||||
end++;
|
||||
else if (*end != '\0')
|
||||
return;
|
||||
idchan = end;
|
||||
|
||||
count = 0;
|
||||
for (dest = p = chans; *p != '\0'; p++) {
|
||||
if (count > 0)
|
||||
count--;
|
||||
else {
|
||||
if (*p == id)
|
||||
count = length;
|
||||
*dest++ = *p;
|
||||
}
|
||||
}
|
||||
*dest = '\0';
|
||||
}
|
||||
}
|
||||
|
||||
static void event_whois_channels(IRC_SERVER_REC *server, const char *data)
|
||||
{
|
||||
char *params, *nick, *chans;
|
||||
|
||||
g_return_if_fail(data != NULL);
|
||||
|
||||
params = event_get_params(data, 3, NULL, &nick, &chans);
|
||||
|
||||
/* sure - we COULD print the channel names as-is, but since the
|
||||
colors, bolds, etc. are mostly just to fool people, I think we
|
||||
should show the channel names as they REALLY are so they could
|
||||
even be joined without any extra tricks. */
|
||||
chans = show_lowascii(chans);
|
||||
if (settings_get_bool("whois_hide_safe_channel_id"))
|
||||
hide_safe_channel_id(server, chans);
|
||||
printformat(server, nick, MSGLEVEL_CRAP,
|
||||
IRCTXT_WHOIS_CHANNELS, nick, chans);
|
||||
g_free(chans);
|
||||
|
||||
g_free(params);
|
||||
}
|
||||
|
||||
static void event_whois_away(IRC_SERVER_REC *server, const char *data)
|
||||
{
|
||||
char *params, *nick, *awaymsg;
|
||||
|
||||
g_return_if_fail(data != NULL);
|
||||
|
||||
params = event_get_params(data, 3, NULL, &nick, &awaymsg);
|
||||
printformat(server, nick, MSGLEVEL_CRAP,
|
||||
IRCTXT_WHOIS_AWAY, nick, awaymsg);
|
||||
g_free(params);
|
||||
}
|
||||
|
||||
static void event_end_of_whois(IRC_SERVER_REC *server, const char *data)
|
||||
{
|
||||
char *params, *nick;
|
||||
|
||||
g_return_if_fail(data != NULL);
|
||||
|
||||
params = event_get_params(data, 2, NULL, &nick);
|
||||
if (server->whois_found) {
|
||||
printformat(server, nick, MSGLEVEL_CRAP,
|
||||
IRCTXT_END_OF_WHOIS, nick);
|
||||
}
|
||||
g_free(params);
|
||||
}
|
||||
|
||||
static void event_whois_auth(IRC_SERVER_REC *server, const char *data)
|
||||
{
|
||||
char *params, *nick, *text;
|
||||
|
||||
g_return_if_fail(data != NULL);
|
||||
|
||||
params = event_get_params(data, 3, NULL, &nick, &text);
|
||||
printformat(server, nick, MSGLEVEL_CRAP,
|
||||
IRCTXT_WHOIS_EXTRA, nick, text);
|
||||
g_free(params);
|
||||
}
|
||||
|
||||
static void event_whowas(IRC_SERVER_REC *server, const char *data)
|
||||
{
|
||||
char *params, *nick, *user, *host, *realname;
|
||||
|
||||
g_return_if_fail(data != NULL);
|
||||
|
||||
params = event_get_params(data, 6, NULL, &nick, &user,
|
||||
&host, NULL, &realname);
|
||||
printformat(server, nick, MSGLEVEL_CRAP,
|
||||
IRCTXT_WHOWAS, nick, user, host, realname);
|
||||
g_free(params);
|
||||
}
|
||||
|
||||
static void event_end_of_whowas(IRC_SERVER_REC *server, const char *data)
|
||||
{
|
||||
char *params, *nick;
|
||||
|
||||
g_return_if_fail(data != NULL);
|
||||
|
||||
params = event_get_params(data, 2, NULL, &nick);
|
||||
if (server->whowas_found) {
|
||||
printformat(server, nick, MSGLEVEL_CRAP,
|
||||
IRCTXT_END_OF_WHOWAS, nick);
|
||||
}
|
||||
g_free(params);
|
||||
}
|
||||
|
||||
struct whois_event_table {
|
||||
int num;
|
||||
void (*func)(IRC_SERVER_REC *, const char *);
|
||||
};
|
||||
|
||||
static struct whois_event_table events[] = {
|
||||
{ 312, event_whois_server },
|
||||
{ 313, event_whois_oper },
|
||||
{ 326, event_whois_usermode326 },
|
||||
{ 327, event_whois_realhost327 },
|
||||
{ 379, event_whois_modes },
|
||||
{ 378, event_whois_realhost },
|
||||
{ 377, event_whois_usermode },
|
||||
{ 317, event_whois_idle },
|
||||
{ 330, event_whois_auth },
|
||||
{ 319, event_whois_channels },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static void event_whois_default(IRC_SERVER_REC *server, const char *data)
|
||||
{
|
||||
int i, num;
|
||||
|
||||
num = atoi(current_server_event);
|
||||
for (i = 0; events[i].num != 0; i++) {
|
||||
if (events[i].num == num) {
|
||||
events[i].func(server, data);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
event_whois_special(server, data);
|
||||
}
|
||||
|
||||
void fe_whois_init(void)
|
||||
{
|
||||
settings_add_bool("lookandfeel", "whois_hide_safe_channel_id", TRUE);
|
||||
|
||||
signal_add("event 311", (SIGNAL_FUNC) event_whois);
|
||||
signal_add("whois away", (SIGNAL_FUNC) event_whois_away);
|
||||
signal_add("whowas away", (SIGNAL_FUNC) event_whois_away);
|
||||
signal_add("whois default event", (SIGNAL_FUNC) event_whois_default);
|
||||
signal_add("event 318", (SIGNAL_FUNC) event_end_of_whois);
|
||||
signal_add("event 314", (SIGNAL_FUNC) event_whowas);
|
||||
signal_add("event 369", (SIGNAL_FUNC) event_end_of_whowas);
|
||||
}
|
||||
|
||||
void fe_whois_deinit(void)
|
||||
{
|
||||
signal_remove("event 311", (SIGNAL_FUNC) event_whois);
|
||||
signal_remove("whois away", (SIGNAL_FUNC) event_whois_away);
|
||||
signal_remove("whowas away", (SIGNAL_FUNC) event_whois_away);
|
||||
signal_remove("whois default event", (SIGNAL_FUNC) event_whois_default);
|
||||
signal_remove("event 318", (SIGNAL_FUNC) event_end_of_whois);
|
||||
signal_remove("event 314", (SIGNAL_FUNC) event_whowas);
|
||||
signal_remove("event 369", (SIGNAL_FUNC) event_end_of_whowas);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue