Update log event names

CominAtYou · Apr 20, 2024 · 572345e · 572345e
1 parent a5fd3a8
commit 572345e
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>com.cominatyou</groupId>
   <artifactId>hildabot</artifactId>
-  <version>2.5.0</version>
+  <version>2.5.1</version>
 
   <name>hildabot</name>
   <url>http://www.example.com</url>

diff --git a/src/main/java/com/cominatyou/commands/LevelCheck.java b/src/main/java/com/cominatyou/commands/LevelCheck.java
@@ -44,7 +44,7 @@ public void execute(MessageCreateEvent message, List<String> args) { // Essentia
 
         if (restoredRoles > 0) {
             MessageUtil.sendTextReply(message.getMessage(), "You're all set. The roles you were missing have been added to you.");
-            Log.eventf("LEVELCHECK", "Restored %d %s for %s (%d)", restoredRoles, English.plural("role", restoredRoles), message.getMessageAuthor().getName(), message.getMessageAuthor().getId());
+            Log.eventf("LevelCheck", "Restored %d %s for %s (%d)", restoredRoles, English.plural("role", restoredRoles), message.getMessageAuthor().getName(), message.getMessageAuthor().getId());
         }
         else {
             MessageUtil.sendTextReply(message.getMessage(), "You don't seem to be missing any roles, so you're all set!");

diff --git a/src/main/java/com/cominatyou/routinetasks/CheckForBirthdays.java b/src/main/java/com/cominatyou/routinetasks/CheckForBirthdays.java
@@ -25,12 +25,12 @@ public class CheckForBirthdays implements Job {
     public void execute(JobExecutionContext context) throws JobExecutionException {
         final DiscordApi client = App.getClient();
 
-        Log.event("BIRTHDAYS", "Starting birthdays task.");
+        Log.event("Birthdays", "Starting birthdays task.");
 
         final Optional<Role> birthdayRole = client.getServerById(Values.BASE_GUILD_ID).get().getRoleById(609258045759029250L);
         birthdayRole.ifPresent(role -> {
             final Collection<User> birthdayRoleUsers = role.getUsers();
-            if (birthdayRoleUsers.size() != 0) Log.eventf("BIRTHDAYS", "Removing birthday role from %d %s\n", birthdayRoleUsers.size(), English.plural("user", birthdayRoleUsers.size()));
+            if (birthdayRoleUsers.size() != 0) Log.eventf("Birthdays", "Removing birthday role from %d %s\n", birthdayRoleUsers.size(), English.plural("user", birthdayRoleUsers.size()));
             birthdayRoleUsers.forEach(user -> {
                 user.removeRole(role, "Their birthday has passed.");
             });
@@ -50,7 +50,7 @@ public void execute(JobExecutionContext context) throws JobExecutionException {
         }
 
         final int birthdayCountBeforeFilter = birthdays.size();
-        Log.eventf("BIRTHDAYS", "Got %d %s from DB for %d-%s", birthdayCountBeforeFilter, English.plural("birthday", birthdayCountBeforeFilter), month, dayString);
+        Log.eventf("Birthdays", "Got %d %s from DB for %d-%s", birthdayCountBeforeFilter, English.plural("birthday", birthdayCountBeforeFilter), month, dayString);
 
         final TextChannel birthdayChannel = client.getServerById(Values.BASE_GUILD_ID).get().getTextChannelById(609253148564914187L).get();
 
@@ -62,7 +62,7 @@ public void execute(JobExecutionContext context) throws JobExecutionException {
         }
 
         final int birthdayCount = birthdays.size();
-        Log.eventf("BIRTHDAYS", "Got %d %s after filtering for %d-%s", birthdayCount, English.plural("birthday", birthdayCount), month, dayString);
+        Log.eventf("Birthdays", "Got %d %s after filtering for %d-%s", birthdayCount, English.plural("birthday", birthdayCount), month, dayString);
 
         if (birthdays.isEmpty()) {
             return;
@@ -87,11 +87,11 @@ else if (birthdays.size() == 2) {
             client.getServerById(Values.BASE_GUILD_ID).get().getMemberById(id).ifPresent(user -> {
                 birthdayRole.ifPresent(role -> {
                     role.addUser(user, "Their birthday is today!");
-                    Log.eventf("BIRTHDAYS", "Gave birthday role to %s (%d)", user.getName(), user.getId());
+                    Log.eventf("Birthdays", "Gave birthday role to %s (%d)", user.getName(), user.getId());
                 });
             });
         });
 
-        Log.event("BIRTHDAYS", "Completed birthdays task.");
+        Log.event("Birthdays", "Completed birthdays task.");
     }
 }
diff --git a/src/main/java/com/cominatyou/routinetasks/SendStreakWarning.java b/src/main/java/com/cominatyou/routinetasks/SendStreakWarning.java
@@ -20,7 +20,7 @@ public class SendStreakWarning implements Job {
 
     @Override
     public void execute(JobExecutionContext arg0) throws JobExecutionException {
-        Log.event("STREAKWARN", "Starting streak warnings task.");
+        Log.event("StreakWarn", "Starting streak warnings task.");
 
         final ZonedDateTime now = ZonedDateTime.now(Values.TIMEZONE_AMERICA_CHICAGO);
         final ZonedDateTime midnight = now.toLocalDate().atStartOfDay(now.getZone());
@@ -51,7 +51,7 @@ public void execute(JobExecutionContext arg0) throws JobExecutionException {
             });
         }
 
-        Log.eventf("STREAKWARN", "Sent three-day streak expiry warning to %d %s.", expireInThreeDays.size(), English.plural("user", expireInThreeDays.size()));
+        Log.eventf("StreakWarn", "Sent three-day streak expiry warning to %d %s.", expireInThreeDays.size(), English.plural("user", expireInThreeDays.size()));
 
         embed.setTitle("Your streak expires in 1 day!");
 
@@ -64,8 +64,8 @@ public void execute(JobExecutionContext arg0) throws JobExecutionException {
             });
         }
 
-        Log.eventf("STREAKWARN", "Sent next-day streak expiry warning to %d %s.", expireTomorrow.size(), English.plural("user", expireTomorrow.size()));
-        Log.event("STREAKWARN", "Finished streak warnings task.");
+        Log.eventf("StreakWarn", "Sent next-day streak expiry warning to %d %s.", expireTomorrow.size(), English.plural("user", expireTomorrow.size()));
+        Log.event("StreakWarn", "Finished streak warnings task.");
 
     }
 }
diff --git a/src/main/java/com/cominatyou/util/versioning/Version.java b/src/main/java/com/cominatyou/util/versioning/Version.java
@@ -1,7 +1,7 @@
 package com.cominatyou.util.versioning;
 
 public class Version {
-    public static final String VERSION = "2.5.0";
-    public static final String BUILD_NUMBER = "11F041";
+    public static final String VERSION = "2.5.1";
+    public static final String BUILD_NUMBER = "11F042";
     public static final String VERSION_STRING = String.format("%s (%s)", VERSION, BUILD_NUMBER);
 }
diff --git a/src/main/java/com/cominatyou/xp/RestoreRoles.java b/src/main/java/com/cominatyou/xp/RestoreRoles.java
@@ -24,6 +24,6 @@ public static void restore(UserChangePendingEvent event) {
             role.addUser(event.getUser());
         }
 
-        Log.eventf("RESTORE", "Restored roles for %s (%d), starting from level %d\n", event.getUser().getName(), event.getUser().getId(), rankLevel);
+        Log.eventf("Restore", "Restored roles for %s (%d), starting from level %d\n", event.getUser().getName(), event.getUser().getId(), rankLevel);
     }
 }
diff --git a/src/main/java/com/cominatyou/xp/XPSystem.java b/src/main/java/com/cominatyou/xp/XPSystem.java
@@ -61,7 +61,7 @@ public static void checkForLevelUp(int beforeActionLevel, User user, Server serv
             final String levelUpMessage = String.format("Congrats on leveling up! You are now level **%d**! :tada:", currentLevel);
             final String embedTitle = RankUtil.isLevelRankLevel(currentLevel) ? rankUpMessage : levelUpMessage;
 
-            Log.eventf("LEVELUP", "%s (%d) leveled up to %d: %s XP", user.getName(), user.getId(), currentLevel, ThousandsFormat.format(currentXP));
+            Log.eventf("LevelUp", "%s (%d) leveled up to %d: %s XP", user.getName(), user.getId(), currentLevel, ThousandsFormat.format(currentXP));
 
             if (!userEntry.getBoolean("levelalertsdisabled")) {
                 final EmbedBuilder embed = new EmbedBuilder()
@@ -97,7 +97,7 @@ public static void checkForLevelUp(int beforeActionLevel, User user, Server serv
 
                 try {
                     role.addUser(user).get();
-                    Log.eventf("LEVELUP", "Assigned role %s to %s (%d)", role.getName(), user.getName(), user.getId());
+                    Log.eventf("LevelUp", "Assigned role %s to %s (%d)", role.getName(), user.getName(), user.getId());
                 }
                 catch (Exception e) {
                     final EmbedBuilder errorEmbed = new EmbedBuilder()
@@ -107,7 +107,7 @@ public static void checkForLevelUp(int beforeActionLevel, User user, Server serv
                         .addInlineField("Role", String.format("%s (%d)", role.getName(), currentLevel))
                         .setColor(Values.ERROR_RED);
 
-                    Log.errorf("LEVELUP", "Failed to assign %s to %s (%d)!", role.getName(), user.getName(), user.getId());
+                    Log.errorf("LevelUp", "Failed to assign %s to %s (%d)!", role.getName(), user.getName(), user.getId());
                     user.getApi().getOwner().get().join().openPrivateChannel().join().sendMessage(errorEmbed);
 
                     if (e.getCause() == null) e.printStackTrace();