CEF/ergo
1
0
Fork 0
forked from External/ergo
Code Pull requests Activity

fix #836

Browse source
This commit is contained in:
Shivaram Lingamneni 2020-03-01 03:39:25 -05:00
parent 98efaf25e9
commit 3e01e9995b
3 changed files with 39 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
irc/server.go
View file

@ -919,14 +919,16 @@ func (server *Server) GetHistorySequence(providedChannel *Channel, client *Clien
if config.History.Restrictions.ExpireTime != 0 {
cutoff = time.Now().UTC().Add(-time.Duration(config.History.Restrictions.ExpireTime))
}
if config.History.Restrictions.EnforceRegistrationDate {
// #836: registration date cutoff is always enforced for DMs
if config.History.Restrictions.EnforceRegistrationDate || channel == nil {
regCutoff := client.historyCutoff()
// take the later of the two cutoffs
if regCutoff.After(cutoff) {
cutoff = regCutoff
}
}
if !cutoff.IsZero() {
// #836 again: grace period is never applied to DMs
if !cutoff.IsZero() && channel != nil {
cutoff = cutoff.Add(-time.Duration(config.History.Restrictions.GracePeriod))
}