aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2025-02-02 15:08:01 -05:00
Code

Don't show "End of WHOWAS" if none of the nicks were found.

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@344 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-06-14 19:40:23 +00:00 committed by cras
parent 6140ab3704
commit 6b811b1c2c
2 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fe-common/irc/fe-events-numeric.c
View File

@ -502,7 +502,7 @@ static void event_end_of_whowas(const char *data, IRC_SERVER_REC *server)
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
params = event_get_params(data, 2, NULL, &nick); params = event_get_params(data, 2, NULL, &nick);
printformat(server, NULL, MSGLEVEL_CRAP, IRCTXT_END_OF_WHOWAS, nick); if (server->whowas_found) printformat(server, NULL, MSGLEVEL_CRAP, IRCTXT_END_OF_WHOWAS, nick);
g_free(params); g_free(params);
} }

54
src/irc/core/irc-commands.c
View File

@ -452,10 +452,29 @@ static void cmd_names(const char *data, IRC_SERVER_REC *server, WI_IRC_REC *item
irc_send_cmdv(server, "NAMES %s", data); irc_send_cmdv(server, "NAMES %s", data);
} }
static char *get_redirect_nicklist(const char *nicks, int *free)
{
char *str, *ret;
if (strchr(nicks, ',') == NULL) {
*free = FALSE;
return (char *) nicks;
}
*free = TRUE;
str = g_strdup(nicks);
g_strdelimit(str, ",", ' ');
ret = g_strconcat(str, " ", nicks, NULL);
g_free(str);
return ret;
}
static void cmd_whois(const char *data, IRC_SERVER_REC *server) static void cmd_whois(const char *data, IRC_SERVER_REC *server)
{ {
char *params, *qserver, *query, *nicks; char *params, *qserver, *query;
int one_nick; int free_nick;
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
if (server == NULL || !server->connected || !irc_server_check(server)) if (server == NULL || !server->connected || !irc_server_check(server))
@ -467,31 +486,25 @@ static void cmd_whois(const char *data, IRC_SERVER_REC *server)
params = cmd_get_params(data, 1, &query); params = cmd_get_params(data, 1, &query);
qserver = ""; qserver = "";
} }
if (*query == '\0') query = server->nick; if (*query == '\0') query = server->nick;
if (*qserver == '\0') if (*qserver == '\0')
g_string_sprintf(tmpstr, "WHOIS %s", query); g_string_sprintf(tmpstr, "WHOIS %s", query);
else else
g_string_sprintf(tmpstr, "WHOIS %s %s", qserver, query); g_string_sprintf(tmpstr, "WHOIS %s %s", qserver, query);
server->whois_found = FALSE;
irc_send_cmd_split(server, tmpstr->str, 2, server->max_whois_in_cmd); irc_send_cmd_split(server, tmpstr->str, 2, server->max_whois_in_cmd);
/* do automatic /WHOWAS if any of the nicks wasn't found */ /* do automatic /WHOWAS if any of the nicks wasn't found */
one_nick = strchr(query, ',') == NULL; query = get_redirect_nicklist(query, &free_nick);
if (!one_nick) {
nicks = g_strdup(query);
g_strdelimit(query, ",", ' ');
query = g_strconcat(nicks, " ", query, NULL);
g_free(nicks);
}
server->whois_found = FALSE;
server_redirect_event((SERVER_REC *) server, query, 2, server_redirect_event((SERVER_REC *) server, query, 2,
"event 318", "event 318", 1, "event 318", "event 318", 1,
"event 402", "event 402", -1, "event 402", "event 402", -1,
"event 311", "whois event", 1, "event 311", "whois event", 1,
"event 401", "whois not found", 1, NULL); "event 401", "whois not found", 1, NULL);
if (!one_nick) g_free(query); if (free_nick) g_free(query);
g_free(params); g_free(params);
} }
@ -526,15 +539,26 @@ static void event_whowas(const char *data, IRC_SERVER_REC *server, const char *n
static void cmd_whowas(const char *data, IRC_SERVER_REC *server) static void cmd_whowas(const char *data, IRC_SERVER_REC *server)
{ {
char *params, *nicks, *count;
int free_nick;
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
if (server == NULL || !server->connected || !irc_server_check(server)) if (server == NULL || !server->connected || !irc_server_check(server))
cmd_return_error(CMDERR_NOT_CONNECTED); cmd_return_error(CMDERR_NOT_CONNECTED);
while (*data == ' ') data++; params = cmd_get_params(data, 2, &nicks, &count);
if (*data == '\0') data = server->nick; if (*nicks == '\0') nicks = server->nick;
irc_send_cmdv(server, "WHOWAS %s", data);
server->whowas_found = FALSE; server->whowas_found = FALSE;
irc_send_cmdv(server, *count == '\0' ? "WHOWAS %s" :
"WHOWAS %s %s", nicks, count);
nicks = get_redirect_nicklist(nicks, &free_nick);
server_redirect_event((SERVER_REC *) server, nicks, 1,
"event 369", "event 369", 1,
"event 314", "whowas event", 1, NULL);
if (free_nick) g_free(nicks);
g_free(params);
} }
static void cmd_ping(const char *data, IRC_SERVER_REC *server, WI_IRC_REC *item) static void cmd_ping(const char *data, IRC_SERVER_REC *server, WI_IRC_REC *item)