Browse Source

Merge pull request #1988 from mogad0n/fix/ubanlistduration

/UBAN LIST explicitly states 'indefinite' durations for Klines/Dlines
tags/v2.11.0-rc1
Shivaram Lingamneni 1 year ago
parent
commit
594991d6cc
No account linked to committer's email address
1 changed files with 1 additions and 4 deletions
  1. 1
    4
      irc/handlers.go

+ 1
- 4
irc/handlers.go View File

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

Loading…
Cancel
Save