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

Merge pull request #1470 from slingamn/issue1468_relaymsg_tag 

fix #1468
This commit is contained in:
Shivaram Lingamneni 2020-12-22 02:16:17 -05:00 committed by GitHub
parent a566c85b12 b3f2058d47
commit 5342ab1bb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
irc/caps/constants.go
View File

@ -58,6 +58,8 @@ const (
// More draft names associated with draft/multiline: // More draft names associated with draft/multiline:
MultilineBatchType = "draft/multiline" MultilineBatchType = "draft/multiline"
MultilineConcatTag = "draft/multiline-concat" MultilineConcatTag = "draft/multiline-concat"
// draft/relaymsg:
RelaymsgTagName = "draft/relaymsg"
) )
func init() { func init() {

5
irc/handlers.go
View File

@ -2587,7 +2587,10 @@ func relaymsgHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *
// send msg // send msg
channelName := channel.Name() channelName := channel.Name()
relayTags := map[string]string{ relayTags := map[string]string{
"relaymsg": client.Nick(), caps.RelaymsgTagName: client.Nick(),
}
for t, v := range msg.ClientOnlyTags() {
relayTags[t] = v
} }
for _, member := range channel.Members() { for _, member := range channel.Members() {
for _, session := range member.Sessions() { for _, session := range member.Sessions() {

2
irctest

@ -1 +1 @@
Subproject commit 307722fbecc5ab69ee3246153b8f8f91ad830830 Subproject commit b58fe44b5b36e9bf07af9b5a0033455524e2b456