Added with-comment fix

Moved --with-comment threatment externally, due to conflicts with -m and -f Signed-off-by: Lucas Zampieri <[email protected]>
zaquestion · Sep 28, 2021 · 2d33f7e · 2d33f7e
1 parent 3ea4cc3
commit 2d33f7e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/cmd/mr_approve.go b/cmd/mr_approve.go
@@ -61,6 +61,11 @@ var mrApproveCmd = &cobra.Command{
 			if err != nil {
 				log.Fatal(err)
 			}
+			if comment {
+				state := noteGetState(rn, true, int(id))
+				msg, _ := noteMsg(msgs, true, int(id), state, "", "")
+				msgs = append(msgs, msg)
+			}
 		}
 
 		msgs = append(msgs, "/approve")

diff --git a/cmd/mr_unapprove.go b/cmd/mr_unapprove.go
@@ -67,6 +67,11 @@ var mrUnapproveCmd = &cobra.Command{
 			if err != nil {
 				log.Fatal(err)
 			}
+			if comment {
+				state := noteGetState(rn, true, int(id))
+				msg, _ := noteMsg(msgs, true, int(id), state, "", "")
+				msgs = append(msgs, msg)
+			}
 		}
 
 		msgs = append(msgs, "/unapprove")

diff --git a/cmd/note_common.go b/cmd/note_common.go
@@ -242,7 +242,7 @@ func createNote(rn string, isMR bool, idNum int, msgs []string, filename string,
 			log.Fatal(err)
 		}
 		body = string(content)
-		if hasNote {
+		if hasNote && len(msgs) > 0 {
 			body += msgs[0]
 		}
 	} else {