diff options
author | louiz <louiz@louiz.org> | 2017-07-16 01:13:04 +0200 |
---|---|---|
committer | louiz <louiz@louiz.org> | 2017-07-16 01:13:04 +0200 |
commit | 9131e63b74412ca75a26de27a308a1843984a43f (patch) | |
tree | 15fc0c2cd67651a0bf938cdd787e50e793cf946e /src/bridge | |
parent | b2334707107e65dd15590b7472c990bbf79549eb (diff) | |
parent | 88770979c3a46f3dde76fa2756e3e07ff79c3e12 (diff) | |
download | biboumi-9131e63b74412ca75a26de27a308a1843984a43f.tar.gz biboumi-9131e63b74412ca75a26de27a308a1843984a43f.tar.bz2 biboumi-9131e63b74412ca75a26de27a308a1843984a43f.tar.xz biboumi-9131e63b74412ca75a26de27a308a1843984a43f.zip |
Merge branch 'biboumi_jid_in_users_rosters' into 'master'
Use a db roster to manage biboumi’s presence with the contacts
Closes #3217
See merge request !13
Diffstat (limited to 'src/bridge')
-rw-r--r-- | src/bridge/bridge.cpp | 10 | ||||
-rw-r--r-- | src/bridge/bridge.hpp | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/bridge/bridge.cpp b/src/bridge/bridge.cpp index 27726e4..33006c3 100644 --- a/src/bridge/bridge.cpp +++ b/src/bridge/bridge.cpp @@ -1081,6 +1081,16 @@ void Bridge::send_xmpp_invitation(const Iid& iid, const std::string& author) this->xmpp.send_invitation(std::to_string(iid), this->user_jid + "/" + resource, author); } +void Bridge::on_irc_client_connected(const std::string& hostname) +{ + this->xmpp.on_irc_client_connected(hostname, this->user_jid); +} + +void Bridge::on_irc_client_disconnected(const std::string& hostname) +{ + this->xmpp.on_irc_client_disconnected(hostname, this->user_jid); +} + void Bridge::set_preferred_from_jid(const std::string& nick, const std::string& full_jid) { auto it = this->preferred_user_from.find(nick); diff --git a/src/bridge/bridge.hpp b/src/bridge/bridge.hpp index 496b439..c10631b 100644 --- a/src/bridge/bridge.hpp +++ b/src/bridge/bridge.hpp @@ -201,6 +201,8 @@ public: void send_xmpp_ping_request(const std::string& nick, const std::string& hostname, const std::string& id); void send_xmpp_invitation(const Iid& iid, const std::string& author); + void on_irc_client_connected(const std::string& hostname); + void on_irc_client_disconnected(const std::string& hostname); /** * Misc @@ -301,8 +303,8 @@ private: using ChannelKey = std::tuple<ChannelName, IrcHostname>; public: std::map<ChannelKey, std::set<Resource>> resources_in_chan; -private: std::map<IrcHostname, std::set<Resource>> resources_in_server; +private: /** * Manage which resource is in which channel */ |