aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/channel_op.py4
-rw-r--r--modules/ducks.py4
-rw-r--r--modules/permissions/__init__.py5
-rw-r--r--modules/shorturl.py2
4 files changed, 7 insertions, 8 deletions
diff --git a/modules/channel_op.py b/modules/channel_op.py
index b4161f6c..cb4f32e0 100644
--- a/modules/channel_op.py
+++ b/modules/channel_op.py
@@ -13,8 +13,8 @@ KICK_REASON_SETTING = utils.Setting("default-kick-reason",
@utils.export("channelset", utils.Setting("ban-format",
"Set ban format ($n = nick, $u = username, $h = hostname)",
example="*!$u@$h"))
-@utils.export("serverset", utils.OptionsSetting("mute-method",
- ["qmode", "insp", "unreal", "none"],
+@utils.export("serverset", utils.OptionsSetting(
+ ["qmode", "insp", "unreal", "none"], "mute-method",
"Set this server's method of muting users"))
@utils.export("botset", KICK_REASON_SETTING)
@utils.export("serverset", KICK_REASON_SETTING)
diff --git a/modules/ducks.py b/modules/ducks.py
index d3708d08..8fb62ebf 100644
--- a/modules/ducks.py
+++ b/modules/ducks.py
@@ -11,8 +11,8 @@ DEFAULT_MIN_MESSAGES = 100
@utils.export("channelset", utils.BoolSetting("ducks-enabled",
"Whether or not to spawn ducks"))
-@utils.export("channelset", utils.IntSetting("ducks-min-messages",
- "Minimum messages between ducks spawning", example="50"))
+@utils.export("channelset", utils.IntRangeSetting(50, 200, "ducks-min-messages",
+ "Minimum messages between ducks spawning"))
@utils.export("channelset", utils.BoolSetting("ducks-kick",
"Whether or not to kick someone talking to non-existent ducks"))
class Module(ModuleManager.BaseModule):
diff --git a/modules/permissions/__init__.py b/modules/permissions/__init__.py
index f1949b9a..ce259319 100644
--- a/modules/permissions/__init__.py
+++ b/modules/permissions/__init__.py
@@ -9,9 +9,8 @@ REQUIRES_IDENTIFY = "You need to be identified to use that command"
REQUIRES_IDENTIFY_INTERNAL = ("You need to be identified to use that command "
"(/msg %s register | /msg %s identify)")
-@utils.export("serverset", utils.OptionsSetting("identity-mechanism",
- ["internal", "ircv3-account"],
- "Set the identity mechanism for this server"))
+@utils.export("serverset", utils.OptionsSetting(["internal", "ircv3-account"],
+ "identity-mechanism", "Set the identity mechanism for this server"))
class Module(ModuleManager.BaseModule):
@utils.hook("new.user")
def new_user(self, event):
diff --git a/modules/shorturl.py b/modules/shorturl.py
index 77a9a352..e18cdcfd 100644
--- a/modules/shorturl.py
+++ b/modules/shorturl.py
@@ -13,7 +13,7 @@ class Module(ModuleManager.BaseModule):
self.exports.add("shorturl-s-bitly", self._bitly)
- setting = utils.OptionsSetting("url-shortener", [],
+ setting = utils.OptionsSetting([], "url-shortener",
"Set URL shortener service",
options_factory=self._shorturl_options_factory)
self.exports.add("channelset", setting)