GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-15 00:19:29 +01:00
Code Issues Projects Releases Wiki 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
irc/server.go
View File

@ -972,25 +972,28 @@ func (server *Server) GetHistorySequence(providedChannel *Channel, client *Clien
} }
var cutoff time.Time var cutoff time.Time
if config.History.Restrictions.ExpireTime != 0 { // #1593: cutoff is ignored for operators
cutoff = time.Now().UTC().Add(-time.Duration(config.History.Restrictions.ExpireTime)) if !client.HasRoleCapabs("history") {
} if config.History.Restrictions.ExpireTime != 0 {
// #836: registration date cutoff is always enforced for DMs cutoff = time.Now().UTC().Add(-time.Duration(config.History.Restrictions.ExpireTime))
// either way, take the later of the two cutoffs
if restriction == HistoryCutoffRegistrationTime || channel == nil {
regCutoff := client.historyCutoff()
if regCutoff.After(cutoff) {
cutoff = regCutoff
} }
} else if restriction == HistoryCutoffJoinTime { // #836: registration date cutoff is always enforced for DMs
if joinTimeCutoff.After(cutoff) { // either way, take the later of the two cutoffs
cutoff = joinTimeCutoff if restriction == HistoryCutoffRegistrationTime || channel == nil {
regCutoff := client.historyCutoff()
if regCutoff.After(cutoff) {
cutoff = regCutoff
}
} else if restriction == HistoryCutoffJoinTime {
if joinTimeCutoff.After(cutoff) {
cutoff = joinTimeCutoff
}
} }
}
// #836 again: grace period is never applied to DMs // #836 again: grace period is never applied to DMs
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 {