From 11c12e9062b5b220171b93ded6a98ca70bd06205 Mon Sep 17 00:00:00 2001
From: Jeremy Fincher <jemfinch@users.sourceforge.net>
Date: Tue, 28 Dec 2004 01:10:31 +0000
Subject: [PATCH] Fixed bug #1091927, Topic.insert was doing the same thing as
 Topic.add.

---
 plugins/Topic.py   | 14 +++++++-------
 test/test_Topic.py |  6 ++++++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/plugins/Topic.py b/plugins/Topic.py
index 098f06334..9827acf3b 100644
--- a/plugins/Topic.py
+++ b/plugins/Topic.py
@@ -201,28 +201,28 @@ class Topic(callbacks.Privmsg):
         irc.reply(topic)
     topic = wrap(topic, ['inChannel'])
 
-    def add(self, irc, msg, args, channel, topic, insert=False):
+    def add(self, irc, msg, args, channel, topic):
         """[<channel>] <topic>
 
         Adds <topic> to the topics for <channel>.  <channel> is only necessary
         if the message isn't sent in the channel itself.
         """
         topics = self._splitTopic(irc.state.getTopic(channel), channel)
-        if insert:
-            topics.insert(0, topic)
-        else:
-            topics.append(topic)
+        topics.append(topic)
         self._sendTopics(irc, channel, topics)
     add = wrap(add, ['canChangeTopic', rest('topic')])
 
-    def insert(self, irc, msg, args):
+    def insert(self, irc, msg, args, channel, topic):
         """[<channel>] <topic>
 
         Adds <topic> to the topics for <channel> at the beginning of the topics
         currently on <channel>.  <channel> is only necessary if the message
         isn't sent in the channel itself.
         """
-        self.add(irc, msg, args, insert=True)
+        topics = self._splitTopic(irc.state.getTopic(channel), channel)
+        topics.insert(0, topic)
+        self._sendTopics(irc, channel, topics)
+    insert = wrap(insert, ['canChangeTopic', rest('topic')])
 
     def shuffle(self, irc, msg, args, channel):
         """[<channel>]
diff --git a/test/test_Topic.py b/test/test_Topic.py
index 9a5eb785a..9fab6cb3d 100644
--- a/test/test_Topic.py
+++ b/test/test_Topic.py
@@ -61,6 +61,12 @@ class TopicTestCase(ChannelPluginTestCase, PluginDocumentation):
         self.assertEqual(m.args[0], self.channel)
         self.assertEqual(m.args[1], 'foo (test) || bar (test)')
 
+    def testInsert(self):
+        m = self.getMsg('topic add foo')
+        self.assertEqual(m.args[1], 'foo (test)')
+        m = self.getMsg('topic insert bar')
+        self.assertEqual(m.args[1], 'bar (test) || foo (test)')
+
     def testChange(self):
         _ = self.getMsg('topic add foo')
         _ = self.getMsg('topic add bar')