From 969ed3b1583a084e125e5ab022cb3d67b1d37818 Mon Sep 17 00:00:00 2001
From: Dan Caseley <dan@caseley.me.uk>
Date: Sat, 12 Mar 2022 00:00:48 +0000
Subject: [PATCH] fixes #222: Don't use deprecated Openfire methods

---
 .../org/jivesoftware/openfire/archive/ConversationUtils.java  | 2 +-
 src/java/org/jivesoftware/openfire/index/LuceneIndexer.java   | 3 ++-
 src/java/org/jivesoftware/openfire/plugin/service/LogAPI.java | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/java/org/jivesoftware/openfire/archive/ConversationUtils.java b/src/java/org/jivesoftware/openfire/archive/ConversationUtils.java
index c9548985c..2ab7d78db 100644
--- a/src/java/org/jivesoftware/openfire/archive/ConversationUtils.java
+++ b/src/java/org/jivesoftware/openfire/archive/ConversationUtils.java
@@ -352,7 +352,7 @@ private String formatJID(boolean html, JID jid) {
         if (html) {
             UserManager userManager = UserManager.getInstance();
             if (XMPPServer.getInstance().isLocal(jid) &&
-                userManager.isRegisteredUser(jid.getNode())) {
+                userManager.isRegisteredUser(jid, true)) {
                 formattedJID = "<a href='/user-properties.jsp?username=" +
                     jid.getNode() + "'>" + jid.toBareJID() + "</a>";
             }
diff --git a/src/java/org/jivesoftware/openfire/index/LuceneIndexer.java b/src/java/org/jivesoftware/openfire/index/LuceneIndexer.java
index dbad7f5be..044b2c81b 100644
--- a/src/java/org/jivesoftware/openfire/index/LuceneIndexer.java
+++ b/src/java/org/jivesoftware/openfire/index/LuceneIndexer.java
@@ -450,7 +450,8 @@ private XMLProperties loadPropertiesFile( File searchDir ) throws IOException
             }
             // Ignore.
         }
-        return new XMLProperties(indexPropertiesFile);
+        InputStream stream = new FileInputStream(indexPropertiesFile);
+        return new XMLProperties(stream);
     }
 
     /**
diff --git a/src/java/org/jivesoftware/openfire/plugin/service/LogAPI.java b/src/java/org/jivesoftware/openfire/plugin/service/LogAPI.java
index 498298b49..c1003c369 100644
--- a/src/java/org/jivesoftware/openfire/plugin/service/LogAPI.java
+++ b/src/java/org/jivesoftware/openfire/plugin/service/LogAPI.java
@@ -62,7 +62,7 @@ public Response getLoggedServiceNames()
 
         final List<MultiUserChatService> multiUserChatServices = XMPPServer.getInstance().getMultiUserChatManager().getMultiUserChatServices();
         final List<String> serviceNames = multiUserChatServices.stream()
-            .filter(s -> s.getChatRooms().stream().anyMatch(r -> r.isLogEnabled() && r.isPublicRoom()))
+            .filter(s -> s.getActiveChatRooms().stream().anyMatch(r -> r.isLogEnabled() && r.isPublicRoom()))
             .map(MultiUserChatService::getServiceName)
             .collect(Collectors.toList() );
 
@@ -88,7 +88,7 @@ public Response getLoggedServiceNames( @PathParam("serviceName") String serviceN
             return Response.noContent().build();
         }
 
-        final List<String> roomNames = multiUserChatService.getChatRooms().stream()
+        final List<String> roomNames = multiUserChatService.getActiveChatRooms().stream()
             .filter( r -> r.isLogEnabled() && r.isPublicRoom() )
             .map( MUCRoom::getName )
             .collect(Collectors.toList() );