Make version requests work with global user JIDs as well

fix #3210

2 files changed, 3 insertions, 2 deletions

diff --git a/src/bridge/bridge.cpp b/src/bridge/bridge.cpp
index 65171a9..7724ba7 100644
--- a/src/bridge/bridge.cpp
+++ b/src/bridge/bridge.cpp
@@ -713,7 +713,7 @@ void Bridge::send_irc_version_request(const std::string& irc_hostname, const std
       if (irc_hostname != hostname)
         return false;
       IrcUser user(message.prefix);
-      if (message.command == "NOTICE" && user.nick == target &&
+      if (message.command == "NOTICE" && utils::tolower(user.nick) == utils::tolower(target) &&
           message.arguments.size() >= 2 && message.arguments[1].substr(0, 9) == "\01VERSION ")
         {
           // remove the "\01VERSION " and the "\01" parts from the string
diff --git a/src/xmpp/biboumi_component.cpp b/src/xmpp/biboumi_component.cpp
index f43b5e0..1e66b62 100644
--- a/src/xmpp/biboumi_component.cpp
+++ b/src/xmpp/biboumi_component.cpp
@@ -412,7 +412,8 @@ void BiboumiComponent::handle_iq(const Stanza& stanza)
       else if ((query = stanza.get_child("query", VERSION_NS)))
         {
           Iid iid(to.local, bridge);
-          if (iid.type != Iid::Type::Server && !to.resource.empty())
+          if ((iid.type == Iid::Type::Channel && !to.resource.empty()) ||
+              (iid.type == Iid::Type::User))
             {
               // Get the IRC user version
               std::string target;