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

Merge pull request #1955 from slingamn/history_privs

Browse source 
exempt operators from history cutoffs
This commit is contained in:
Shivaram Lingamneni 2022-05-13 02:04:56 -04:00 • committed by GitHub
commit d6d5bbe27b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
irc/server.go
View file

@ -972,6 +972,8 @@ func (server *Server) GetHistorySequence(providedChannel *Channel, client *Clien
} }
var cutoff time.Time var cutoff time.Time
// #1593: cutoff is ignored for operators
if !client.HasRoleCapabs("history") {
if config.History.Restrictions.ExpireTime != 0 { if config.History.Restrictions.ExpireTime != 0 {
cutoff = time.Now().UTC().Add(-time.Duration(config.History.Restrictions.ExpireTime)) cutoff = time.Now().UTC().Add(-time.Duration(config.History.Restrictions.ExpireTime))
} }
@ -992,6 +994,7 @@ func (server *Server) GetHistorySequence(providedChannel *Channel, client *Clien
if !cutoff.IsZero() && channel != nil && restriction != HistoryCutoffJoinTime { if !cutoff.IsZero() && channel != nil && restriction != HistoryCutoffJoinTime {
cutoff = cutoff.Add(-time.Duration(config.History.Restrictions.GracePeriod)) cutoff = cutoff.Add(-time.Duration(config.History.Restrictions.GracePeriod))
} }
}
if hist != nil { if hist != nil {
sequence = hist.MakeSequence(correspondent, cutoff) sequence = hist.MakeSequence(correspondent, cutoff)