Fix FLR-22

colorfulFlames · Jul 31, 2024 · 4570de6 · 4570de6
1 parent c488d1e
commit 4570de6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.gradle/8.5/fileHashes/fileHashes.lock b/.gradle/8.5/fileHashes/fileHashes.lock
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/src/main/java/com/severalcircles/flames/events/MessageEvent.java b/src/main/java/com/severalcircles/flames/events/MessageEvent.java
@@ -35,6 +35,7 @@ public class MessageEvent extends ListenerAdapter implements FlamesDiscordEvent
     @Override
     public void onMessageReceived(@NotNull MessageReceivedEvent event) {
         Logger.getGlobal().log(Level.FINE,event.getAuthor().getId() + " Triggered Message Event");
+        if (event.getMessage().getContentRaw().matches("[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b([-a-zA-Z0-9()@:%_\\+.~#?&//=]*)")) return; // Don't process URLs
         super.onMessageReceived(event);
         User user = event.getAuthor();
         Logger logger = Logger.getGlobal();

diff --git a/src/main/java/com/severalcircles/flames/external/analysis/Analysis.java b/src/main/java/com/severalcircles/flames/external/analysis/Analysis.java
@@ -51,13 +51,13 @@ public static List<Entity> analyzeEntities(String message) throws IOException {
 
             AnalyzeEntitiesResponse response = language.analyzeEntities(request);
             // Print the response
-        response.getEntitiesList().forEach((element) -> {
+        List<Entity> finalList = response.getEntitiesList();
+        finalList.removeIf(entity -> entity.getName().matches("\\d+"));
+        finalList.forEach((element) -> {
             if (!entityCache.containsKey(element.getName())) entityCache.put(element.getName(), 1);
             else entityCache.put(element.getName(), entityCache.get(element.getName()) + 1);
-        });
+         });
         language.shutdownNow();
-        //noinspection StatementWithEmptyBody
-        while (!language.isShutdown()) {}
-        return response.getEntitiesList();
+        return finalList;
     }
 }