pew
/
phenny
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/sbp/phenny 

Conflicts:
	irc.py
	modules/oblique.py
	modules/startup.py
master
mutantmonkey 2012-02-17 22:10:05 -05:00
parent f1e523e9bd 6198b30d76
commit 09e26155ce
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
irc.py
View File

@ -51,7 +51,7 @@ class Bot(asynchat.async_chat):
# asynchat.async_chat.push(self, *args, **kargs) # asynchat.async_chat.push(self, *args, **kargs)
def __write(self, args, text=None): def __write(self, args, text=None):
# print '%r %r %r' % (self, args, text) # print 'PUSH: %r %r %r' % (self, args, text)
try: try:
if text is not None: if text is not None:
# 510 because CR and LF count too, as nyuszika7h points out # 510 because CR and LF count too, as nyuszika7h points out

2
modules/oblique.py
View File

@ -43,6 +43,8 @@ def service(phenny, input, command, args):
lines = bytes.splitlines() lines = bytes.splitlines()
if not lines: if not lines:
return phenny.reply("Sorry, the service didn't respond any output.") return phenny.reply("Sorry, the service didn't respond any output.")
try: line = lines[0].encode('utf-8')[:350]
except: line = lines[0][:250]
phenny.say(lines[0][:350]) phenny.say(lines[0][:350])
def refresh(phenny): def refresh(phenny):

3
modules/startup.py
View File

@ -58,11 +58,12 @@ def startup(phenny, input):
if hasattr(phenny.config, 'password'): if hasattr(phenny.config, 'password'):
phenny.msg('NickServ', 'IDENTIFY %s' % 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 # Cf. http://swhack.com/logs/2005-12-05#T19-32-36
for channel in phenny.channels: for channel in phenny.channels:
phenny.write(('JOIN', channel)) phenny.write(('JOIN', channel))
time.sleep(0.5)
startup.rule = r'(.*)' startup.rule = r'(.*)'
startup.event = '251' startup.event = '251'
startup.priority = 'low' startup.priority = 'low'

3
phenny
View File

@ -123,7 +123,8 @@ def main(argv=None):
# Step Two: Check Dependencies # Step Two: Check Dependencies
check_python_version() # require python2.4 or later check_python_version() # require python2.4 or later
check_dotdir() # require ~/.phenny, or make it and exit if not opts.config:
check_dotdir() # require ~/.phenny, or make it and exit
# Step Three: Load The Configurations # Step Three: Load The Configurations