summaryrefslogtreecommitdiff
path: root/src/bridge
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2013-12-08 20:14:12 +0100
committerFlorent Le Coz <louiz@louiz.org>2013-12-08 20:14:12 +0100
commitb11126a19dbaadf4c32fb8dbec22754ad0712c26 (patch)
tree140a9c33a264adfb4eee7a0e2add0b6c5ec1671c /src/bridge
parentcb718def0cb51aac4c2125e3864522740fcb2573 (diff)
downloadbiboumi-b11126a19dbaadf4c32fb8dbec22754ad0712c26.tar.gz
biboumi-b11126a19dbaadf4c32fb8dbec22754ad0712c26.tar.bz2
biboumi-b11126a19dbaadf4c32fb8dbec22754ad0712c26.tar.xz
biboumi-b11126a19dbaadf4c32fb8dbec22754ad0712c26.zip
Provide a JID for IRC users, and add a stringprep dependency for this
Diffstat (limited to 'src/bridge')
-rw-r--r--src/bridge/bridge.cpp6
-rw-r--r--src/bridge/bridge.hpp5
2 files changed, 8 insertions, 3 deletions
diff --git a/src/bridge/bridge.cpp b/src/bridge/bridge.cpp
index 2ad6af8..973e095 100644
--- a/src/bridge/bridge.cpp
+++ b/src/bridge/bridge.cpp
@@ -167,9 +167,11 @@ void Bridge::send_xmpp_message(const std::string& from, const std::string& autho
this->xmpp->send_message(from, this->make_xmpp_body(body), this->user_jid);
}
-void Bridge::send_user_join(const std::string& hostname, const std::string& chan_name, const std::string nick)
+void Bridge::send_user_join(const std::string& hostname,
+ const std::string& chan_name,
+ const IrcUser* user)
{
- this->xmpp->send_user_join(chan_name + "%" + hostname, nick, this->user_jid);
+ this->xmpp->send_user_join(chan_name + "%" + hostname, user->nick, user->host, this->user_jid);
}
void Bridge::send_self_join(const std::string& hostname, const std::string& chan_name, const std::string nick)
diff --git a/src/bridge/bridge.hpp b/src/bridge/bridge.hpp
index 1443191..bbbca95 100644
--- a/src/bridge/bridge.hpp
+++ b/src/bridge/bridge.hpp
@@ -3,6 +3,7 @@
#include <irc/irc_client.hpp>
#include <bridge/colors.hpp>
+#include <irc/irc_user.hpp>
#include <irc/iid.hpp>
#include <unordered_map>
@@ -56,7 +57,9 @@ public:
/**
* Send the presence of a new user in the MUC.
*/
- void send_user_join(const std::string& hostname, const std::string& chan_name, const std::string nick);
+ void send_user_join(const std::string& hostname,
+ const std::string& chan_name,
+ const IrcUser* user);
/**
* Send the self presence of an user when the MUC is fully joined.
*/