From 14fe971183e5a281525827c8135965f57e15f73b Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Tue, 12 Nov 2019 12:17:42 +0100 Subject: =?UTF-8?q?Don=E2=80=99t=20treat=20presence=20updates=20as=20MUC?= =?UTF-8?q?=20joins?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the user sends a directed presence to an unjoined MUC without a element, send a presence error back instead of attempting to join it again, as this is almost never what the user wants. Fixes #3415. --- src/bridge/bridge.hpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/bridge/bridge.hpp') diff --git a/src/bridge/bridge.hpp b/src/bridge/bridge.hpp index fa2a31f..8f474e5 100644 --- a/src/bridge/bridge.hpp +++ b/src/bridge/bridge.hpp @@ -72,14 +72,12 @@ 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_private_message(const Iid& iid, const std::string& body, const std::string& type="PRIVMSG"); -- cgit v1.2.3