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

Merge pull request #975 from GLolol/topic-remove-commalist

Browse Source 
Topic: in 'topic.remove', allow specifying multiple topic numbers to remove
This commit is contained in:
Valentin Lorentz 2014-12-27 08:39:17 +01:00
commit ecb4ab0487
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/Topic/plugin.py
View File

@ -460,10 +460,10 @@ class Topic(callbacks.Plugin):
rest(('topic', False))]) rest(('topic', False))])
@internationalizeDocstring @internationalizeDocstring
def remove(self, irc, msg, args, channel, number): def remove(self, irc, msg, args, channel, numbers):
"""[<channel>] <number> """[<channel>] <number1> [<number2> <number3>...]
Removes topic <number> from the topic for <channel> Topics are Removes topics <numbers> from the topic for <channel> Topics are
numbered starting from 1; you can also use negative indexes to refer numbered starting from 1; you can also use negative indexes to refer
to topics starting the from the end of the topic. <channel> is only to topics starting the from the end of the topic. <channel> is only
necessary if the message isn't sent in the channel itself. necessary if the message isn't sent in the channel itself.
@ -472,9 +472,15 @@ class Topic(callbacks.Plugin):
capabilities = self.registryValue('requireManageCapability') capabilities = self.registryValue('requireManageCapability')
irc.errorNoCapability(capabilities, Raise=True) irc.errorNoCapability(capabilities, Raise=True)
topics = self._splitTopic(irc.state.getTopic(channel), channel) topics = self._splitTopic(irc.state.getTopic(channel), channel)
topic = topics.pop(number) numbers = set(numbers)
for n in numbers:
# Equivalent of marking the topic for deletion; there's no
# simple, easy way of removing multiple items from a list.
# pop() will shift the indices after every run.
topics[n] = ''
topics = [topic for topic in topics if topic != '']
self._sendTopics(irc, channel, topics) self._sendTopics(irc, channel, topics)
remove = wrap(remove, ['canChangeTopic', 'topicNumber']) remove = wrap(remove, ['canChangeTopic', many('topicNumber')])
@internationalizeDocstring @internationalizeDocstring
def lock(self, irc, msg, args, channel): def lock(self, irc, msg, args, channel):

11
plugins/Topic/test.py
View File

@ -42,6 +42,17 @@ class TopicTestCase(ChannelPluginTestCase):
self.assertNotError('topic remove 1') self.assertNotError('topic remove 1')
self.assertError('topic remove 1') self.assertError('topic remove 1')
def testRemoveMultiple(self):
self.assertError('topic remove 1 2')
_ = self.getMsg('topic add foo')
_ = self.getMsg('topic add bar')
_ = self.getMsg('topic add baz')
_ = self.getMsg('topic add derp')
_ = self.getMsg('topic add cheese')
self.assertNotError('topic remove 1 2')
self.assertNotError('topic remove -1 1')
self.assertError('topic remove -99 1')
def testReplace(self): def testReplace(self):
_ = self.getMsg('topic add foo') _ = self.getMsg('topic add foo')
_ = self.getMsg('topic add bar') _ = self.getMsg('topic add bar')