From 751a3ef921a515726c5b43a51fd8f9a77802813d Mon Sep 17 00:00:00 2001 From: nyuszika7h Date: Sun, 18 Dec 2011 14:21:46 +0100 Subject: [PATCH] Unix: Make configuration variable fortune.short channel-specific --- plugins/Unix/config.py | 2 +- plugins/Unix/plugin.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/Unix/config.py b/plugins/Unix/config.py index f37cf37e1..1fd8e7196 100644 --- a/plugins/Unix/config.py +++ b/plugins/Unix/config.py @@ -58,7 +58,7 @@ conf.registerGroup(Unix, 'fortune') conf.registerGlobalValue(Unix.fortune, 'command', registry.String(utils.findBinaryInPath('fortune') or '', _("""Determines what command will be called for the fortune command."""))) -conf.registerGlobalValue(Unix.fortune, 'short', +conf.registerChannelValue(Unix.fortune, 'short', registry.Boolean(True, _("""Determines whether only short fortunes will be used if possible. This sends the -s option to the fortune program."""))) conf.registerGlobalValue(Unix.fortune, 'equal', diff --git a/plugins/Unix/plugin.py b/plugins/Unix/plugin.py index ef46eacbc..c70d86f13 100644 --- a/plugins/Unix/plugin.py +++ b/plugins/Unix/plugin.py @@ -196,10 +196,11 @@ class Unix(callbacks.Plugin): Returns a fortune from the *nix fortune program. """ + channel = msg.args[0] fortuneCmd = self.registryValue('fortune.command') if fortuneCmd: args = [fortuneCmd] - if self.registryValue('fortune.short'): + if self.registryValue('fortune.short', channel): args.append('-s') if self.registryValue('fortune.equal'): args.append('-e')