GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-22 11:59:40 +01:00
Code Issues Projects Releases Wiki Activity

fix #1205

Browse Source
This commit is contained in:
Shivaram Lingamneni 2020-07-20 04:28:17 -04:00
parent a4343bf77d
commit e827bc0f9c
3 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
irc/handlers.go
View File

@ -3131,7 +3131,12 @@ func whowasHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Re
// ZNC <module> [params]
func zncHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool {
zncModuleHandler(client, msg.Params[0], msg.Params[1:], rb)
params := msg.Params[1:]
// #1205: compatibility with Palaver, which sends `ZNC *playback :play ...`
if len(params) == 1 && strings.IndexByte(params[0], ' ') != -1 {
params = strings.Fields(params[0])
}
zncModuleHandler(client, msg.Params[0], params, rb)
return false
}

3
irc/history/queries.go
View File

@ -7,8 +7,7 @@ import (
"time"
)
// Selector represents a parameter to a CHATHISTORY command;
// at most one of Msgid or Time may be nonzero
// Selector represents a parameter to a CHATHISTORY command
type Selector struct {
Msgid string
Time time.Time

46
irc/znc.go
View File

@ -53,6 +53,12 @@ func zncWireTimeToTime(str string) (result time.Time) {
return time.Unix(seconds, int64(fraction*1000000000)).UTC()
}
func timeToZncWireTime(t time.Time) (result string) {
secs := t.Unix()
nano := t.UnixNano() - (secs * 1000000000)
return fmt.Sprintf("%d.%d", secs, nano)
}
type zncPlaybackTimes struct {
start time.Time
end time.Time
@ -77,13 +83,25 @@ func (z *zncPlaybackTimes) ValidFor(target string) bool {
}
// https://wiki.znc.in/Playback
func zncPlaybackHandler(client *Client, command string, params []string, rb *ResponseBuffer) {
if len(params) == 0 {
return
}
switch strings.ToLower(params[0]) {
case "play":
zncPlaybackPlayHandler(client, command, params, rb)
case "list":
zncPlaybackListHandler(client, command, params, rb)
default:
return
}
}
// PRIVMSG *playback :play <target> [lower_bound] [upper_bound]
// e.g., PRIVMSG *playback :play * 1558374442
func zncPlaybackHandler(client *Client, command string, params []string, rb *ResponseBuffer) {
func zncPlaybackPlayHandler(client *Client, command string, params []string, rb *ResponseBuffer) {
if len(params) < 2 || len(params) > 4 {
return
} else if strings.ToLower(params[0]) != "play" {
return
}
targetString := params[1]
@ -123,6 +141,9 @@ func zncPlaybackHandler(client *Client, command string, params []string, rb *Res
if params[1] == "*" {
zncPlayPrivmsgs(client, rb, "*", start, end)
} else if params[1] == "*self" {
zncPlayPrivmsgs(client, rb, "*", start, end)
targets = make(StringSet) // XXX non-nil but empty channel set means "no channels"
} else {
targets = make(StringSet)
for _, targetName := range strings.Split(targetString, ",") {
@ -169,3 +190,22 @@ func zncPlayPrivmsgs(client *Client, rb *ResponseBuffer, target string, after, b
client.replayPrivmsgHistory(rb, items, "", true)
}
}
// PRIVMSG *playback :list
func zncPlaybackListHandler(client *Client, command string, params []string, rb *ResponseBuffer) {
nick := client.Nick()
for _, channel := range client.Channels() {
_, sequence, err := client.server.GetHistorySequence(channel, client, "")
if err != nil {
client.server.logger.Error("internal", "couldn't get history sequence for ZNC list", err.Error())
continue
}
items, _, err := sequence.Between(history.Selector{}, history.Selector{}, 1) // i.e., LATEST * 1
if err != nil {
client.server.logger.Error("internal", "couldn't query history for ZNC list", err.Error())
} else if len(items) != 0 {
stamp := timeToZncWireTime(items[0].Message.Time)
rb.Add(nil, "*playback!znc@znc.in", "PRIVMSG", nick, fmt.Sprintf("%s 0 %s", channel.Name(), stamp))
}
}
}