PsychoticNinja/irssi
1
0
Fork 1
mirror of https://github.com/irssi/irssi.git synced 2025-04-25 20:41:23 -05:00
Code Issues Projects Releases Wiki Activity

dis bugfix be bussin frfr no cap

Browse Source
This commit is contained in:
MarioMario456 2024-08-31 10:11:48 -04:00
parent 0697e3eaf1
commit 7be3db4466
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/irc/core/irc-servers.c
View File

@ -313,9 +313,9 @@ static void server_init_1(IRC_SERVER_REC *server)
if (!conn->no_cap) { if (!conn->no_cap) {
signal_emit("server waiting cap ls", 2, server, CAP_LS_VERSION); signal_emit("server waiting cap ls", 2, server, CAP_LS_VERSION);
irc_send_cmd_now(server, "CAP LS " CAP_LS_VERSION); irc_send_cmd_now(server, "CAP LS " CAP_LS_VERSION);
/* to detect non-CAP servers, send this bogus join */
/* the : will make INSPIRCD respond with 451 instead of 461, too */ if (!server->cap_supported)
irc_send_cmd_now(server, "JOIN :"); conn->no_cap = 1;
} }
if (conn->starttls) if (conn->starttls)
irc_server_send_starttls(server); irc_server_send_starttls(server);
@ -398,20 +398,6 @@ static void event_starttls(IRC_SERVER_REC *server, const char *data)
} }
} }
static void event_registerfirst(IRC_SERVER_REC *server, const char *data)
{
g_return_if_fail(server != NULL);
if (!IS_IRC_SERVER(server))
return;
if (server->connected)
return;
if (!server->cap_supported && !server->connrec->starttls)
server_init_2(server);
}
static void event_capend(IRC_SERVER_REC *server) static void event_capend(IRC_SERVER_REC *server)
{ {
g_return_if_fail(server != NULL); g_return_if_fail(server != NULL);
@ -1236,7 +1222,6 @@ void irc_servers_init(void)
signal_add_last("server destroyed", (SIGNAL_FUNC) sig_destroyed); signal_add_last("server destroyed", (SIGNAL_FUNC) sig_destroyed);
signal_add_last("server quit", (SIGNAL_FUNC) sig_server_quit); signal_add_last("server quit", (SIGNAL_FUNC) sig_server_quit);
signal_add("event 670", (SIGNAL_FUNC) event_starttls); signal_add("event 670", (SIGNAL_FUNC) event_starttls);
signal_add("event 451", (SIGNAL_FUNC) event_registerfirst);
signal_add("server cap end", (SIGNAL_FUNC) event_capend); signal_add("server cap end", (SIGNAL_FUNC) event_capend);
signal_add("event 001", (SIGNAL_FUNC) event_connected); signal_add("event 001", (SIGNAL_FUNC) event_connected);
signal_add("event 004", (SIGNAL_FUNC) event_server_info); signal_add("event 004", (SIGNAL_FUNC) event_server_info);
@ -1267,7 +1252,6 @@ void irc_servers_deinit(void)
signal_remove("server destroyed", (SIGNAL_FUNC) sig_destroyed); signal_remove("server destroyed", (SIGNAL_FUNC) sig_destroyed);
signal_remove("server quit", (SIGNAL_FUNC) sig_server_quit); signal_remove("server quit", (SIGNAL_FUNC) sig_server_quit);
signal_remove("event 670", (SIGNAL_FUNC) event_starttls); signal_remove("event 670", (SIGNAL_FUNC) event_starttls);
signal_remove("event 451", (SIGNAL_FUNC) event_registerfirst);
signal_remove("server cap end", (SIGNAL_FUNC) event_capend); signal_remove("server cap end", (SIGNAL_FUNC) event_capend);
signal_remove("event 001", (SIGNAL_FUNC) event_connected); signal_remove("event 001", (SIGNAL_FUNC) event_connected);
signal_remove("event 004", (SIGNAL_FUNC) event_server_info); signal_remove("event 004", (SIGNAL_FUNC) event_server_info);