RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-02 22:42:08 +00:00
Code Issues Activity Actions

IRCClient: Refactor window creation responsibilities.

Browse source 
IRCChannel and IRCQuery objects now create their own windows with the
help of an aid_create_window callback provided by IRCAppWindow.

There's still a bit of murk but this is already an improvement.
This commit is contained in:
Andreas Kling 2019-03-16 01:45:49 +01:00
parent fc7f700c20
commit 1394677528
10 changed files with 40 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Applications/IRCClient/IRCClient.cpp
View file

@ -306,15 +306,11 @@ void IRCClient::handle_privmsg(const Message& msg)
auto it = m_channels.find(target);
if (it != m_channels.end()) {
(*it).value->add_message(sender_prefix, sender_nick, msg.arguments[1]);
if (on_channel_message)
on_channel_message(target);
return;
}
}
auto& query = ensure_query(sender_nick);
query.add_message(sender_prefix, sender_nick, msg.arguments[1]);
if (on_query_message)
on_query_message(sender_nick);
}
IRCQuery& IRCClient::ensure_query(const String& name)
@ -353,8 +349,6 @@ void IRCClient::handle_join(const Message& msg)
return;
auto& channel_name = msg.arguments[0];
ensure_channel(channel_name);
if (on_join)
on_join(channel_name);
}
void IRCClient::handle_namreply(const Message& msg)
@ -389,13 +383,6 @@ void IRCClient::register_subwindow(IRCWindow& subwindow)
if (subwindow.type() == IRCWindow::Server) {
m_server_subwindow = &subwindow;
subwindow.set_log_buffer(*m_log);
} else if (subwindow.type() == IRCWindow::Channel) {
auto it = m_channels.find(subwindow.name());
ASSERT(it != m_channels.end());
auto& channel = *(*it).value;
subwindow.set_log_buffer(channel.log());
} else if (subwindow.type() == IRCWindow::Query) {
subwindow.set_log_buffer(ensure_query(subwindow.name()).log());
}
m_windows.append(&subwindow);
m_client_window_list_model->update();