support multiple strings as counting as nick highlights

also, treat @nicks as being addressed, since we are doing discord
through bitlbee now

ircbot/bot.py

@@ -163,8 +163,8 @@ class DrReactor(irc.client.Reactor):
                 event.original_msg = what
 
                 # check if we were addressed or not
-                my_nick = connection.get_nickname()
-                addressed_pattern = r'^{0:s}[:,]\s+(?P<addressed_msg>.*)'.format(my_nick)
+                all_nicks = '|'.join(settings.ADDITIONAL_NICK_MATCHES + [connection.get_nickname()])
+                addressed_pattern = r'^(({nicks})[:,]|@({nicks}))\s+(?P<addressed_msg>.*)'.format(nicks=all_nicks)
                 match = re.match(addressed_pattern, what, re.IGNORECASE)
                 if match:
                     event.addressed = True