* Move non-GUI code of sendMessageAsFile into message.go

* Move non-GUI / offline code of `insertQuoteOfMessage` into message.go and write unit test

Author: Bios-Marcel

discordutil/message.go

@@ -1,6 +1,12 @@
 package discordutil
 
-import "github.com/Bios-Marcel/discordgo"
+import (
+	"bytes"
+	"fmt"
+	"github.com/Bios-Marcel/cordless/times"
+	"github.com/Bios-Marcel/discordgo"
+	"strings"
+)
 
 // MentionsCurrentUserExplicitly checks whether the message contains any
 // explicit mentions for the user associated with the currently logged in user.
@@ -94,3 +100,46 @@ func (l *MessageLoader) LoadMessages(channel *discordgo.Channel) ([]*discordgo.M
 
 	return messages, nil
 }
+
+// SendMessageAsFile sends the given message into the given channel using the
+// passed discord Session. If an error occurs, onFailure gets called.
+func SendMessageAsFile(session *discordgo.Session, message string, channel string, onFailure func(error)) {
+	reader := bytes.NewBufferString(message)
+	messageAsFile := &discordgo.File{
+		Name:        "message.txt",
+		ContentType: "text",
+		Reader:      reader,
+	}
+	complexMessage := &discordgo.MessageSend{
+		Content: "The message was too long, therefore, you get a file:",
+		Embed:   nil,
+		Tts:     false,
+		Files:   nil,
+		File:    messageAsFile,
+	}
+	_, sendError := session.ChannelMessageSendComplex(channel, complexMessage)
+	if sendError != nil {
+		onFailure(sendError)
+	}
+}
+
+// Generates a Quote using the given Input. The `messageAfterQuote` will be
+// appended after the quote in case it is not empty.
+func GenerateQuote(message, author string, time discordgo.Timestamp, messageAfterQuote string) (string, error) {
+	messageTime, parseError := time.Parse()
+	if parseError != nil {
+		return "", parseError
+	}
+
+	// All quotes should be UTC.
+	messageTimeUTC := messageTime.UTC()
+
+	quotedMessage := strings.ReplaceAll(message, "\n", "\n> ")
+	quotedMessage = fmt.Sprintf("> **%s** %s UTC:\n> %s\n", author, times.TimeToString(&messageTimeUTC), quotedMessage)
+	currentContent := strings.TrimSpace(messageAfterQuote)
+	if currentContent != "" {
+		quotedMessage = quotedMessage + currentContent
+	}
+
+	return quotedMessage, nil
+}

discordutil/message_test.go

@@ -193,3 +193,142 @@ func Test_LoadMessages_CacheAccess(t *testing.T) {
 
 	})
 }
+
+func TestGenerateQuote(t *testing.T) {
+	type args struct {
+		message           string
+		author            string
+		time              discordgo.Timestamp
+		messageAfterQuote string
+	}
+	tests := []struct {
+		name    string
+		args    args
+		want    string
+		wantErr bool
+	}{
+		{
+			name: "simple line",
+			args: args{
+				message:           "Hello World",
+				author:            "humaN",
+				time:              discordgo.Timestamp("2019-10-28T21:30:57.003000+00:00"),
+				messageAfterQuote: "",
+			},
+			want: "> **humaN** 21:30:57 UTC:\n> Hello World\n",
+			wantErr: false,
+		}, {
+			name: "simple line; non UTC - positive",
+			args: args{
+				message:           "Hello World",
+				author:            "humaN",
+				time:              discordgo.Timestamp("2019-10-28T21:30:57.003000+03:00"),
+				messageAfterQuote: "",
+			},
+			want: "> **humaN** 18:30:57 UTC:\n> Hello World\n",
+			wantErr: false,
+		},  {
+			name: "simple line; non UTC - negative",
+			args: args{
+				message:           "Hello World",
+				author:            "humaN",
+				time:              discordgo.Timestamp("2019-10-28T21:30:57.003000-02:00"),
+				messageAfterQuote: "",
+			},
+			want: "> **humaN** 23:30:57 UTC:\n> Hello World\n",
+			wantErr: false,
+		}, {
+			name: "multi line",
+			args: args{
+				message:           "Hello World\nBye World",
+				author:            "humaN",
+				time:              discordgo.Timestamp("2019-10-28T21:30:57.003000+00:00"),
+				messageAfterQuote: "",
+			},
+			want: "> **humaN** 21:30:57 UTC:\n> Hello World\n> Bye World\n",
+			wantErr: false,
+		}, {
+			name: "simple line with message after quote",
+			args: args{
+				message:           "Hello World",
+				author:            "humaN",
+				time:              discordgo.Timestamp("2019-10-28T21:30:57.003000+00:00"),
+				messageAfterQuote: "Hei",
+			},
+			want: "> **humaN** 21:30:57 UTC:\n> Hello World\nHei",
+			wantErr: false,
+		},  {
+			name: "simple line with multline message after quote",
+			args: args{
+				message:           "Hello World",
+				author:            "humaN",
+				time:              discordgo.Timestamp("2019-10-28T21:30:57.003000+00:00"),
+				messageAfterQuote: "Hei\nHo",
+			},
+			want: "> **humaN** 21:30:57 UTC:\n> Hello World\nHei\nHo",
+			wantErr: false,
+		},  {
+			name: "simple line with whitespace message after quote",
+			args: args{
+				message:           "Hello World",
+				author:            "humaN",
+				time:              discordgo.Timestamp("2019-10-28T21:30:57.003000+00:00"),
+				messageAfterQuote: "    \t    ",
+			},
+			want: "> **humaN** 21:30:57 UTC:\n> Hello World\n",
+			wantErr: false,
+		},   {
+			name: "simple line with surrounding whitespace message after quote",
+			args: args{
+				message:           "Hello World",
+				author:            "humaN",
+				time:              discordgo.Timestamp("2019-10-28T21:30:57.003000+00:00"),
+				messageAfterQuote: "    \t    hei",
+			},
+			want: "> **humaN** 21:30:57 UTC:\n> Hello World\nhei",
+			wantErr: false,
+		}, {
+			name: "empty author; we won't handle this, but still specify expected behaviour",
+			args: args{
+				message:           "Hello World\nBye World",
+				author:            "",
+				time:              discordgo.Timestamp("2019-10-28T21:30:57.003000+00:00"),
+				messageAfterQuote: "",
+			},
+			want: "> **** 21:30:57 UTC:\n> Hello World\n> Bye World\n",
+			wantErr: false,
+		},  {
+			name: "empty message; we won't handle this, but still specify expected behaviour",
+			args: args{
+				message:           "",
+				author:            "author",
+				time:              discordgo.Timestamp("2019-10-28T21:30:57.003000+00:00"),
+				messageAfterQuote: "",
+			},
+			want: "> **author** 21:30:57 UTC:\n> \n",
+			wantErr: false,
+		}, {
+			name: "Invalid timestamps should cause an error",
+			args: args{
+				message:           "",
+				author:            "",
+				time:              discordgo.Timestamp("OwO, an invalid timestamp"),
+				messageAfterQuote: "",
+			},
+			want: "",
+			wantErr: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := GenerateQuote(tt.args.message, tt.args.author, tt.args.time, tt.args.messageAfterQuote)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("GenerateQuote() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if got != tt.want {
+				t.Errorf("GenerateQuote() got = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

ui/window.go

@@ -20,7 +20,6 @@ import (
 	"github.com/Bios-Marcel/cordless/scripting"
 	"github.com/Bios-Marcel/cordless/scripting/js"
 	"github.com/Bios-Marcel/cordless/shortcuts"
-	"github.com/Bios-Marcel/cordless/times"
 	"github.com/Bios-Marcel/cordless/ui/tviewutil"
 	"github.com/Bios-Marcel/cordless/util/fuzzy"
 	"github.com/Bios-Marcel/cordless/util/maths"
@@ -978,17 +977,10 @@ func (window *Window) IsCursorInsideCodeBlock() bool {
 }
 
 func (window *Window) insertQuoteOfMessage(message *discordgo.Message) {
-	messageTime, parseError := message.Timestamp.Parse()
-	if parseError != nil {
-		return
-	}
-
-	// All quotes should be UTC.
-	messageTimeUTC := messageTime.UTC()
-
-	currentContent := strings.TrimSpace(window.messageInput.GetText())
 	username := message.Author.Username
 	if message.GuildID != "" {
+		//The error handling here is rather lax, since not being able to show
+		// a nickname isn't really a gamerbreaker.
 		guild, stateError := window.session.State.Guild(message.GuildID)
 		if stateError == nil {
 			member, stateError := window.session.State.Member(guild.ID, message.Author.ID)
@@ -998,13 +990,13 @@ func (window *Window) insertQuoteOfMessage(message *discordgo.Message) {
 		}
 	}
 
-	quotedMessage := strings.ReplaceAll(message.ContentWithMentionsReplaced(), "\n", "\n> ")
-	quotedMessage = fmt.Sprintf("> **%s** %s UTC:\n> %s\n", username, times.TimeToString(&messageTimeUTC), quotedMessage)
-	if currentContent != "" {
-		quotedMessage = quotedMessage + currentContent
+	quotedMessage, generateError := discordutil.GenerateQuote(message.ContentWithMentionsReplaced(), username, message.Timestamp, window.messageInput.GetText())
+	if generateError == nil {
+		window.messageInput.SetText(quotedMessage)
+		window.app.SetFocus(window.messageInput.GetPrimitive())
+	} else {
+		window.ShowErrorDialog(fmt.Sprintf("Error quoting message:\n\t%s", generateError.Error()))
 	}
-	window.messageInput.SetText(quotedMessage)
-	window.app.SetFocus(window.messageInput.GetPrimitive())
 }
 
 func (window *Window) TrySendMessage(targetChannel *discordgo.Channel, message string) {
@@ -1052,21 +1044,7 @@ func (window *Window) TrySendMessage(targetChannel *discordgo.Channel, message s
 }
 
 func (window *Window) sendMessageAsFile(message string, channel string) {
-	reader := bytes.NewBufferString(message)
-	messageAsFile := &discordgo.File{
-		Name:        "message.txt",
-		ContentType: "text",
-		Reader:      reader,
-	}
-	complexMessage := &discordgo.MessageSend{
-		Content: "The message was too long, therefore, you get a file:",
-		Embed:   nil,
-		Tts:     false,
-		Files:   nil,
-		File:    messageAsFile,
-	}
-	_, sendError := window.session.ChannelMessageSendComplex(channel, complexMessage)
-	if sendError != nil {
+	discordutil.SendMessageAsFile(window.session, message, channel, func(sendError error) {
 		retry := "Retry sending"
 		edit := "Edit"
 		window.app.QueueUpdateDraw(func() {
@@ -1081,7 +1059,7 @@ func (window *Window) sendMessageAsFile(message string, channel string) {
 					}
 				}, retry, edit, "Cancel")
 		})
-	}
+	})
 }
 
 func (window *Window) sendMessage(targetChannelID, message string) {
@@ -1192,7 +1170,6 @@ func (window *Window) PopulateMentionWindowFromCurrentGuild(mentionWindow *tview
 		}
 		window.addNodeToMentionWindow(mentionWindow, displayName, userMentionReference)
 	}
-
 }
 
 func (window *Window) addNodeToMentionWindow(mentionWindow *tview.TreeView, name string, reference interface{}) {