Fix missing channel exception handler for QUIT, fix typos in PART and

MODE command handlers
MCMrARM · Nov 25, 2017 · 8928d08 · 8928d08
1 parent ba60097
commit 8928d08
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/chatlib/src/main/java/io/mrarm/chatlib/irc/handlers/ModeCommandHandler.java b/chatlib/src/main/java/io/mrarm/chatlib/irc/handlers/ModeCommandHandler.java
@@ -37,7 +37,7 @@ public void handle(ServerConnectionData connection, MessagePrefix sender, String
                 // TODO: user modes
             }
         } catch (NoSuchChannelException e) {
-            throw new InvalidMessageException("Invalid channel specified in a JOIN message", e);
+            throw new InvalidMessageException("Invalid channel specified in a MODE message", e);
         } catch (InterruptedException | ExecutionException e) {
             throw new RuntimeException(e);
         }

diff --git a/chatlib/src/main/java/io/mrarm/chatlib/irc/handlers/PartCommandHandler.java b/chatlib/src/main/java/io/mrarm/chatlib/irc/handlers/PartCommandHandler.java
@@ -37,7 +37,7 @@ public void handle(ServerConnectionData connection, MessagePrefix sender, String
                 channelData.addMessage(new MessageInfo.Builder(senderInfo, message, MessageInfo.MessageType.PART), tags);
             }
         } catch (NoSuchChannelException e) {
-            throw new InvalidMessageException("Invalid channel specified in a JOIN message", e);
+            throw new InvalidMessageException("Invalid channel specified in a PART message", e);
         } catch (InterruptedException | ExecutionException e) {
             throw new RuntimeException(e);
         }

diff --git a/chatlib/src/main/java/io/mrarm/chatlib/irc/handlers/QuitCommandHandler.java b/chatlib/src/main/java/io/mrarm/chatlib/irc/handlers/QuitCommandHandler.java
@@ -31,7 +31,9 @@ public void handle(ServerConnectionData connection, MessagePrefix sender, String
                 channelData.removeMember(channelData.getMember(userInfo.getUUID()));
                 channelData.addMessage(new MessageInfo.Builder(senderInfo, params.get(0), MessageInfo.MessageType.QUIT), tags);
             }
-        } catch (InterruptedException | ExecutionException | NoSuchChannelException e) {
+        } catch (NoSuchChannelException e) {
+            throw new InvalidMessageException("Invalid channel specified in a QUIT message", e);
+        } catch (InterruptedException | ExecutionException e) {
             throw new RuntimeException(e);
         }
     }