Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-01-30 22:24:20 +01:00
Code Issues Projects Releases Wiki Activity

Fixed some bugs with removetopic when the topic didn't match topicUnformatter.

Browse Source
This commit is contained in:
Jeremy Fincher 2003-09-06 05:25:42 +00:00
parent 1795229d85
commit 1ad3ec9914
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
plugins/Topic.py
View File

@ -160,13 +160,17 @@ class Topic(callbacks.Privmsg):
return return
topics = irc.state.getTopic(channel).split(self.topicSeparator) topics = irc.state.getTopic(channel).split(self.topicSeparator)
topic = topics.pop(number) topic = topics.pop(number)
(topic, name) = self.topicUnformatter.match(topic).groups() match = self.topicUnformatter.match(topic)
if match is None:
name = ''
else:
(topic, name) = match.groups()
try: try:
senderName = ircdb.users.getUserName(msg.prefix) senderName = ircdb.users.getUserName(msg.prefix)
except KeyError: except KeyError:
irc.error(msg, conf.replyNoUser) irc.error(msg, conf.replyNoUser)
return return
if name != senderName and \ if name and name != senderName and \
not ircdb.checkCapabilities(msg.prefix, ('op', 'admin')): not ircdb.checkCapabilities(msg.prefix, ('op', 'admin')):
irc.error(msg, 'You can only modify your own topics.') irc.error(msg, 'You can only modify your own topics.')
return return
@ -176,7 +180,13 @@ class Topic(callbacks.Privmsg):
irc.queueMsg(ircmsgs.topic(channel, newTopic)) irc.queueMsg(ircmsgs.topic(channel, newTopic))
def removetopic(self, irc, msg, args): def removetopic(self, irc, msg, args):
"[<channel>] (if not sent in the channel itself) <topic number>" """[<channel>] <number>
Removes topic <number> from the topic for <channel> Topics are
numbered starting from 0; you can also use negative indexes to refer
to topics starting the from the end of the topic. <channel> is only
necessary if the message isn't sent in the channel itself.
"""
channel = privmsgs.getChannel(msg, args) channel = privmsgs.getChannel(msg, args)
capability = ircdb.makeChannelCapability(channel, 'topic') capability = ircdb.makeChannelCapability(channel, 'topic')
try: try:
@ -186,14 +196,22 @@ class Topic(callbacks.Privmsg):
return return
if ircdb.checkCapability(msg.prefix, capability): if ircdb.checkCapability(msg.prefix, capability):
topics = irc.state.getTopic(channel).split(self.topicSeparator) topics = irc.state.getTopic(channel).split(self.topicSeparator)
try:
topic = topics.pop(number) topic = topics.pop(number)
except IndexError:
irc.error(msg, 'That\'s not a valid topic number.')
return
## debug.printf(topic) ## debug.printf(topic)
(topic, name) = self.topicUnformatter.match(topic).groups() match = self.topicUnformatter.match(topic)
if match is None:
name = ''
else:
(topic, name) = match.groups()
try: try:
username = ircdb.users.getUserName(msg.prefix) username = ircdb.users.getUserName(msg.prefix)
except KeyError: except KeyError:
username = msg.nick username = msg.nick
if name != username and \ if name and name != username and \
not ircdb.checkCapabilities(msg.prefix, ('op', 'admin')): not ircdb.checkCapabilities(msg.prefix, ('op', 'admin')):
irc.error(msg, 'You can only remove your own topics.') irc.error(msg, 'You can only remove your own topics.')
return return