Properly handle force-join presences by sending everything in return

fix #3305

src/bridge/bridge.cpp

@@ -166,8 +166,11 @@ 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)
+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)
 {
   const auto& hostname = iid.get_server();
 #ifdef USE_DATABASE
@@ -185,7 +188,8 @@ bool Bridge::join_irc_channel(const Iid& iid, std::string nickname, const std::s
     {
       irc->send_join_command(iid.get_local(), password);
       return true;
-    } else if (!res_in_chan) {
+    } else if (!res_in_chan || force_join) {
+      // See https://github.com/xsf/xeps/pull/499 for the force_join argument
       this->generate_channel_join_for_resource(iid, resource);
     }
   return false;

src/bridge/bridge.hpp

@@ -75,7 +75,11 @@ 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, std::string nickname, const std::string& password, const std::string& resource, HistoryLimit history_limit);
+  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);
 
   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");