Support raw IRC messages
Messages received on an IRC server JID are forwarded as raw IRC messages. fix #2486
This commit is contained in:
@@ -273,6 +273,17 @@ void Bridge::send_private_message(const Iid& iid, const std::string& body, const
|
||||
}
|
||||
}
|
||||
|
||||
void Bridge::send_raw_message(const std::string& hostname, const std::string& body)
|
||||
{
|
||||
IrcClient* irc = this->get_irc_client(hostname);
|
||||
if (!irc)
|
||||
{
|
||||
log_warning("Cannot send message: no client exist for server " << hostname);
|
||||
return ;
|
||||
}
|
||||
irc->send_raw(body);
|
||||
}
|
||||
|
||||
void Bridge::leave_irc_channel(Iid&& iid, std::string&& status_message)
|
||||
{
|
||||
IrcClient* irc = this->get_irc_client(iid.get_server());
|
||||
|
||||
@@ -61,6 +61,7 @@ public:
|
||||
bool join_irc_channel(const Iid& iid, const std::string& username, const std::string& password);
|
||||
void send_channel_message(const Iid& iid, const std::string& body);
|
||||
void send_private_message(const Iid& iid, const std::string& body, const std::string& type="PRIVMSG");
|
||||
void send_raw_message(const std::string& hostname, const std::string& body);
|
||||
void leave_irc_channel(Iid&& iid, std::string&& status_message);
|
||||
void send_irc_nick_change(const Iid& iid, const std::string& new_nick);
|
||||
void send_irc_kick(const Iid& iid, const std::string& target, const std::string& reason,
|
||||
|
||||
@@ -181,6 +181,11 @@ void IrcClient::send_message(IrcMessage&& message)
|
||||
this->send_data(std::move(res));
|
||||
}
|
||||
|
||||
void IrcClient::send_raw(const std::string& txt)
|
||||
{
|
||||
this->send_data(txt + "\r\n");
|
||||
}
|
||||
|
||||
void IrcClient::send_user_command(const std::string& username, const std::string& realname)
|
||||
{
|
||||
this->send_message(IrcMessage("USER", {username, "ignored", "ignored", realname}));
|
||||
|
||||
@@ -66,6 +66,7 @@ public:
|
||||
* for send events to be ready)
|
||||
*/
|
||||
void send_message(IrcMessage&& message);
|
||||
void send_raw(const std::string& txt);
|
||||
/**
|
||||
* Send the PONG irc command
|
||||
*/
|
||||
|
||||
@@ -211,6 +211,11 @@ void BiboumiComponent::handle_message(const Stanza& stanza)
|
||||
bridge->send_private_message(user_iid, body->get_inner());
|
||||
bridge->set_preferred_from_jid(user_iid.get_local(), to_str);
|
||||
}
|
||||
else if (!iid.is_user && !iid.is_channel)
|
||||
{ // Message sent to the server JID
|
||||
// Convert the message body into a raw IRC message
|
||||
bridge->send_raw_message(iid.get_server(), body->get_inner());
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (iid.is_user)
|
||||
|
||||
Reference in New Issue
Block a user