Refactor and remove duplicate code per review

42wim · Nov 1, 2022 · 098cfef · 098cfef
1 parent 381d0fb
commit 098cfef
Showing 1 changed file with 39 additions and 47 deletions.
diff --git a/mm-go-irckit/userbridge.go b/mm-go-irckit/userbridge.go
@@ -150,29 +150,7 @@ func (u *User) handleDirectMessageEvent(event *bridge.DirectMessageEvent) {
 			prefixUser = event.Receiver.User
 		}
 
-		switch {
-		case u.v.GetBool(u.br.Protocol()+".prefixcontext") && strings.HasPrefix(text, "\x01"):
-			prefix = u.prefixContext(prefixUser, event.MessageID, event.ParentID, event.Event) + " "
-			text = strings.Replace(text, "\x01ACTION ", "\x01ACTION "+prefix, 1)
-			maxlen = len(text)
-		case u.v.GetBool(u.br.Protocol()+".prefixcontext") && u.v.GetBool(u.br.Protocol()+".showcontextmulti"):
-			prefix = u.prefixContext(prefixUser, event.MessageID, event.ParentID, event.Event) + " "
-			showContext = true
-			maxlen = maxlen - len(prefix)
-		case u.v.GetBool(u.br.Protocol() + ".prefixcontext"):
-			prefix = u.prefixContext(prefixUser, event.MessageID, event.ParentID, event.Event) + " "
-			text = prefix + text
-		case u.v.GetBool(u.br.Protocol()+".suffixcontext") && strings.HasSuffix(text, "\x01"):
-			suffix = " " + u.prefixContext(prefixUser, event.MessageID, event.ParentID, event.Event)
-			text = strings.Replace(text, " \x01", suffix+" \x01", 1)
-		case u.v.GetBool(u.br.Protocol()+".suffixcontext") && u.v.GetBool(u.br.Protocol()+".showcontextmulti"):
-			suffix = " " + u.prefixContext(prefixUser, event.MessageID, event.ParentID, event.Event)
-			showContext = true
-			maxlen = maxlen - len(suffix)
-		case u.v.GetBool(u.br.Protocol() + ".suffixcontext"):
-			suffix = " " + u.prefixContext(prefixUser, event.MessageID, event.ParentID, event.Event)
-			text = strings.TrimRight(text, "\n") + suffix
-		}
+		text, prefix, suffix, showContext, maxlen = u.handleMessageThreadContext(prefixUser, event.MessageID, event.ParentID, event.Event, event.Text)
 	}
 
 	codeBlock := false
@@ -313,32 +291,10 @@ func (u *User) handleChannelMessageEvent(event *bridge.ChannelMessageEvent) {
 	text := event.Text
 	prefix := ""
 	suffix := ""
-	maxlen := 440
 	showContext := false
+	maxlen := 440
 	if u.Nick != systemUser {
-		switch {
-		case u.v.GetBool(u.br.Protocol()+".prefixcontext") && strings.HasPrefix(text, "\x01"):
-			prefix = u.prefixContext(event.ChannelID, event.MessageID, event.ParentID, event.Event) + " "
-			text = strings.Replace(text, "\x01ACTION ", "\x01ACTION "+prefix, 1)
-			maxlen = len(text)
-		case u.v.GetBool(u.br.Protocol()+".prefixcontext") && u.v.GetBool(u.br.Protocol()+".showcontextmulti"):
-			prefix = u.prefixContext(event.ChannelID, event.MessageID, event.ParentID, event.Event) + " "
-			showContext = true
-			maxlen = maxlen - len(prefix)
-		case u.v.GetBool(u.br.Protocol() + ".prefixcontext"):
-			prefix = u.prefixContext(event.ChannelID, event.MessageID, event.ParentID, event.Event) + " "
-			text = prefix + text
-		case u.v.GetBool(u.br.Protocol()+".suffixcontext") && strings.HasSuffix(text, "\x01"):
-			suffix = " " + u.prefixContext(event.ChannelID, event.MessageID, event.ParentID, event.Event)
-			text = strings.Replace(text, " \x01", suffix+" \x01", 1)
-		case u.v.GetBool(u.br.Protocol()+".suffixcontext") && u.v.GetBool(u.br.Protocol()+".showcontextmulti"):
-			suffix = " " + u.prefixContext(event.ChannelID, event.MessageID, event.ParentID, event.Event)
-			showContext = true
-			maxlen = maxlen - len(suffix)
-		case u.v.GetBool(u.br.Protocol() + ".suffixcontext"):
-			suffix = " " + u.prefixContext(event.ChannelID, event.MessageID, event.ParentID, event.Event)
-			text = strings.TrimRight(text, "\n") + suffix
-		}
+		text, prefix, suffix, showContext, maxlen = u.handleMessageThreadContext(event.ChannelID, event.MessageID, event.ParentID, event.Event, event.Text)
 	}
 
 	codeBlock := false
@@ -1302,3 +1258,39 @@ func (u *User) getMattermostVersion() string {
 
 	return resp.Header.Get("X-Version-Id")
 }
+
+func (u *User) handleMessageThreadContext(channelID, messageID, parentID, event, text string) (string, string, string, bool, int) {
+	newText := text
+	prefix := ""
+	suffix := ""
+	maxlen := 440
+	showContext := false
+
+	switch {
+	case u.v.GetBool(u.br.Protocol()+".prefixcontext") && strings.HasPrefix(text, "\x01"):
+		prefix = u.prefixContext(channelID, messageID, parentID, event) + " "
+		newText = strings.Replace(text, "\x01ACTION ", "\x01ACTION "+prefix, 1)
+		maxlen = len(text)
+	case u.v.GetBool(u.br.Protocol()+".prefixcontext") && u.v.GetBool(u.br.Protocol()+".showcontextmulti"):
+		prefix = u.prefixContext(channelID, messageID, parentID, event) + " "
+		newText = text
+		showContext = true
+		maxlen -= len(prefix)
+	case u.v.GetBool(u.br.Protocol() + ".prefixcontext"):
+		prefix = u.prefixContext(channelID, messageID, parentID, event) + " "
+		newText = prefix + text
+	case u.v.GetBool(u.br.Protocol()+".suffixcontext") && strings.HasSuffix(text, "\x01"):
+		suffix = " " + u.prefixContext(channelID, messageID, parentID, event)
+		newText = strings.Replace(text, " \x01", suffix+" \x01", 1)
+	case u.v.GetBool(u.br.Protocol()+".suffixcontext") && u.v.GetBool(u.br.Protocol()+".showcontextmulti"):
+		suffix = " " + u.prefixContext(channelID, messageID, parentID, event)
+		newText = text
+		showContext = true
+		maxlen -= len(suffix)
+	case u.v.GetBool(u.br.Protocol() + ".suffixcontext"):
+		suffix = " " + u.prefixContext(channelID, messageID, parentID, event)
+		newText = strings.TrimRight(text, "\n") + suffix
+	}
+
+	return newText, prefix, suffix, showContext, maxlen
+}