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

fix handling of history grace periods

This commit is contained in:
Shivaram Lingamneni 2020-02-24 05:44:55 -05:00
parent 7b10902181
commit 891da73e56
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
irc/server.go
View File

@ -913,12 +913,14 @@ func (server *Server) GetHistorySequence(providedChannel *Channel, client *Clien
} }
if config.History.Restrictions.EnforceRegistrationDate { if config.History.Restrictions.EnforceRegistrationDate {
regCutoff := client.historyCutoff() regCutoff := client.historyCutoff()
regCutoff.Add(-time.Duration(config.History.Restrictions.GracePeriod)) // take the later of the two cutoffs
// take the earlier of the two cutoffs
if regCutoff.After(cutoff) { if regCutoff.After(cutoff) {
cutoff = regCutoff cutoff = regCutoff
} }
} }
if !cutoff.IsZero() {
cutoff = cutoff.Add(-time.Duration(config.History.Restrictions.GracePeriod))
}
if hist != nil { if hist != nil {
sequence = hist.MakeSequence(recipient, cutoff) sequence = hist.MakeSequence(recipient, cutoff)
} else if recipient != "" { } else if recipient != "" {