diff --git a/config.py b/config.py index eb8f9bc..6477aa5 100644 --- a/config.py +++ b/config.py @@ -2,8 +2,8 @@ NAME = "brathuhn" SRV = "n0g.at" PWD = "123huhn" -#ROOM = "gladio@conference.n0g.at" -#PWD_ROOM = "secret" +ROOM = "gladio@conference.n0g.at" +PWD_ROOM = "secret" -ROOM = "debug@conference.n0g.at" -PWD_ROOM = "" +#ROOM = "debug@conference.n0g.at" +#PWD_ROOM = "" diff --git a/logger.py b/logger.py index a99d9b6..02bcbbc 100644 --- a/logger.py +++ b/logger.py @@ -42,7 +42,7 @@ def start_log(msg,args): def message_logger(mfrom,msg): for key in user_logs: - user_logs[key].write(mfrom+": "+msg+"\n") + user_logs[key].write(unicode(mfrom)+": "+msg+"\n") def status_logger(mfrom,msg,status): for key in user_logs: diff --git a/main.py b/main.py index 5f21d15..74e26f1 100755 --- a/main.py +++ b/main.py @@ -48,6 +48,25 @@ def choose(msg,args): brathuhn.sendMsg(brathuhn.ROOM,args[1+random.randint(0,len(args[1:])-1)],'groupchat') brathuhn.addCommand("choose","Usage: !choose item_1 item_2 ... item_n",choose) +kraken_img = """ + _,.---. ,''-._ + Release the kraken! ;- X ,/-- \\ + / \\ ' `. : + | \\ / | | ) + ,''-..--'\\ \\....-'__ ' + / .-...--'': ,. , _.-'O,' + .'/ _O_ O / /O)\\ \\''-O,-' + [\\_ .' /,' ,+-'._/O/ / /_ + \\/'-' :/ ' '`'''''`+ + _;._.:...""" + + +def kraken(mfrom,msg): + if "kraken" in msg.lower() and not brathuhn.room_nick in mfrom: + for line in kraken_img.split('\n'): + brathuhn.sendMonoMsg(brathuhn.ROOM,line,'groupchat') +brathuhn.addGroupListener(kraken) + brathuhn.connect_and_join() brathuhn.loop()