줄바꿈 개행문자 치환

roundshoulder · Nov 25, 2022 · 45ae9aa · 45ae9aa
1 parent 9782678
commit 45ae9aa
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/.gradle/7.5.1/executionHistory/executionHistory.lock b/.gradle/7.5.1/executionHistory/executionHistory.lock
diff --git a/.gradle/7.5.1/fileHashes/fileHashes.lock b/.gradle/7.5.1/fileHashes/fileHashes.lock
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/build/classes/java/main/com/project/csletter/message/service/MessageService.class b/build/classes/java/main/com/project/csletter/message/service/MessageService.class
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
diff --git a/src/main/java/com/project/csletter/message/service/MessageService.java b/src/main/java/com/project/csletter/message/service/MessageService.java
@@ -46,22 +46,25 @@ public void write(MessageCreate messageCreate) {
                     break;
                 }
                 tmpString = messageCreate.getBody().substring(startIndex, startIndex+23);
+                tmpString = tmpString.replaceAll("(\r\n|\r|\n\r)", "\n");
+                tmpString = tmpString.strip();
+
                 int lastIndex = tmpString.length()-1;
 
                 if(tmpString.contains("\n")) {
                     for(int j = 0; j < tmpString.length(); j++) {
                         if(tmpString.charAt(j) == '\n') {
-                            lastIndex = j;
-                            tmpString = tmpString.substring(startIndex, j+1);
+                            lastIndex = j+1;
+                            tmpString = tmpString.substring(startIndex, lastIndex);
                             i--;
                             break;
                         }
                     }
-                }
-
-                if(tmpString.contains(" ")) {
-                    while(tmpString.charAt(lastIndex) != ' ') {
-                        lastIndex--;
+                } else {
+                    if (tmpString.contains(" ")) {
+                        while (tmpString.charAt(lastIndex) != ' ') {
+                            lastIndex--;
+                        }
                     }
                 }