if cfs.empty?
m.reply _("no config key found matching %{r}") % { :r => params[:rx].to_s}
else
- m.reply _("possible keys: %{kl}") % { :kl => cfs.map { |c| c.first}.join(', ') } if cfs.length > 1
+ m.reply _("possible keys: %{kl}") % { :kl => cfs.map { |c| c.first}.sort.join(', ') } if cfs.length > 1
m.reply cfs.map { |c| c.join(': ') }.join("\n")
end
end
def handle_add(m, params)
key = params[:key].to_s.intern
- value = params[:value]
+ values = params[:value].to_s.split(/,\s+/)
unless @bot.config.items.has_key?(key)
m.reply _("no such config key %{key}") % {:key => key}
return
return
end
return if !@bot.auth.allow?(@bot.config.items[key].auth_path, m.source, m.replyto)
- begin
- @bot.config.items[key].add(value)
- rescue ArgumentError => e
- m.reply _("failed to add %{value} to %{key}: %{error}") % {:value => value, :key => key, :error => e.message}
- return
+ values.each do |value|
+ begin
+ @bot.config.items[key].add(value)
+ rescue ArgumentError => e
+ m.reply _("failed to add %{value} to %{key}: %{error}") % {:value => value, :key => key, :error => e.message}
+ next
+ end
end
handle_get(m,{:key => key})
m.reply _("this config change will take effect on the next restart") if @bot.config.items[key].requires_restart
def handle_rm(m, params)
key = params[:key].to_s.intern
- value = params[:value]
+ values = params[:value].to_s.split(/,\s+/)
unless @bot.config.items.has_key?(key)
m.reply _("no such config key %{key}") % {:key => key}
return
return
end
return if !@bot.auth.allow?(@bot.config.items[key].auth_path, m.source, m.replyto)
- begin
- @bot.config.items[key].rm(value)
- rescue ArgumentError => e
- m.reply _("failed to remove %{value} from %{key}: %{error}") % {:value => value, :key => key, :error => e.message}
- return
+ values.each do |value|
+ begin
+ @bot.config.items[key].rm(value)
+ rescue ArgumentError => e
+ m.reply _("failed to remove %{value} from %{key}: %{error}") % {:value => value, :key => key, :error => e.message}
+ next
+ end
end
handle_get(m,{:key => key})
m.reply _("this config change will take effect on the next restart") if @bot.config.items[key].requires_restart
def bot_nick(m, param)
@bot.nickchg(param[:nick])
+ @bot.wanted_nick = param[:nick]
end
def bot_status(m, param)
when "desc"
_("config desc <key> => describe what key <key> configures")
when "add"
- _("config add <value> to <key> => add value <value> to key <key> if <key> is an array")
+ _("config add <values> to <key> => add values <values> to key <key> if <key> is an array")
when "rm"
_("config rm <value> from <key> => remove value <value> from key <key> if <key> is an array")
else
conf.map 'config set :key *value',
:action => 'handle_set',
:auth_path => 'edit'
-conf.map 'config add :value to :key',
+conf.map 'config add *value to :key',
:action => 'handle_add',
:auth_path => 'edit'
-conf.map 'config rm :value from :key',
+conf.map 'config rm *value from :key',
+ :action => 'handle_rm',
+ :auth_path => 'edit'
+conf.map 'config remove *value from :key',
:action => 'handle_rm',
:auth_path => 'edit'
-conf.map 'config del :value from :key',
+conf.map 'config del *value from :key',
:action => 'handle_rm',
:auth_path => 'edit'
-conf.map 'config delete :value from :key',
+conf.map 'config delete *value from :key',
:action => 'handle_rm',
:auth_path => 'edit'
conf.map 'config unset :key',