GitHub
/
ergo
mirror of https://github.com/ergochat/ergo.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1413 from slingamn/issue1411_dmtags 

fix #1411
This commit is contained in:
Shivaram Lingamneni 2020-11-29 17:03:38 -08:00 committed by GitHub
parent 0fcaf778e0 2d857b21c6
commit 0e470763a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
irc/client.go
View File

@ -1050,7 +1050,8 @@ func (client *Client) replayPrivmsgHistory(rb *ResponseBuffer, items []history.I
}
batchID = rb.StartNestedHistoryBatch(target)
allowTags := rb.session.capabilities.Has(caps.EventPlayback)
hasEventPlayback := rb.session.capabilities.Has(caps.EventPlayback)
hasTags := rb.session.capabilities.Has(caps.MessageTags)
for _, item := range items {
var command string
switch item.Type {
@ -1059,7 +1060,7 @@ func (client *Client) replayPrivmsgHistory(rb *ResponseBuffer, items []history.I
case history.Notice:
command = "NOTICE"
case history.Tagmsg:
if allowTags {
if hasEventPlayback && hasTags {
command = "TAGMSG"
} else {
continue
@ -1068,7 +1069,7 @@ func (client *Client) replayPrivmsgHistory(rb *ResponseBuffer, items []history.I
continue
}
var tags map[string]string
if allowTags {
if hasTags {
tags = item.Tags
}
// XXX: Params[0] is the message target. if the source of this message is an in-memory

2
irctest

@ -1 +1 @@
Subproject commit d741ab86d5f63782e746384a553f44b04a672ebb
Subproject commit 14435ce0e8af86d0d0be5d9eca35bf2ab9931b4f