ch = m.channel
else
ch = m.server.get_channel(param[:channel])
- return m.reply "I am not in channel #{ch}" unless ch
+ unless ch
+ m.reply("I am not in channel #{param[:channel]}")
+ return
+ end
end
cmd = param[:command]
- txt = param[:text].join(" ")
+ txt = param[:text].to_s
case cmd
when /^a(dd|ppend)$/
end
def topicsep(m, ch, txt)
+ return if !@bot.auth.allow?("topic::edit::separator", m.source, m.replyto)
if txt
sep = txt.strip
if sep != ""
end
def topicaddat(m, channel, num, txt)
+ return if !@bot.auth.allow?("topic::edit::add", m.source, m.replyto)
sep = getsep(channel)
topic = channel.topic.to_s
topicarray = topic.split(/\s+#{Regexp.escape(sep)}\s*/)
end
def topicdel(m, channel, num)
+ return if !@bot.auth.allow?("topic::edit::del", m.source, m.replyto)
sep = getsep(channel)
topic = channel.topic.to_s
topicarray = topic.split(/\s+#{Regexp.escape(sep)}\s*/)
end
def learntopic(m, channel)
- return if !@bot.auth.allow?("learntopic", m.source, m.replyto)
+ return if !@bot.auth.allow?("topic::store::store", m.source, m.replyto)
topic = channel.topic.to_s
k = channel.downcase
if @registry.has_key?(k)
end
def replacetopic(m, channel, num, txt)
- return if !@bot.auth.allow?("topic", m.source, m.replyto)
+ return if !@bot.auth.allow?("topic::edit::replace", m.source, m.replyto)
sep = getsep(channel)
- topic = @bot.channels[channel].topic.to_s
+ topic = channel.topic.to_s
topicarray = topic.split(/\s+#{Regexp.escape(sep)}\s*/)
topicarray[num] = txt
newtopic = topicarray.join(" #{sep} ")
end
def restoretopic(m, channel)
+ return if !@bot.auth.allow?("topic::store::restore", m.source, m.replyto)
return if !@bot.auth.allow?("restoretopic", m.source, m.replyto)
k = channel.downcase
if @registry.has_key?(k) && @registry[k].has_key?(:topic)
topic = @registry[k][:topic]
- @bot.topic channel, topic
+ topicset(m, channel, topic)
else
m.reply "I don't remember any topic for this channel"
end
end
def topicset(m, channel, text)
- return if !@bot.auth.allow?("topic", m.source, m.replyto)
+ return if !@bot.auth.allow?("topic::edit::replace", m.source, m.replyto)
@bot.topic channel, text
end
end
plugin = TopicPlugin.new
-plugin.map 'topic :command *text', :action => 'handletopic', :public => true, :private => false
-plugin.map 'topic :channel :command *text', :action => 'handletopic', :public => false, :private => true
+
+plugin.map 'topic :command [*text]', :action => 'handletopic', :public => true, :private => false
+plugin.map 'topic :channel :command [*text]', :action => 'handletopic', :public => false, :private => true
+
+plugin.default_auth('*', false)
+