From d0a484c11c8155b0b5361623b1867bade9d2e962 Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval+git@progval.net>
Date: Thu, 20 Oct 2022 18:35:58 +0200
Subject: [PATCH] Sort remaining nondeterministc sets of values

Closes GH-1516
---
 plugins/Protector/config.py | 1 +
 plugins/RSS/config.py       | 2 +-
 plugins/Relay/config.py     | 2 ++
 plugins/Services/config.py  | 1 +
 src/ircdb.py                | 2 +-
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/Protector/config.py b/plugins/Protector/config.py
index 7f0dbb179..2a90b0887 100644
--- a/plugins/Protector/config.py
+++ b/plugins/Protector/config.py
@@ -50,6 +50,7 @@ conf.registerChannelValue(Protector, 'enable',
 
 class ImmuneNicks(conf.ValidNicks):
     List = ircutils.IrcSet
+    sorted = True
 
 conf.registerChannelValue(Protector, 'immune',
     ImmuneNicks([], _("""Determines what nicks the bot will consider to
diff --git a/plugins/RSS/config.py b/plugins/RSS/config.py
index 16d0404bc..7702ebd9d 100644
--- a/plugins/RSS/config.py
+++ b/plugins/RSS/config.py
@@ -43,7 +43,7 @@ def configure(advanced):
     conf.registerPlugin('RSS', True)
 
 
-class FeedNames(registry.SpaceSeparatedListOfStrings):
+class FeedNames(registry.SpaceSeparatedSetOfStrings):
     List = callbacks.CanonicalNameSet
 
 class FeedItemSortOrder(registry.OnlySomeStrings):
diff --git a/plugins/Relay/config.py b/plugins/Relay/config.py
index 3c3f70fa1..8f2d3bf8b 100644
--- a/plugins/Relay/config.py
+++ b/plugins/Relay/config.py
@@ -50,10 +50,12 @@ def configure(advanced):
 class Ignores(registry.SpaceSeparatedListOf):
     List = ircutils.IrcSet
     Value = conf.ValidHostmask
+    sorted = True
     
 class Networks(registry.SpaceSeparatedListOf):
     List = ircutils.IrcSet
     Value = registry.String
+    sorted = True
 
 Relay = conf.registerPlugin('Relay')
 conf.registerChannelValue(Relay, 'color',
diff --git a/plugins/Services/config.py b/plugins/Services/config.py
index 37e007e62..3c324812d 100644
--- a/plugins/Services/config.py
+++ b/plugins/Services/config.py
@@ -64,6 +64,7 @@ class ValidNickOrEmptyString(registry.String):
 
 class ValidNickSet(conf.ValidNicks):
     List = ircutils.IrcSet
+    sorted = True
 
 Services = conf.registerPlugin('Services')
 conf.registerNetworkValue(Services, 'nicks',
diff --git a/src/ircdb.py b/src/ircdb.py
index f48b633ea..e3124fd07 100644
--- a/src/ircdb.py
+++ b/src/ircdb.py
@@ -1314,7 +1314,7 @@ def checkCapabilities(hostmask, capabilities, requireAll=False):
 # supybot.capabilities
 ###
 
-class SpaceSeparatedListOfCapabilities(registry.SpaceSeparatedListOfStrings):
+class SpaceSeparatedListOfCapabilities(registry.SpaceSeparatedSetOfStrings):
     __slots__ = ()
     List = CapabilitySet