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

IRCClient: Use NonnullRefPtr<IRCClient> throughout

Browse source 
To protect against mishaps during app exit teardown, make sure everyone
who needs to be is a co-owner of the IRCClient object.

Fixes #3451.
This commit is contained in:
Andreas Kling 2020-09-10 18:42:26 +02:00
parent 039e529dbe
commit 4e0df06f86
6 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Applications/IRCClient/IRCQuery.cpp
View file

@ -33,7 +33,7 @@ IRCQuery::IRCQuery(IRCClient& client, const String& name)
, m_name(name) , m_name(name)
, m_log(IRCLogBuffer::create()) , m_log(IRCLogBuffer::create())
{ {
m_window = m_client.aid_create_window(this, IRCWindow::Query, m_name); m_window = m_client->aid_create_window(this, IRCWindow::Query, m_name);
m_window->set_log_buffer(*m_log); m_window->set_log_buffer(*m_log);
} }
@ -66,6 +66,6 @@ void IRCQuery::add_message(const String& text, Color color)
void IRCQuery::say(const String& text) void IRCQuery::say(const String& text)
{ {
m_client.send_privmsg(m_name, text); m_client->send_privmsg(m_name, text);
add_message(' ', m_client.nickname(), text); add_message(' ', m_client->nickname(), text);
} }

2
Applications/IRCClient/IRCQuery.h
View file

@ -58,7 +58,7 @@ public:
private: private:
IRCQuery(IRCClient&, const String& name); IRCQuery(IRCClient&, const String& name);
IRCClient& m_client; NonnullRefPtr<IRCClient> m_client;
String m_name; String m_name;
RefPtr<IRCWindow> m_window; RefPtr<IRCWindow> m_window;

52
Applications/IRCClient/IRCWindow.cpp
View file

@ -68,7 +68,7 @@ IRCWindow::IRCWindow(IRCClient& client, void* owner, Type type, const String& na
auto nick = channel().member_model()->nick_at(member_view.selection().first()); auto nick = channel().member_model()->nick_at(member_view.selection().first());
if (nick.is_empty()) if (nick.is_empty())
return; return;
m_client.handle_open_query_action(m_client.nick_without_prefix(nick.characters())); m_client->handle_open_query_action(m_client->nick_without_prefix(nick.characters()));
}; };
member_view.on_context_menu_request = [&](const GUI::ModelIndex& index, const GUI::ContextMenuEvent& event) { member_view.on_context_menu_request = [&](const GUI::ModelIndex& index, const GUI::ContextMenuEvent& event) {
if (!index.is_valid()) if (!index.is_valid())
@ -80,14 +80,14 @@ IRCWindow::IRCWindow(IRCClient& client, void* owner, Type type, const String& na
auto nick = channel().member_model()->nick_at(member_view.selection().first()); auto nick = channel().member_model()->nick_at(member_view.selection().first());
if (nick.is_empty()) if (nick.is_empty())
return; return;
m_client.handle_open_query_action(m_client.nick_without_prefix(nick.characters())); m_client->handle_open_query_action(m_client->nick_without_prefix(nick.characters()));
})); }));
m_context_menu->add_action(GUI::Action::create("Whois", Gfx::Bitmap::load_from_file("/res/icons/16x16/irc-whois.png"), [&](const GUI::Action&) { m_context_menu->add_action(GUI::Action::create("Whois", Gfx::Bitmap::load_from_file("/res/icons/16x16/irc-whois.png"), [&](const GUI::Action&) {
auto nick = channel().member_model()->nick_at(member_view.selection().first()); auto nick = channel().member_model()->nick_at(member_view.selection().first());
if (nick.is_empty()) if (nick.is_empty())
return; return;
m_client.handle_whois_action(m_client.nick_without_prefix(nick.characters())); m_client->handle_whois_action(m_client->nick_without_prefix(nick.characters()));
})); }));
auto& context_control_menu = m_context_menu->add_submenu("Control"); auto& context_control_menu = m_context_menu->add_submenu("Control");
@ -96,42 +96,42 @@ IRCWindow::IRCWindow(IRCClient& client, void* owner, Type type, const String& na
auto nick = channel().member_model()->nick_at(member_view.selection().first()); auto nick = channel().member_model()->nick_at(member_view.selection().first());
if (nick.is_empty()) if (nick.is_empty())
return; return;
m_client.handle_voice_user_action(m_name.characters(), m_client.nick_without_prefix(nick.characters())); m_client->handle_voice_user_action(m_name.characters(), m_client->nick_without_prefix(nick.characters()));
})); }));
context_control_menu.add_action(GUI::Action::create("DeVoice", [&](const GUI::Action&) { context_control_menu.add_action(GUI::Action::create("DeVoice", [&](const GUI::Action&) {
auto nick = channel().member_model()->nick_at(member_view.selection().first()); auto nick = channel().member_model()->nick_at(member_view.selection().first());
if (nick.is_empty()) if (nick.is_empty())
return; return;
m_client.handle_devoice_user_action(m_name.characters(), m_client.nick_without_prefix(nick.characters())); m_client->handle_devoice_user_action(m_name.characters(), m_client->nick_without_prefix(nick.characters()));
})); }));
context_control_menu.add_action(GUI::Action::create("Hop", [&](const GUI::Action&) { context_control_menu.add_action(GUI::Action::create("Hop", [&](const GUI::Action&) {
auto nick = channel().member_model()->nick_at(member_view.selection().first()); auto nick = channel().member_model()->nick_at(member_view.selection().first());
if (nick.is_empty()) if (nick.is_empty())
return; return;
m_client.handle_hop_user_action(m_name.characters(), m_client.nick_without_prefix(nick.characters())); m_client->handle_hop_user_action(m_name.characters(), m_client->nick_without_prefix(nick.characters()));
})); }));
context_control_menu.add_action(GUI::Action::create("DeHop", [&](const GUI::Action&) { context_control_menu.add_action(GUI::Action::create("DeHop", [&](const GUI::Action&) {
auto nick = channel().member_model()->nick_at(member_view.selection().first()); auto nick = channel().member_model()->nick_at(member_view.selection().first());
if (nick.is_empty()) if (nick.is_empty())
return; return;
m_client.handle_dehop_user_action(m_name.characters(), m_client.nick_without_prefix(nick.characters())); m_client->handle_dehop_user_action(m_name.characters(), m_client->nick_without_prefix(nick.characters()));
})); }));
context_control_menu.add_action(GUI::Action::create("Op", [&](const GUI::Action&) { context_control_menu.add_action(GUI::Action::create("Op", [&](const GUI::Action&) {
auto nick = channel().member_model()->nick_at(member_view.selection().first()); auto nick = channel().member_model()->nick_at(member_view.selection().first());
if (nick.is_empty()) if (nick.is_empty())
return; return;
m_client.handle_op_user_action(m_name.characters(), m_client.nick_without_prefix(nick.characters())); m_client->handle_op_user_action(m_name.characters(), m_client->nick_without_prefix(nick.characters()));
})); }));
context_control_menu.add_action(GUI::Action::create("DeOp", [&](const GUI::Action&) { context_control_menu.add_action(GUI::Action::create("DeOp", [&](const GUI::Action&) {
auto nick = channel().member_model()->nick_at(member_view.selection().first()); auto nick = channel().member_model()->nick_at(member_view.selection().first());
if (nick.is_empty()) if (nick.is_empty())
return; return;
m_client.handle_deop_user_action(m_name.characters(), m_client.nick_without_prefix(nick.characters())); m_client->handle_deop_user_action(m_name.characters(), m_client->nick_without_prefix(nick.characters()));
})); }));
context_control_menu.add_separator(); context_control_menu.add_separator();
@ -144,7 +144,7 @@ IRCWindow::IRCWindow(IRCClient& client, void* owner, Type type, const String& na
nick = nick.substring(1, nick.length() - 1); nick = nick.substring(1, nick.length() - 1);
String value; String value;
if (GUI::InputBox::show(value, window(), "Enter reason:", "Reason") == GUI::InputBox::ExecOK) if (GUI::InputBox::show(value, window(), "Enter reason:", "Reason") == GUI::InputBox::ExecOK)
m_client.handle_kick_user_action(m_name.characters(), m_client.nick_without_prefix(nick.characters()), value); m_client->handle_kick_user_action(m_name.characters(), m_client->nick_without_prefix(nick.characters()), value);
})); }));
auto& context_ctcp_menu = m_context_menu->add_submenu("CTCP"); auto& context_ctcp_menu = m_context_menu->add_submenu("CTCP");
@ -153,35 +153,35 @@ IRCWindow::IRCWindow(IRCClient& client, void* owner, Type type, const String& na
auto nick = channel().member_model()->nick_at(member_view.selection().first()); auto nick = channel().member_model()->nick_at(member_view.selection().first());
if (nick.is_empty()) if (nick.is_empty())
return; return;
m_client.handle_ctcp_user_action(m_client.nick_without_prefix(nick.characters()), "USERINFO"); m_client->handle_ctcp_user_action(m_client->nick_without_prefix(nick.characters()), "USERINFO");
})); }));
context_ctcp_menu.add_action(GUI::Action::create("Finger", [&](const GUI::Action&) { context_ctcp_menu.add_action(GUI::Action::create("Finger", [&](const GUI::Action&) {
auto nick = channel().member_model()->nick_at(member_view.selection().first()); auto nick = channel().member_model()->nick_at(member_view.selection().first());
if (nick.is_empty()) if (nick.is_empty())
return; return;
m_client.handle_ctcp_user_action(m_client.nick_without_prefix(nick.characters()), "FINGER"); m_client->handle_ctcp_user_action(m_client->nick_without_prefix(nick.characters()), "FINGER");
})); }));
context_ctcp_menu.add_action(GUI::Action::create("Time", [&](const GUI::Action&) { context_ctcp_menu.add_action(GUI::Action::create("Time", [&](const GUI::Action&) {
auto nick = channel().member_model()->nick_at(member_view.selection().first()); auto nick = channel().member_model()->nick_at(member_view.selection().first());
if (nick.is_empty()) if (nick.is_empty())
return; return;
m_client.handle_ctcp_user_action(m_client.nick_without_prefix(nick.characters()), "TIME"); m_client->handle_ctcp_user_action(m_client->nick_without_prefix(nick.characters()), "TIME");
})); }));
context_ctcp_menu.add_action(GUI::Action::create("Version", [&](const GUI::Action&) { context_ctcp_menu.add_action(GUI::Action::create("Version", [&](const GUI::Action&) {
auto nick = channel().member_model()->nick_at(member_view.selection().first()); auto nick = channel().member_model()->nick_at(member_view.selection().first());
if (nick.is_empty()) if (nick.is_empty())
return; return;
m_client.handle_ctcp_user_action(m_client.nick_without_prefix(nick.characters()), "VERSION"); m_client->handle_ctcp_user_action(m_client->nick_without_prefix(nick.characters()), "VERSION");
})); }));
context_ctcp_menu.add_action(GUI::Action::create("Client info", [&](const GUI::Action&) { context_ctcp_menu.add_action(GUI::Action::create("Client info", [&](const GUI::Action&) {
auto nick = channel().member_model()->nick_at(member_view.selection().first()); auto nick = channel().member_model()->nick_at(member_view.selection().first());
if (nick.is_empty()) if (nick.is_empty())
return; return;
m_client.handle_ctcp_user_action(m_client.nick_without_prefix(nick.characters()), "CLIENTINFO"); m_client->handle_ctcp_user_action(m_client->nick_without_prefix(nick.characters()), "CLIENTINFO");
})); }));
m_context_menu->popup(event.screen_position()); m_context_menu->popup(event.screen_position());
@ -193,22 +193,22 @@ IRCWindow::IRCWindow(IRCClient& client, void* owner, Type type, const String& na
m_text_box->set_preferred_size(0, 19); m_text_box->set_preferred_size(0, 19);
m_text_box->on_return_pressed = [this] { m_text_box->on_return_pressed = [this] {
if (m_type == Channel) if (m_type == Channel)
m_client.handle_user_input_in_channel(m_name, m_text_box->text()); m_client->handle_user_input_in_channel(m_name, m_text_box->text());
else if (m_type == Query) else if (m_type == Query)
m_client.handle_user_input_in_query(m_name, m_text_box->text()); m_client->handle_user_input_in_query(m_name, m_text_box->text());
else if (m_type == Server) else if (m_type == Server)
m_client.handle_user_input_in_server(m_text_box->text()); m_client->handle_user_input_in_server(m_text_box->text());
m_text_box->add_current_text_to_history(); m_text_box->add_current_text_to_history();
m_text_box->clear(); m_text_box->clear();
}; };
m_text_box->set_history_enabled(true); m_text_box->set_history_enabled(true);
m_client.register_subwindow(*this); m_client->register_subwindow(*this);
} }
IRCWindow::~IRCWindow() IRCWindow::~IRCWindow()
{ {
m_client.unregister_subwindow(*this); m_client->unregister_subwindow(*this);
} }
void IRCWindow::set_log_buffer(const IRCLogBuffer& log_buffer) void IRCWindow::set_log_buffer(const IRCLogBuffer& log_buffer)
@ -219,7 +219,7 @@ void IRCWindow::set_log_buffer(const IRCLogBuffer& log_buffer)
bool IRCWindow::is_active() const bool IRCWindow::is_active() const
{ {
return m_client.current_window() == this; return m_client->current_window() == this;
} }
void IRCWindow::post_notification_if_needed(const String& name, const String& message) void IRCWindow::post_notification_if_needed(const String& name, const String& message)
@ -232,9 +232,9 @@ void IRCWindow::post_notification_if_needed(const String& name, const String& me
auto notification = GUI::Notification::construct(); auto notification = GUI::Notification::construct();
if (type() == Type::Channel) { if (type() == Type::Channel) {
if (!m_client.notify_on_mention()) if (!m_client->notify_on_mention())
return; return;
if (!message.contains(m_client.nickname())) if (!message.contains(m_client->nickname()))
return; return;
StringBuilder builder; StringBuilder builder;
@ -243,7 +243,7 @@ void IRCWindow::post_notification_if_needed(const String& name, const String& me
builder.append(m_name); builder.append(m_name);
notification->set_title(builder.to_string()); notification->set_title(builder.to_string());
} else { } else {
if (!m_client.notify_on_message()) if (!m_client->notify_on_message())
return; return;
notification->set_title(name); notification->set_title(name);
} }
@ -259,7 +259,7 @@ void IRCWindow::did_add_message(const String& name, const String& message)
if (!is_active()) { if (!is_active()) {
++m_unread_count; ++m_unread_count;
m_client.aid_update_window_list(); m_client->aid_update_window_list();
return; return;
} }
m_page_view->scroll_to_bottom(); m_page_view->scroll_to_bottom();
@ -270,7 +270,7 @@ void IRCWindow::clear_unread_count()
if (!m_unread_count) if (!m_unread_count)
return; return;
m_unread_count = 0; m_unread_count = 0;
m_client.aid_update_window_list(); m_client->aid_update_window_list();
} }
int IRCWindow::unread_count() const int IRCWindow::unread_count() const

2
Applications/IRCClient/IRCWindow.h
View file

@ -70,7 +70,7 @@ private:
void post_notification_if_needed(const String& name, const String& message); void post_notification_if_needed(const String& name, const String& message);
IRCClient& m_client; NonnullRefPtr<IRCClient> m_client;
void* m_owner { nullptr }; void* m_owner { nullptr };
Type m_type; Type m_type;
String m_name; String m_name;

6
Applications/IRCClient/IRCWindowListModel.cpp
View file

@ -39,7 +39,7 @@ IRCWindowListModel::~IRCWindowListModel()
int IRCWindowListModel::row_count(const GUI::ModelIndex&) const int IRCWindowListModel::row_count(const GUI::ModelIndex&) const
{ {
return m_client.window_count(); return m_client->window_count();
} }
int IRCWindowListModel::column_count(const GUI::ModelIndex&) const int IRCWindowListModel::column_count(const GUI::ModelIndex&) const
@ -63,7 +63,7 @@ GUI::Variant IRCWindowListModel::data(const GUI::ModelIndex& index, GUI::ModelRo
if (role == GUI::ModelRole::Display) { if (role == GUI::ModelRole::Display) {
switch (index.column()) { switch (index.column()) {
case Column::Name: { case Column::Name: {
auto& window = m_client.window_at(index.row()); auto& window = m_client->window_at(index.row());
if (window.unread_count()) if (window.unread_count())
return String::format("%s (%d)", window.name().characters(), window.unread_count()); return String::format("%s (%d)", window.name().characters(), window.unread_count());
return window.name(); return window.name();
@ -73,7 +73,7 @@ GUI::Variant IRCWindowListModel::data(const GUI::ModelIndex& index, GUI::ModelRo
if (role == GUI::ModelRole::ForegroundColor) { if (role == GUI::ModelRole::ForegroundColor) {
switch (index.column()) { switch (index.column()) {
case Column::Name: { case Column::Name: {
auto& window = m_client.window_at(index.row()); auto& window = m_client->window_at(index.row());
if (window.unread_count()) if (window.unread_count())
return Color(Color::Red); return Color(Color::Red);
if (!window.channel().is_open()) if (!window.channel().is_open())

2
Applications/IRCClient/IRCWindowListModel.h
View file

@ -50,5 +50,5 @@ public:
private: private:
explicit IRCWindowListModel(IRCClient&); explicit IRCWindowListModel(IRCClient&);
IRCClient& m_client; NonnullRefPtr<IRCClient> m_client;
}; };