diff options
Diffstat (limited to 'modules')
-rwxr-xr-x | modules/oblique.py | 4 | ||||
-rwxr-xr-x | modules/startup.py | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/modules/oblique.py b/modules/oblique.py index 7bd6718..d93446e 100755 --- a/modules/oblique.py +++ b/modules/oblique.py @@ -43,7 +43,9 @@ def service(phenny, input, command, args): lines = bytes.splitlines() if not lines: return phenny.reply("Sorry, the service didn't respond any output.") - phenny.say(lines[0][:350]) + try: line = lines[0].encode('utf-8')[:350] + except: line = lines[0][:250] + phenny.say(line) def refresh(phenny): if hasattr(phenny.config, 'services'): diff --git a/modules/startup.py b/modules/startup.py index 48c5fc9..297dfb5 100755 --- a/modules/startup.py +++ b/modules/startup.py @@ -53,16 +53,19 @@ def setup(phenny): phenny.handle_connect = outer_handle_connect def startup(phenny, input): + import time + if hasattr(phenny.config, 'serverpass'): phenny.write(('PASS', phenny.config.serverpass)) if hasattr(phenny.config, 'password'): phenny.msg('NickServ', 'IDENTIFY %s' % phenny.config.password) - __import__('time').sleep(5) + time.sleep(5) # Cf. http://swhack.com/logs/2005-12-05#T19-32-36 for channel in phenny.channels: phenny.write(('JOIN', channel)) + time.sleep(0.5) startup.rule = r'(.*)' startup.event = '251' startup.priority = 'low' |