diff options
author | louiz’ <louiz@louiz.org> | 2018-02-05 22:53:36 +0100 |
---|---|---|
committer | louiz’ <louiz@louiz.org> | 2018-02-05 22:53:36 +0100 |
commit | 56651cb5c29cc50ddf3c62c37167fa0b9389bfde (patch) | |
tree | ca652963cafeb02b0c6c7504b1cfbc27abdafe0b /src/bridge/bridge.hpp | |
parent | ad1e0f8d52189e18df2d5a39228e255798a9de70 (diff) | |
parent | e0d1a0b44add408504e428d6ce4a8a2121ea7a00 (diff) | |
download | biboumi-56651cb5c29cc50ddf3c62c37167fa0b9389bfde.tar.gz biboumi-56651cb5c29cc50ddf3c62c37167fa0b9389bfde.tar.bz2 biboumi-56651cb5c29cc50ddf3c62c37167fa0b9389bfde.tar.xz biboumi-56651cb5c29cc50ddf3c62c37167fa0b9389bfde.zip |
Merge branch 'master' into debian
Diffstat (limited to 'src/bridge/bridge.hpp')
-rw-r--r-- | src/bridge/bridge.hpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/bridge/bridge.hpp b/src/bridge/bridge.hpp index c10631b..c2f0233 100644 --- a/src/bridge/bridge.hpp +++ b/src/bridge/bridge.hpp @@ -2,6 +2,7 @@ #include <bridge/result_set_management.hpp> #include <bridge/list_element.hpp> +#include <bridge/history_limit.hpp> #include <irc/irc_message.hpp> #include <irc/irc_client.hpp> @@ -74,7 +75,7 @@ public: * Try to join an irc_channel, does nothing and return true if the channel * was already joined. */ - bool join_irc_channel(const Iid& iid, const std::string& nickname, const std::string& password, const std::string& resource); + bool join_irc_channel(const Iid& iid, const std::string& nickname, const std::string& password, const std::string& resource, HistoryLimit history_limit); 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"); @@ -156,8 +157,8 @@ public: /** * Send the MUC history to the user */ - void send_room_history(const std::string& hostname, const std::string& chan_name); - void send_room_history(const std::string& hostname, std::string chan_name, const std::string& resource); + void send_room_history(const std::string& hostname, const std::string& chan_name, const HistoryLimit& history_limit); + void send_room_history(const std::string& hostname, std::string chan_name, const std::string& resource, const HistoryLimit& history_limit); /** * Send a MUC message from some participant */ |