Don’t treat presence updates as MUC joins

If the user sends a directed presence to an unjoined MUC without a <x/>
element, send a presence error back instead of attempting to join it
again, as this is almost never what the user wants.

Fixes #3415.

2 files changed, 5 insertions, 8 deletions

diff --git a/src/bridge/bridge.cpp b/src/bridge/bridge.cpp
index 71c0ea4..a2e2c9c 100644
--- a/src/bridge/bridge.cpp
+++ b/src/bridge/bridge.cpp
@@ -170,8 +170,7 @@ IrcClient* Bridge::find_irc_client(const std::string& hostname) const
 bool Bridge::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)
 {
   const auto& hostname = iid.get_server();
 #ifdef USE_DATABASE
@@ -189,8 +188,8 @@ bool Bridge::join_irc_channel(const Iid& iid, std::string nickname,
     {
       irc->send_join_command(iid.get_local(), password);
       return true;
-    } else if (!res_in_chan || force_join) {
-      // See https://github.com/xsf/xeps/pull/499 for the force_join argument
+    } else {
+      // See https://github.com/xsf/xeps/pull/499
       this->generate_channel_join_for_resource(iid, resource);
     }
   return false;
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");