Consider own name in multiline

Author: mbax

src/main/java/org/kitteh/irc/client/library/Client.java

@@ -380,9 +380,7 @@ default void sendMultiLineMessage(@Nonnull String target, @Nonnull String messag
      * @param cutter cutter to utilize
      * @throws IllegalArgumentException for null parameters
      */
-    default void sendMultiLineMessage(@Nonnull String target, @Nonnull String message, @Nonnull Cutter cutter) {
-        cutter.split(message, 510 - ("PRIVMSG " + target + " :").length()).forEach(line -> this.sendMessage(target, line));
-    }
+    void sendMultiLineMessage(@Nonnull String target, @Nonnull String message, @Nonnull Cutter cutter);
 
     /**
      * Sends a potentially multi-line message to a target user or channel
@@ -412,7 +410,8 @@ default void sendMultiLineMessage(@Nonnull MessageReceiver target, @Nonnull Stri
      * @throws IllegalArgumentException for null parameters
      */
     default void sendMultiLineMessage(@Nonnull MessageReceiver target, @Nonnull String message, @Nonnull Cutter cutter) {
-        cutter.split(message, 510 - ("PRIVMSG " + target.getMessagingName() + " :").length()).forEach(line -> this.sendMessage(target, line));
+        Sanity.nullCheck(target, "Target cannot be null");
+        this.sendMultiLineMessage(target.getName(), message, cutter);
     }
 
     /**
@@ -442,9 +441,7 @@ default void sendMultiLineNotice(@Nonnull String target, @Nonnull String message
      * @param cutter cutter to utilize
      * @throws IllegalArgumentException for null parameters
      */
-    default void sendMultiLineNotice(@Nonnull String target, @Nonnull String message, @Nonnull Cutter cutter) {
-        cutter.split(message, 510 - ("NOTICE " + target + " :").length()).forEach(line -> this.sendNotice(target, line));
-    }
+    void sendMultiLineNotice(@Nonnull String target, @Nonnull String message, @Nonnull Cutter cutter);
 
     /**
      * Sends a potentially multi-line notice to a target user or channel
@@ -474,7 +471,8 @@ default void sendMultiLineNotice(@Nonnull MessageReceiver target, @Nonnull Strin
      * @throws IllegalArgumentException for null parameters
      */
     default void sendMultiLineNotice(@Nonnull MessageReceiver target, @Nonnull String message, @Nonnull Cutter cutter) {
-        cutter.split(message, 510 - ("NOTICE " + target.getMessagingName() + " :").length()).forEach(line -> this.sendNotice(target, line));
+        Sanity.nullCheck(target, "Target cannot be null");
+        this.sendMultiLineNotice(target.getName(), message, cutter);
     }
 
     /**

src/main/java/org/kitteh/irc/client/library/implementation/IRCClient.java

@@ -292,6 +292,27 @@ public void sendMessage(@Nonnull String target, @Nonnull String message) {
         this.sendRawLine("PRIVMSG " + target + " :" + message);
     }
 
+    @Override
+    public void sendMultiLineMessage(@Nonnull String target, @Nonnull String message, @Nonnull Cutter cutter) {
+        cutter.split(message, this.getRemainingLength("PRIVMSG", target)).forEach(line -> this.sendMessage(target, line));
+    }
+
+    @Override
+    public void sendMultiLineNotice(@Nonnull String target, @Nonnull String message, @Nonnull Cutter cutter) {
+        cutter.split(message, this.getRemainingLength("NOTICE", target)).forEach(line -> this.sendNotice(target, line));
+    }
+
+    private int getRemainingLength(@Nonnull String type, @Nonnull String target) {
+        // :nick!name@host PRIVMSG/NOTICE TARGET :MESSAGE\r\n
+        // So that's two colons, three spaces, CR, and LF. 7 chars.
+        // 512 - 7 = 505
+        // Then, drop the user's full name (nick!name@host) and target
+        // If self name is unknown, let's just do 100 for now
+        // TODO arbitrary
+        // Lastly drop the PRIVMSG or NOTICE length
+        return 505 - this.getUser().map(user -> user.getName().length()).orElse(100) - target.length() - type.length();
+    }
+
     @Override
     public void sendNotice(@Nonnull String target, @Nonnull String message) {
         Sanity.safeMessageCheck(target, "Target");

src/test/java/org/kitteh/irc/client/library/implementation/FakeClient.java

@@ -297,6 +297,16 @@ public void sendNotice(@Nonnull MessageReceiver target, @Nonnull String message)
 
     }
 
+    @Override
+    public void sendMultiLineMessage(@Nonnull String target, @Nonnull String message, @Nonnull Cutter cutter) {
+
+    }
+
+    @Override
+    public void sendMultiLineNotice(@Nonnull String target, @Nonnull String message, @Nonnull Cutter cutter) {
+
+    }
+
     @Override
     public void sendRawLine(@Nonnull String message) {