Add option to show scrollback messages in the single/catchall &messages

42wim · Oct 6, 2023 · c6e86cd · c6e86cd
1 parent bbe3e54
commit c6e86cd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/matterircd.toml.example b/matterircd.toml.example
@@ -65,6 +65,10 @@ Insecure = false
 #
 #JoinOnly = ["#onlythischannel"]
 
+# When set, all scrollback messages are shown in &messages rather than individual channels
+#
+#CollapseScrollback = false
+
 #an array of channels that won't be joined on IRC.
 #regexp is supported
 #Messages that get sent to unjoined channels (but you're joined on mattermost) will

diff --git a/mm-go-irckit/service.go b/mm-go-irckit/service.go
@@ -406,13 +406,26 @@ func scrollback(u *User, toUser *User, args []string, service string) {
 		}
 	}
 
+	if u.v.GetBool(u.br.Protocol() + ".collapsescrollback") {
+		u.MsgUser(toUser, fmt.Sprintf("scrollback results shown in &messages"))
+		return
+	}
 	u.MsgUser(toUser, fmt.Sprintf("scrollback results shown in %s", search))
 }
 
 func formatScrollbackMsg(u *User, channelID string, channel string, user *User, nick string, p *model.Post, msgText string) {
 	ts := time.Unix(0, p.CreateAt*int64(time.Millisecond))
 
 	switch {
+	case (u.v.GetBool(u.br.Protocol()+".collapsescrollback") && strings.HasPrefix(channel, "#")):
+		threadMsgID := u.prefixContext(channelID, p.Id, p.RootId, "scrollback")
+		msg := u.formatContextMessage(ts.Format("2006-01-02 15:04"), threadMsgID, msgText)
+		nick += "/" + channel
+		u.Srv.Channel("&messages").SpoofMessage(nick, msg)
+	case u.v.GetBool(u.br.Protocol() + ".collapsescrollback"):
+		threadMsgID := u.prefixContext(channelID, p.Id, p.RootId, "scrollback")
+		msg := u.formatContextMessage(ts.Format("2006-01-02 15:04"), threadMsgID, msgText)
+		u.Srv.Channel("&messages").SpoofMessage(nick, msg)
 	case (u.v.GetBool(u.br.Protocol()+".prefixcontext") || u.v.GetBool(u.br.Protocol()+".suffixcontext")) && strings.HasPrefix(channel, "#") && nick != systemUser:
 		threadMsgID := u.prefixContext(channelID, p.Id, p.RootId, "scrollback")
 		msg := u.formatContextMessage(ts.Format("2006-01-02 15:04"), threadMsgID, msgText)