RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-20 17:35:07 +00:00
Code Issues Activity Actions

IRCClient: Don't auto-open new queries for NOTICE or CTCP messages

Browse source 
This seems to match what other IRC clients do, and it means we don't
get three separate "server" windows when connecting to Freenode. :^)
This commit is contained in:
Andreas Kling 2019-09-03 21:47:43 +02:00
parent 5c7ef5977d
commit 9cb4e5ac81
2 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Applications/IRCClient/IRCClient.cpp
View file

@ -281,9 +281,9 @@ void IRCClient::handle(const Message& msg)
add_server_message(String::format("[%s] %s", msg.command.characters(), msg.arguments[1].characters()));
}
void IRCClient::add_server_message(const String& text)
void IRCClient::add_server_message(const String& text, Color color)
{
m_log->add_message(0, "", text);
m_log->add_message(0, "", text, color);
m_server_subwindow->did_add_message();
}
@ -393,8 +393,25 @@ void IRCClient::handle_privmsg_or_notice(const Message& msg, PrivmsgOrNotice typ
return;
}
}
auto& query = ensure_query(sender_nick);
query.add_message(sender_prefix, sender_nick, message_text, message_color);
// For NOTICE or CTCP messages, only put them in query if one already exists.
// Otherwise, put them in the server window. This seems to match other clients.
IRCQuery* query = nullptr;
if (is_ctcp || type == PrivmsgOrNotice::Notice) {
query = query_with_name(sender_nick);
} else {
query = &ensure_query(sender_nick);
}
if (query)
query->add_message(sender_prefix, sender_nick, message_text, message_color);
else {
add_server_message(String::format("<%s> %s", sender_nick.characters(), message_text.characters()), message_color);
}
}
IRCQuery* IRCClient::query_with_name(const String& name)
{
return m_queries.get(name).value_or(nullptr);
}
IRCQuery& IRCClient::ensure_query(const String& name)