Merge pull request CloudBotIRC#185 from linuxdaemon/gonzobot+fix-herald-display

Fix accidentally only showing the first character of a herald

Author: edwardslabs

plugins/herald.py

@@ -3,7 +3,7 @@
 import time
 from collections import defaultdict
 
-from sqlalchemy import Table, Column, String, PrimaryKeyConstraint, select
+from sqlalchemy import Table, Column, String, PrimaryKeyConstraint
 
 from cloudbot import hook
 from cloudbot.util import database
@@ -48,7 +48,7 @@ def herald(text, nick, chan, db, reply):
         db.execute(query)
         db.commit()
 
-        reply("greeting \'{}\' for {} has been removed".format(greeting[0], nick))
+        reply("greeting \'{}\' for {} has been removed".format(greeting, nick))
 
         load_cache(db)
     else:
@@ -101,7 +101,7 @@ def welcome(nick, message, bot, chan):
 
     welcome = herald_cache[chan.casefold()].get(nick.casefold())
     if welcome:
-        greet = welcome[0]
+        greet = welcome
         stripped = greet.translate(dict.fromkeys(["\u200b", " ", "\u202f", "\x02"]))
         stripped = colors_re.sub("", stripped)
         greet = re.sub(bino_re, 'flenny', greet)