|
@@ -777,12 +777,6 @@ func stripMaskFromNick(nickMask string) (nick string) {
|
777
|
777
|
return nickMask[0:index]
|
778
|
778
|
}
|
779
|
779
|
|
780
|
|
-// munge the msgid corresponding to a replayable event,
|
781
|
|
-// yielding a consistent msgid for the fake PRIVMSG from HistServ
|
782
|
|
-func mungeMsgidForHistserv(token string) (result string) {
|
783
|
|
- return fmt.Sprintf("_%s", token)
|
784
|
|
-}
|
785
|
|
-
|
786
|
780
|
func (channel *Channel) replayHistoryItems(rb *ResponseBuffer, items []history.Item, autoreplay bool) {
|
787
|
781
|
chname := channel.Name()
|
788
|
782
|
client := rb.target
|
|
@@ -823,7 +817,7 @@ func (channel *Channel) replayHistoryItems(rb *ResponseBuffer, items []history.I
|
823
|
817
|
} else {
|
824
|
818
|
message = fmt.Sprintf(client.t("%[1]s [account: %[2]s] joined the channel"), nick, item.AccountName)
|
825
|
819
|
}
|
826
|
|
- rb.AddFromClient(item.Message.Time, mungeMsgidForHistserv(item.Message.Msgid), "HistServ", "*", nil, "PRIVMSG", chname, message)
|
|
820
|
+ rb.AddFromClient(item.Message.Time, utils.MungeSecretToken(item.Message.Msgid), "HistServ", "*", nil, "PRIVMSG", chname, message)
|
827
|
821
|
}
|
828
|
822
|
case history.Part:
|
829
|
823
|
if eventPlayback {
|
|
@@ -833,14 +827,14 @@ func (channel *Channel) replayHistoryItems(rb *ResponseBuffer, items []history.I
|
833
|
827
|
continue // #474
|
834
|
828
|
}
|
835
|
829
|
message := fmt.Sprintf(client.t("%[1]s left the channel (%[2]s)"), nick, item.Message.Message)
|
836
|
|
- rb.AddFromClient(item.Message.Time, mungeMsgidForHistserv(item.Message.Msgid), "HistServ", "*", nil, "PRIVMSG", chname, message)
|
|
830
|
+ rb.AddFromClient(item.Message.Time, utils.MungeSecretToken(item.Message.Msgid), "HistServ", "*", nil, "PRIVMSG", chname, message)
|
837
|
831
|
}
|
838
|
832
|
case history.Kick:
|
839
|
833
|
if eventPlayback {
|
840
|
834
|
rb.AddFromClient(item.Message.Time, item.Message.Msgid, item.Nick, item.AccountName, nil, "HEVENT", "KICK", chname, item.Params[0], item.Message.Message)
|
841
|
835
|
} else {
|
842
|
836
|
message := fmt.Sprintf(client.t("%[1]s kicked %[2]s (%[3]s)"), nick, item.Params[0], item.Message.Message)
|
843
|
|
- rb.AddFromClient(item.Message.Time, mungeMsgidForHistserv(item.Message.Msgid), "HistServ", "*", nil, "PRIVMSG", chname, message)
|
|
837
|
+ rb.AddFromClient(item.Message.Time, utils.MungeSecretToken(item.Message.Msgid), "HistServ", "*", nil, "PRIVMSG", chname, message)
|
844
|
838
|
}
|
845
|
839
|
case history.Quit:
|
846
|
840
|
if eventPlayback {
|
|
@@ -850,14 +844,14 @@ func (channel *Channel) replayHistoryItems(rb *ResponseBuffer, items []history.I
|
850
|
844
|
continue // #474
|
851
|
845
|
}
|
852
|
846
|
message := fmt.Sprintf(client.t("%[1]s quit (%[2]s)"), nick, item.Message.Message)
|
853
|
|
- rb.AddFromClient(item.Message.Time, mungeMsgidForHistserv(item.Message.Msgid), "HistServ", "*", nil, "PRIVMSG", chname, message)
|
|
847
|
+ rb.AddFromClient(item.Message.Time, utils.MungeSecretToken(item.Message.Msgid), "HistServ", "*", nil, "PRIVMSG", chname, message)
|
854
|
848
|
}
|
855
|
849
|
case history.Nick:
|
856
|
850
|
if eventPlayback {
|
857
|
851
|
rb.AddFromClient(item.Message.Time, item.Message.Msgid, item.Nick, item.AccountName, nil, "HEVENT", "NICK", item.Params[0])
|
858
|
852
|
} else {
|
859
|
853
|
message := fmt.Sprintf(client.t("%[1]s changed nick to %[2]s"), nick, item.Params[0])
|
860
|
|
- rb.AddFromClient(item.Message.Time, mungeMsgidForHistserv(item.Message.Msgid), "HistServ", "*", nil, "PRIVMSG", chname, message)
|
|
854
|
+ rb.AddFromClient(item.Message.Time, utils.MungeSecretToken(item.Message.Msgid), "HistServ", "*", nil, "PRIVMSG", chname, message)
|
861
|
855
|
}
|
862
|
856
|
}
|
863
|
857
|
}
|