diff options
Diffstat (limited to 'src/bridge/bridge.hpp')
| -rw-r--r-- | src/bridge/bridge.hpp | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/src/bridge/bridge.hpp b/src/bridge/bridge.hpp index fa2a31f..a7aef3d 100644 --- a/src/bridge/bridge.hpp +++ b/src/bridge/bridge.hpp @@ -72,16 +72,14 @@ public: **/ /** - * Try to join an irc_channel, does nothing and return true if the channel - * was already joined. + * Try to join an irc_channel. */ bool join_irc_channel(const Iid& iid, std::string nickname, const std::string& password, const std::string& resource, - HistoryLimit history_limit, - const bool force_join); + HistoryLimit history_limit); - void send_channel_message(const Iid& iid, const std::string& body, std::string id); + void send_channel_message(const Iid& iid, const std::string& body, std::string id, std::vector<XmlNode> nodes_to_reflect); 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, const std::string& status_message, const std::string& resource); @@ -219,19 +217,6 @@ public: */ size_t active_clients() const; /** - * Add (or replace the existing) <nick, jid> into the preferred_user_from map - */ - void set_preferred_from_jid(const std::string& nick, const std::string& full_jid); - /** - * Remove the preferred jid for the given IRC nick - */ - void remove_preferred_from_jid(const std::string& nick); - /** - * Given a channel_name, remove all preferred from_jid that come - * from this chan. - */ - void remove_all_preferred_from_jid_of_room(const std::string& channel_name); - /** * Add a callback to the waiting list of irc callbacks. */ void add_waiting_irc(irc_responder_callback_t&& callback); @@ -286,14 +271,6 @@ private: */ std::shared_ptr<Poller> poller; /** - * A map of <nick, full_jid>. For example if this map contains <"toto", - * "#somechan%server@biboumi/ToTo">, whenever a private message is - * received from the user "toto", instead of forwarding it to XMPP with - * from='toto!server@biboumi', we use instead - * from='#somechan%server@biboumi/ToTo' - */ - std::unordered_map<std::string, std::string> preferred_user_from; - /** * A list of callbacks that are waiting for some IrcMessage to trigger a * response. We add callbacks in this list whenever we received an IQ * request and we need a response from IRC to be able to provide the |