Refactorings for readability

Author: https://github.com/sanifalimomin
See also: #66

Author: mangstadt

src/main/java/oakbot/bot/Bot.java

@@ -16,6 +16,7 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.PriorityBlockingQueue;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Supplier;
 import java.util.regex.Pattern;
 
 import org.jsoup.Jsoup;
@@ -579,7 +580,7 @@ public boolean isCondensableOrEphemeral() {
 		public boolean isEphemeral() {
 			return ephemeral;
 		}
-		
+
 		/**
 		 * Gets the ID of the message that this was a reply to.
 		 * @return the parent ID or 0 if it's not a reply
@@ -689,7 +690,10 @@ public void complete() {
 		}
 
 		private void handleMessage(ChatMessage message) {
-			if (timeout && !isAdminUser(message.userId())) {
+			var userId = message.userId();
+			var isAdminUser = isAdminUser(userId);
+
+			if (timeout && !isAdminUser) {
 				//bot is in timeout, ignore
 				return;
 			}
@@ -699,23 +703,26 @@ private void handleMessage(ChatMessage message) {
 				return;
 			}
 
-			if (!allowedUsers.isEmpty() && !allowedUsers.contains(message.userId())) {
+			var hasAllowedUsersList = !allowedUsers.isEmpty();
+			var userIsAllowed = allowedUsers.contains(userId);
+			if (hasAllowedUsersList && !userIsAllowed) {
 				//message was posted by a user who is not in the green list, ignore
 				return;
 			}
 
-			if (bannedUsers.contains(message.userId())) {
+			var userIsBanned = bannedUsers.contains(userId);
+			if (userIsBanned) {
 				//message was posted by a banned user, ignore
 				return;
 			}
 
-			var room = connection.getRoom(message.roomId());
-			if (room == null) {
+			var isInRoom = connection.isInRoom(message.roomId());
+			if (!isInRoom) {
 				//the bot is no longer in the room
 				return;
 			}
 
-			if (message.userId() == userId) {
+			if (userId == Bot.this.userId) {
 				//message was posted by this bot
 				handleBotMessage(message);
 				return;
@@ -797,34 +804,39 @@ private void handleActions(ChatMessage message, ChatActions actions) {
 			var queue = new LinkedList<>(actions.getActions());
 			while (!queue.isEmpty()) {
 				var action = queue.removeFirst();
+				processAction(action, message, queue);
+			}
+		}
 
-				if (action instanceof PostMessage pm) {
-					handlePostMessageAction(pm, message);
-					continue;
-				}
+		private void processAction(ChatAction action, ChatMessage message, LinkedList<ChatAction> queue) {
+			if (action instanceof PostMessage pm) {
+				handlePostMessageAction(pm, message);
+				return;
+			}
 
-				if (action instanceof DeleteMessage dm) {
-					var response = handleDeleteMessageAction(dm, message);
-					queue.addAll(response.getActions());
-					continue;
-				}
+			if (action instanceof DeleteMessage dm) {
+				var response = handleDeleteMessageAction(dm, message);
+				queue.addAll(response.getActions());
+				return;
+			}
 
-				if (action instanceof JoinRoom jr) {
-					var response = handleJoinRoomAction(jr);
-					queue.addAll(response.getActions());
-					continue;
-				}
+			if (action instanceof JoinRoom jr) {
+				var response = handleJoinRoomAction(jr);
+				queue.addAll(response.getActions());
+				return;
+			}
 
-				if (action instanceof LeaveRoom lr) {
-					handleLeaveRoomAction(lr);
-					continue;
-				}
+			if (action instanceof LeaveRoom lr) {
+				handleLeaveRoomAction(lr);
+				return;
+			}
 
-				if (action instanceof Shutdown) {
-					stop();
-					continue;
-				}
+			if (action instanceof Shutdown) {
+				stop();
+				return;
 			}
+
+			logger.atWarn().log(() -> "Unknown action type: " + action.getClass().getName());
 		}
 
 		private void handlePostMessageAction(PostMessage action, ChatMessage message) {
@@ -865,19 +877,11 @@ private ChatActions handleJoinRoomAction(JoinRoom action) {
 					return action.onSuccess().get();
 				}
 
-				try {
-					leave(action.roomId());
-				} catch (Exception e) {
-					logger.atError().setCause(e).log(() -> "Problem leaving room " + action.roomId() + " after it was found that the bot can't post messages to it.");
-				}
+				leaveRoomSafely(action.roomId(), () -> "Problem leaving room " + action.roomId() + " after it was found that the bot can't post messages to it.");
 
 				return action.ifLackingPermissionToPost().get();
 			} catch (PrivateRoomException | RoomPermissionException e) {
-				try {
-					leave(action.roomId());
-				} catch (Exception e2) {
-					logger.atError().setCause(e2).log(() -> "Problem leaving room " + action.roomId() + " after it was found that the bot can't join or post messages to it.");
-				}
+				leaveRoomSafely(action.roomId(), () -> "Problem leaving room " + action.roomId() + " after it was found that the bot can't join or post messages to it.");
 
 				return action.ifLackingPermissionToPost().get();
 			} catch (RoomNotFoundException e) {
@@ -887,6 +891,19 @@ private ChatActions handleJoinRoomAction(JoinRoom action) {
 			}
 		}
 
+		/**
+		 * Attempts to leave a room and logs any errors that occur.
+		 * @param roomId the room ID to leave
+		 * @param logMessage the log message
+		 **/
+		private void leaveRoomSafely(int roomId, Supplier<String> logMessage) {
+			try {
+				leave(roomId);
+			} catch (Exception e) {
+				logger.atError().setCause(e).log(logMessage);
+			}
+		}
+
 		private void handleLeaveRoomAction(LeaveRoom action) {
 			try {
 				leave(action.roomId());