3
0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-22 03:49:27 +01:00

Merge pull request #1988 from mogad0n/fix/ubanlistduration

/UBAN LIST explicitly states 'indefinite' durations for Klines/Dlines
This commit is contained in:
Shivaram Lingamneni 2022-08-20 21:51:01 -07:00 committed by GitHub
commit 594991d6cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -897,10 +897,7 @@ func formatBanForListing(client *Client, key string, info IPBanInfo) string {
if info.OperReason != "" && info.OperReason != info.Reason {
desc = fmt.Sprintf("%s | %s", info.Reason, info.OperReason)
}
if info.Duration != 0 {
desc = fmt.Sprintf("%s [%s]", desc, info.TimeLeft())
}
desc = fmt.Sprintf("%s added on [%s]", desc, info.TimeCreated.UTC().Format(time.RFC1123))
desc = fmt.Sprintf("%s [%s] added on [%s]", desc, info.TimeLeft(), info.TimeCreated.UTC().Format(time.RFC1123))
banType := "Ban"
if info.RequireSASL {
banType = "SASL required"