INSTALL.txt | 2 +- README | 6 +- doc/Changelog | 455 ---------------------------------------------------- doc/FAQ | 8 - doc/URL | 10 -- doc/reporting_bugs | 2 +- msn | 7 +- msncb.py | 8 +- msnlib.py | 13 +- msnsetup | 2 +- setup.py | 6 +- utils/hmerge | 3 +- utils/msnbot | 13 +- utils/msnlog.vim | 2 +- utils/msnsbot | 278 ++++++++++++++++++++++++++++++++ utils/msntk | 5 +- 16 files changed, 313 insertions(+), 507 deletions(-) diff --git a/INSTALL.txt b/INSTALL.txt index cb05367..16abdd9 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -32,6 +32,6 @@ msn I would really like to hear your opinion, so please drop any comments to -msnlib-devel@auriga.wearlab.de. +albertito@blitiri.com.ar. diff --git a/README b/README index 1c79b57..746a6cf 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ msnlib -Alberto Bertogli (albertogli@telpin.com.ar) +Alberto Bertogli (albertito@blitiri.com.ar) ---------------------------------------------- This is a python implementation for the msn messenger protocol (version 8), @@ -33,8 +33,8 @@ want to check out the doc directory; specially if you use a non-UNIX platform, take a look at the 'portability' file. -Comments and patches are always welcome; please send them to the mailing list, -msnlib-devel@auriga.wearlab.de. +Comments and patches are always welcome; please send them to +albertito@blitiri.com.ar. Thanks, Alberto diff --git a/doc/Changelog b/doc/Changelog deleted file mode 100644 index 65742d5..0000000 --- a/doc/Changelog +++ /dev/null @@ -1,455 +0,0 @@ -10 Mar 05 00.34.03 - Alberto - * msn: fix documentation for the add command. - -27 Jun 04 14.12.24 - Alberto - * msntk: fixes from the console client. - -29 Mar 04 23.55.18 - Alberto - * tag: 3.4 tag - -22 Mar 04 17.45.29 - Alberto - * msn: change initial status after we got the full user list; this should fix - the problem that all the list appeared offline, but it needs testing - -21 Mar 04 21.43.39 - Alberto - * msn: remove space after the first line which that messed up NetBSD. Thanks - to Cameron Kaiser. - * msn: allow Ctrl+U to clear the command line. Patch by Cameron Kaiser. - -01 Mar 04 04.33.38 - Alberto - * msn: add 'ren' command to rename users - -20 Dec 03 22.29.01 - Alberto - * msn: handle a crash when typing space and tab by doing proper param - checking in tab handling - -10 Dec 03 23.16.52 - Alberto - * doc: update license to OSL v2.0 - -13 Nov 03 11.47.09 - Alberto - * msncb, msn: add more information to XFRError to see if we can get what is - causing it - -12 Nov 03 13.13.27 - Alberto - * doc: update URL - -12 Nov 03 12.52.27 - Alberto - * tag: 3.3 tag - -12 Nov 03 00.06.32 - Alberto - * msn: handle socket exceptions more properly so we cleanup the console on - the exit path even when the md is down - -11 Nov 03 23.35.05 - Alberto - * msnlib: handle some server errors while logging in - -08 Nov 03 18.29.47 - Alberto - * msn: handle \r input for mac keyboards - -03 Nov 03 20.19.07 - Alberto - * msntk: add msntk, a tk-based client - -30 Oct 03 02.48.30 - Alberto - * doc: various small updates - -29 Oct 03 22.46.13 - Alberto - * msn: fix a crash when passing an unknown nick to block/unblock - * msn: do proper nick checking in lignore - -28 Oct 03 23.13.56 - Alberto - * msn: fix a crash when the configuration file was passed as a parameter - -27 Oct 03 12.49.14 - Alberto - * msnlib: do proper connect() checking using getsockopt() - * msnlib: fix user.__repr__() - -18 Oct 03 10.12.12 - Alberto - * msn: mark blocked users in listings - * msn: use string.join() for multi-user chat filenames - * msnlib: remove FIXME from message lenght check; the way it's done is safe - * msnlib: allow sendmsg to get a destination sbd directly - -30 Sep 03 15.06.19 - Alberto - * doc: upgrade documentation to reflect the need for at least Python 2.2.2 - * doc: minor change to TODO list - -29 Sep 03 09.17.33 - Alberto - * tag: 3.2 tag - -28 Sep 03 11.39.59 - Alberto - * msn: handle some Hotmail messages, now we display unread mail and new mail - notifications - * msnsetup: display profile name in the final message - * msn: implement multi-user chat logging, so now chats that involve multiple - users get logged properly to a different file - * msnlib: fix the login procedure to handle redirects properly, and clean up - and comment the code so we don't get lost in the parsing - -28 Sep 03 10.01.35 - Alberto - * tag: 3.1 tag - -28 Sep 03 09.59.14 - Alberto - * msnlib: fix SSL error handling, now raise the error properly - -27 Sep 03 15.58.21 - Alberto - * msn: ignore gaim's x-clientcaps messages - * msn: allow spaces in nick - -25 Sep 03 23.02.38 - Alberto - * msn: fix crashes when sending a null message - * msn: fix message content mangling when the first character matched the nick - -24 Sep 03 14.29.17 - Alberto - * tag: 3.0 - * doc: small updates - -22 Sep 03 23.55.26 - Alberto - * msn: preserve whitespace in messages - -22 Sep 03 02.10.15 - Alberto - * msn, msnlib: implement user blocking and unblocking - * msncb: fix MSNP8 SYN so it doesn't step over existing users - * msncb: use the same user object for both reverse and forward lists - * msncb: fix MSNP8 ADD and BPR so both work well with the new SYN - -22 Sep 03 00.14.15 - Alberto - * msnlib, msncb: implement MSNP8 - -25 Aug 03 23.14.08 - Alberto - * tag: 2.1 - -25 Aug 03 14.09.17 - Alberto - * msnlib: keep message queues when submitting sbds, to avoid loosing messages - when two XFRs happen at the 'same' time - * msn: priorize users with sbd for tab completion - -25 Aug 03 00.05.22 - Alberto - * msn: use email instead of nick for tab completion when nick has spaces - * msn: implement tab completion for emails and nicks - -04 Aug 03 15.07.53 - Alberto - * msn: fix user info to avoid crashing when asking for info on users - which are not on our list - * msn: some indentation work - * msncb: close sbd when deleting a user - -08 Jun 03 19.11.18 - Alberto - * tag: 2.0 - -07 Jun 03 15.40.18 - Alberto - * msn, msnlib, msncb: add group support - -05 Jun 03 17.16.21 - Alberto - * doc: add an icons table - -05 Jun 03 00.22.48 - Alberto - * msn: move the help to a separate string - * msn, msnlib, msncb: fix several weird corner cases with multi-user chats - -04 Jun 03 12.54.31 - Alberto - * msncb: don't close the sbd on fln, so we can keep talking while invisible - -04 Jun 03 12.38.42 - Alberto - * msn, msnlib: add invitation support for multi-user chats - * msncb: fix fln sbd handling - -04 Jun 03 11.00.04 - Alberto - * msncb: add email to sbd.emails on joi and iro - * msncb: handle bye messages properly for multi-user sbds - -04 Jun 03 10.50.54 - Alberto - * msncb, msn: fix flushing for sbd joins - * msncb, msn: implement cb_iro, for joining a multi-user sbd - -03 Jun 03 19.15.34 - Alberto - * msn: fix a bug when sending raw commands - -02 Jun 03 17.14.56 - Alberto - * utils: add hmerge utility - * msn: add notification for sbd joins - -24 May 03 19.57.58 - Alberto - * msncb: use debug() from msnlib - * msnlib: fix a bug in _recv() that didn't decoded the parameters properly - * msnlib, msncb: remember real nicks - * msn: show real nicks - * doc: update the TODO list - -21 May 03 19.01.27 - Alberto - * msnlib, msncb: sbd connection handling cleanup, also fixed a weird bug - that raised EINPROGRESS after connect - -20 May 03 18.51.25 - Alberto - * license: change the license from GPL to OSL - -11 May 03 15.42.38 - Alberto - * msn: allow to send messages when either we or the receiver is offline if we - already have a sbd - -11 May 03 02.30.09 - Alberto - * msn, msnlib, msncb: handle a protocol bug that allows line feeds (0x0C) in - user nicks, now we split fields explicitly only by a space (' '); - thanks to menetas@menetas.net for the report - -01 May 03 19.20.41 - Alberto - * tag: 1.0 tag - -01 May 03 19.16.39 - Alberto - * utils: add msnbot and msncd to the utilities - * doc: small documentation updates - -23 Apr 03 18.08.25 - Alberto - * msn: fix a very odd but important bug that could cause a protocol break by - miscalculating the lenght of an encoded message. Thanks to Ahilan - Sinnarajah for the report - -10 Apr 03 01.30.06 - Alberto - * msn: implement color themes - -09 Apr 03 00.55.43 - Alberto - * msn, msnsetup: implement profile support - -26 Mar 03 13.06.55 - Alberto - * msn: when logging in, print the error code along with description - -18 Mar 03 15.45.37 - Alberto - * msn: ask for password if not given in the configuration - -05 Mar 03 14.01.34 - Alberto - * msnlib: don't send an extra new line in sendmsg - -16 Feb 03 16.48.08 - Alberto - * msn: fix an exception in socket error handling - -20 Jan 03 14.31.43 - Alberto - * tag: d4 tag (changelog entry not included in d4's tarballs) - -20 Jan 03 10.39.06 - Alberto - * doc: update url and add mailing list information - * install: allow the user to specify an installation root directory - * install: install documentation - * setup: add url - -16 Jan 03 13.48.40 - Alberto - * msnlib: moved the encoding support from the client to the library - * msncb: close the sbd when the user goes offline - * msnlib: print the discarded messages when the user goes offline - it fixes an annoying race where a user goes offline and we have an - open sbd. Thanks to Peter Stuge for the report - -14 Jan 03 23.04.23 - Alberto - * msn: implemented local ignore - * msn: now show internal variables in 'config' - * doc: added a 'commands' doc to explan the commands in more detail - -13 Jan 03 20.52.13 - Alberto - * msn: encoding support, thanks to Peter Stuge for the suggestion and code. - -05 Jan 03 14.35.17 - Alberto - * msn: fixes to time.strftime to make it work under 2.0 - * doc: small documentation updates, including a new license note. - * msn: now use "/usr/bin/env python" to run msn - * msn: run python without the -Q switch - -26 Nov 02 11.36.00 - Alberto - * tag: d3 tag - -24 Nov 02 12.50.11 - Alberto - * msn: completed the FAQ, and added a reporting_bugs document - * msn: small changes to the INSTALL file - * msn: return nothing on log_msg as the return value is not important - -19 Nov 02 15.55.52 - Alberto - * msn: fix two big bugs with terminal handling; using nonblocking io makes - flushes and write fail under certain conditions (quite easily - triggered when running into a X terminal), so now they're replaced - with safe wrappers. Thanks to kusamochi@msn.com for the report, and - ameoba@opn for the huge help with the fix. - * msnlib: improved the close call, so now it won't raise an exception on a - sbd that has a non-established socket - -17 Nov 02 10.26.31 - Alberto - * msn: enabling debug prints the terminal size and termios use - -12 Nov 02 00.42.58 - Alberto - * msn: changed some command output to look less cryptic - * doc: add the FAQ - -08 Nov 02 00.03.43 - Alberto - * msn: improved tab completion adding basic cycling - * msn: be able to disable logging using the already-existing 'log history' - configuration variable - -31 Oct 02 15.38.45 - Alberto - * msnlib: remove unused constant BSIZE - * msnlib: update VERSION - -30 Oct 02 18.35.28 - Alberto - * msn: esthetic code changes - * tag: d2 tag - -29 Oct 02 08.50.14 - Alberto - * msn: fix a small bug with the up and down keys - * msn: another small fix to ignore unknown escape sequences - * msn: change the order of tab keystrokes, now received goes first - * msn: don't print the prompt on exit - -28 Oct 02 18.45.12 - Alberto - * msn: handle screen width appropiatedly - * tag: d1 tag - -24 Oct 02 13.22.34 - Alberto - * msn: implemented command line history using escape codes, and added a - configuration option for its size - * msn: implemented basic tab completion - -23 Oct 02 21.43.08 - Alberto - * msn: framework for advanced terminal handling - * doc: added a 'portability' doc with some info - * doc: several minor modifications - * msn: minor modifications to the help text - -23 Oct 02 09.33.51 - Alberto - * msn: improve output on server disconnect - * msn: change the interpreter to /usr/bin/python, which is a more standard - location - -22 Oct 02 21.49.07 - Alberto - * msn: use quit() instead of sys.exit() in several places - * msn: handle network errors when logging in - * tag: c2 tag - -10 Oct 02 18.43.59 - Alberto - * msn: be able to use emails as nicks (can be useful for weird nicks) - * msn: fix a simple bug when tried to close a socket that didn't exist - * msn: unified the quit procedure and handle a keyboard interrupt properly - * msn: improved parameter handling in 'del' and 'privacy' commands, avoiding - crashes with incorrect user input - * msn: added 'ww' and 'ee' commands, which are like 'w' and 'e' but show also - email addresses - * msn: added some help - * msn: improved 'status' a bit - * msnlib: added a 'priv' field in the user class (as a dictionary) which can - be used by the client for private purposes - * msn: display 'typing' only once, and show the last typing time in the user - info - * msn: improved some code indentation, documentation and comments - * doc: minor changes in the INSTALL and README files - * msn: display time with status changes - -04 Oct 02 10.20.46 - Alberto - * msn: now lstrip before parsing the command, so we don't crash on spaces - -28 Sep 02 13.26.23 - Alberto - * msn: added a handler for a socket.socket exception when reading from - sockets, and now print the error - -24 Sep 02 16.56.12 - Alberto - * msn: fixed some small error displays on unknown nick. - * msn: fixed a crash when not giving enough parameters to 'm' - -24 Sep 02 10.50.59 - Alberto - * msnlib: fixed the only (known =) remaining bug, now connections are no - longer closed when we send a message - * tag: c1 tag - -23 Sep 02 13.30.08 - Alberto - * msn: fixed a bug in the 'del' command which passed the nick instead of the - email to msnlib, so removals when nick != email (the common case) - failed - * msn: print emails when showing the the reverse user list - * msn: added command 'debug' to toggle debugging at runtime - * msnlib, msncb: print debugging output to stderr to make capturing easier - -22 Sep 02 13.54.29 - Alberto - * msn: implement auto-away - * msn: fixed the configuration variable handling when set to an invalid value - * msn: added command 'config' to display the configuration - * msn: remove '\r' from the incoming messages - -18 Sep 02 21.18.17 - Alberto - * msnlog.vim: added a vim syntax file to make log reading nicer - * scripts - utils: renamed 'scripts' to 'utils' - -17 Sep 02 15.48.50 - Alberto - * doc: modified several doc files - * tag: b3 tag - released, thanks a lot to Henne Vogelsang for providing the hosting - -16 Sep 02 14.53.34 - Alberto - * msnsetup: create a simple setup script for the configuration file - * install: create the installer scripts for the python modules and the client - * msn: fixed a multi-line message logging bug - -13 Sep 02 12.53.15 - Alberto - * msn: implement history (and status change) logging - * msn: ignore Hotmail messages - * tag: b2 tag - -12 Sep 02 16.41.26 - Alberto - * msncb.py: when flushing pending messages we used to keep the message in the - sbd msgqueue, fixed - * msn: show the pending messages on switchboard disconnect - * config: moved the configuration files default location to ~/.msn - -11 Sep 02 12.25.41 - Alberto - * msnclient.py - msn: renamed msnclient.py to msn - * cb.py - msncb.py: renamed cb.py to msncb.py - * msn: s/cb/msncb/g to reflect the rename - * msn: added a configuration file, which led to a reorganization of some - variables and init procedures - * msn: some new-line changes to the print* functions - * msn: create print functions for outgoing and incoming messages, and now - print the time - * msn: display more information on some commands now that we have config - * msn: added 'close' command, which closes a sbd connection manually - -11 Sep 02 08.36.36 - Alberto - * msnclient.py: create a nick2email and email2nick functions - * msnclient.py: added 'r' (reply) and 'a' (send to the last person you sent a - message to) commands - * msnclient.py: added 'info' command to display user info and simplified the - user list - * msnclient.py: modified several commands to accept and display nick instead - of email - -11 Sep 02 00.16.16 - Alberto - * msnlib.py: make status_change return 0 if error - * msnclient.py: improve the status command - * msnclient.py: reverse list view (command 'wr') - -10 Sep 02 20.41.53 - Alberto - * msnclient.py: change message command from 'msg' to 'm' - * msnclient.py: use nicks instead of email to send messages - -04 Sep 02 10.30.59 - Alberto - * msnclient.py: create print_msg for message printing - * msnclient.py: add command: e, display only online contacts - * msnclient.py: add incoming message history through a size-limited list - * msnclient.py: defer outgoing message display until flushing - -02 Sep 02 21.48.28 - Alberto - * tag: b1 tag; a lot of things got fixed, so far the library is solid (never - had a crash, but didn't get more test than myself) - -27 Aug 02 20.59.27 - Alberto - * msnlib.py: added version number - * msnclient.py: make up an usable client, tons of changes - * cb.py: make the error table global - -25 Aug 02 13.17.59 - Alberto - * msnlib.py: fixed a small bug that left the sb sockets nonblocking which - might bring some problems - * msnlib.py: fixed an important bug for sending messages that wrote two - newlines after a message, and apparently the server didn't like it - -29 Jul 02 00.44.30 - Alberto - * tag: a1 tag; fixed several bugs regarding messaging and now it's probably - done (as in 'everything kinda works'). Obviously the interface still - sucks but i think i'm done with the callbacks. Also added a bit of - documentation, the basic README and cleaned up a little bit - -28 Jul 02 04.04.22 - Alberto - * tag: Initial a0 tag. The basic working structure is there, it - hasn't been tested enough (ie. never received or sent a message) but - there is no need because i know it works =) - diff --git a/doc/FAQ b/doc/FAQ index 9a3927d..4b07e3e 100644 --- a/doc/FAQ +++ b/doc/FAQ @@ -1,12 +1,4 @@ -* How do I subscribe to the mailing list, or browse the archives? - -You can use the mailing list's web interface, -http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/msnlib-devel -for both reading the archives or subscribing. -Note that you don't need to be subscribed to post. - - * What are the 'Message for NNN queued for delivery' and 'Flushing messages to...' and what do they do? diff --git a/doc/URL b/doc/URL deleted file mode 100644 index 9527ce1..0000000 --- a/doc/URL +++ /dev/null @@ -1,10 +0,0 @@ - -The URL for the project is http://users.auriga.wearlab.de/~alb/msnlib -I want to thank Henne Vogelsang and Auriga for providing the hosting. - -There is also a freshmeat project page that it's easier to remember: -http://freshmeat.net/projects/msnlib - -And finally, there's the mailing list, msnlib-devel@auriga.wearlab.de, with url -http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/msnlib-devel. - diff --git a/doc/reporting_bugs b/doc/reporting_bugs index 8a4f8a0..ce503fc 100644 --- a/doc/reporting_bugs +++ b/doc/reporting_bugs @@ -3,7 +3,7 @@ How to report bugs ------------------ If you think you've got a bug (or you are sure about it =), please report it -to msnlib-devel@auriga.wearlab.de; specifying: +to albertito@blitiri.com.ar; specifying: * msnlib version * python version diff --git a/msn b/msn index 1c1e363..85d8ef7 100755 --- a/msn +++ b/msn @@ -21,10 +21,9 @@ This is a fully usable msn client, which also serves as reference implementation for msnlib-based code. For further information refer to the documentation or the source (which is always preferred). -Please direct any comments to the msnlib mailing list, -msnlib-devel@auriga.wearlab.de. +Please direct any comments to albertito@blitiri.com.ar. You can find more information, and the package itself, at -http://users.auriga.wearlab.de/~alb/msnlib +http://blitiri.com.ar/p/msnlib/ """ @@ -1636,7 +1635,7 @@ m.cb.reg = cb_reg # # now the real thing # -printl('* MSN Client (3.6) *\n', c.yellow, 1) +printl('* MSN Client (3.7) *\n', c.yellow, 1) # first, the configuration printl('Loading config... ', c.green, 1) diff --git a/msncb.py b/msncb.py index f4620b5..1638335 100644 --- a/msncb.py +++ b/msncb.py @@ -34,8 +34,6 @@ See below for more examples. Probably you should base your own callbacks on these ones, at least they were thought with that in mind, so you can use yours as wrappers that handle only your app-specific code and forget about the protocol-specific mess. - - Alberto (albertogli@telpin.com.ar) """ @@ -48,6 +46,7 @@ class cb: self.unk = cb_unk # unknown self.err = cb_err # server error self.msg = cb_msg # get a message + self.notice = cb_notice # notice notification self.chl = cb_chl # challenge self.qry = cb_ign # query response self.iln = cb_iln # status notification @@ -488,11 +487,14 @@ def cb_msg(md, type, tid, params, sbd): "Get a message" debug('MESSAGE\n+++ Header: %s\n%s\n\n' % (str(tid), str(params))) - def cb_ack(md, type, tid, params, sbd): "Get a message acknowledge" debug('ACK: tid:%s' % tid) +def cb_notice(md, type, tid, params, sbd): + "Get a notice" + debug('NOTICE\n+++ %s\n\n' % str(params)) + def cb_nak(md, type, tid, params, sbd): "Get a message negative acknowledge" diff --git a/msnlib.py b/msnlib.py index ca40614..9d9952e 100644 --- a/msnlib.py +++ b/msnlib.py @@ -7,11 +7,11 @@ import urllib """ MSN Messenger Client Library -by Alberto Bertogli (albertogli@telpin.com.ar) +by Alberto Bertogli (albertito@blitiri.com.ar) """ # constants -VERSION = 0x0306 +VERSION = 0x0307 LOGIN_HOST = 'messenger.hotmail.com' LOGIN_PORT = 1863 @@ -541,7 +541,8 @@ class msnd: ahead += ',pwd=' + urllib.quote(self.pwd) ahead += ',lc=1033,id=507,tw=40,fs=1,' ahead += 'ru=http%3A%2F%2Fmessenger%2Emsn%2Ecom,ct=0,' - ahead += 'kpp=1,kv=5,ver=2.1.0173.1,tpf=' + hash + ahead += 'kpp=1,kv=5,ver=2.1.0173.1,' + ahead += hash headers = { 'Authorization': ahead } # connect to the given server @@ -663,13 +664,17 @@ class msnd: elif type == 'NAK': self.cb.nak(self, type, tid, params, nd) elif type == 'BYE': self.cb.bye(self, type, tid, params, nd) - elif type == 'MSG': params = tid + ' ' + params mlen = int(r[2].split()[-1]) msg = self._recvmsg(mlen, nd.fd) self.cb.msg(self, type, params, msg, nd) + elif type == 'NOT': + mlen = int(tid) + msg = self._recvmsg(mlen, nd.fd) + self.cb.notice(self, type, "", msg, nd) + else: # catch server errors - always numeric type try: diff --git a/msnsetup b/msnsetup index a41b67d..41c31f7 100755 --- a/msnsetup +++ b/msnsetup @@ -3,7 +3,7 @@ function intro() { echo echo "This is a script for creating an initial configuration for the msn client." - echo "Any problems or questions regarding it, email albertogli@telpin.com.ar." + echo "Any problems or questions regarding it, email albertito@blitiri.com.ar." echo echo "Now you will have to answer a few questions. If you are in doubt, press ENTER and the harmless default will be used." echo "If you want to abort any time, just press CTRL+C" diff --git a/setup.py b/setup.py index a5b91f0..4ced0d1 100644 --- a/setup.py +++ b/setup.py @@ -2,11 +2,11 @@ from distutils.core import setup setup(name="msnlib", - version="3.6", + version="3.7", description="MSN Messenger Library and Client", author="Alberto Bertogli", - author_email="albertogli@telpin.com.ar", - url="http://users.auriga.wearlab.de/~alb/msnlib", + author_email="albertogli@blitiri.com.ar", + url="http://blitiri.com.ar/p/msnlib/", py_modules=['msnlib', 'msncb'], ) diff --git a/utils/hmerge b/utils/hmerge index 2843d68..b4c792f 100755 --- a/utils/hmerge +++ b/utils/hmerge @@ -13,8 +13,7 @@ the logs. Note that this will not do absolute time sorting (as it's usual for time to go backwards, as we all know =), but record-by-record time compares. -Alberto Bertogli (albertogli@telpin.com.ar), 02/Jun/2003 -Please send any reports to msnlib-devel@auriga.wearlab.de. +Alberto Bertogli (albertito@blitiri.com.ar), 02/Jun/2003 """ diff --git a/utils/msnbot b/utils/msnbot index 001d2d1..cd20735 100755 --- a/utils/msnbot +++ b/utils/msnbot @@ -37,11 +37,11 @@ def do_work(): Here you do your stuff and send messages using m.sendmsg() This is the only place your code lives """ - + # wait a bit for everything to settle down (sync taking efect # basically) time.sleep(15) - + print '-' * 20 + 'SEND 1' print m.sendmsg("xx@me.com", "Message One") @@ -53,7 +53,7 @@ def do_work(): # and then quit quit() - + # you shouldn't need to touch anything past here @@ -104,10 +104,10 @@ while 1: # we select, waiting for events try: - fds = select.select(infd, outfd, [], 0) + fds = select.select(infd, outfd, []) except: quit() - + for i in fds[0] + fds[1]: # see msnlib.msnd.pollable.__doc__ try: m.read(i) @@ -120,8 +120,5 @@ while 1: # main socket closed quit() - # sleep a bit so we don't take over the cpu - time.sleep(0.01) - diff --git a/utils/msnlog.vim b/utils/msnlog.vim index a5ac399..b57fc65 100644 --- a/utils/msnlog.vim +++ b/utils/msnlog.vim @@ -1,6 +1,6 @@ " Vim syntax file for msnlib logfiles -" Alberto (albertogli@telpin.com.ar) 28/Sep/2003 +" Alberto (albertito@blitiri.com.ar) 28/Sep/2003 " Use it to read your msnlib log files with color, makes it much easier. " Install it by copying to ~/.vim/syntax/msnlog.vim and then run (from vim) diff --git a/utils/msnsbot b/utils/msnsbot new file mode 100755 index 0000000..8e790a1 --- /dev/null +++ b/utils/msnsbot @@ -0,0 +1,278 @@ +#!/usr/bin/env python + +""" + +A simple scriptable msn bot. + +Can use gtalkbot plugins. + +----------------------------- +Alberto Bertogli +albertito@blitiri.com.ar +""" + + +import sys +import os.path +import time +import select +import socket +import thread + +import msnlib +import msncb + +# null debug output +msnlib.debug = lambda s: '' +msncb.debug = lambda s: '' + + +# +# Our generic callbacks, used internally +# +# They depend on the md having a ._botobj reference to the bot object. Not so +# nice, but simple enough. + +def generic_cb_msg(md, type, tid, params, sbd): + t = tid.split() + email = t[0] + + if email == 'Hotmail': + return + + lines = params.split('\n') + headers = {} + eoh = 1 + for i in lines: + if i == '\r': + break + t, v = i.split(':', 1) + headers[t] = v + eoh += 1 + + if headers.get('Content-Type', '') == 'text/x-msmsgscontrol': + # typing, ignore + return + + md._botobj._handle_msg(email, headers, lines[eoh:]) + msncb.cb_msg(md, type, tid, params, sbd) + + + +# +# The bot itself +# + +class bot: + def __init__(self, email, passwd, userdict = None): + self.email = email + self.passwd = passwd + self.msg_handlers = [] + if userdict: + self.userdict = userdict + else: + self.userdict = {} + + def _setup(self): + self.m = msnlib.msnd() + self.m.cb = msncb.cb() + self.m.email = self.email + self.m.pwd = self.passwd + + # used by the generic callbacks + self.m._botobj = self + + # generic callbacks + self.m.cb.msg = generic_cb_msg + + def login(self, status = 'online'): + "Logs into the MSN network" + self._setup() + self.m.login() + self.m.sync() + + # mini loop so we are sure we get the entire list before going + # on with the normal stuff + while self.m.lst_total != self.m.syn_total: + infd, outfd = self.get_pollable_fds() + fds = select.select(infd, outfd, [], None) + for i in fds[0] + fds[1]: + self.m.read(i) + + self.change_status(status) + self._check_users() + + def close(self): + self.m.disconnect() + + def reconnect(self): + "Reconnects to the MSN network" + self._setup() + self.login(self.status) + + def change_status(self, status): + "Changes the status" + self.status = status + self.m.change_status(status) + + def _check_users(self): + # add everyone in the userlist if they're not already in our + # roster + for email in self.userdict.keys(): + if email not in self.m.users: + self.m.useradd(email, email) + + def get_pollable_fds(self): + "Returns pollable fds, used for network pooling" + return self.m.pollable() + + def loop(self): + "Simple, exclusive network loop" + while 1: + infd, outfd = self.get_pollable_fds() + + fds = select.select(infd, outfd, [], 1) + + for i in fds[0] + fds[1]: + try: + self.m.read(i) + except ('SocketError', socket.error), err: + traceback.print_last() + if i != self.m: + # the user closed a connection + m.close(i) + else: + # main socket closed + return + + def register_msg_handler(self, f): + "Registers a message handler" + self.msg_handlers.append(f) + + def _handle_msg(self, email, header, msg): + if email not in self.userdict: + self.m.sendmsg(email, "Who are you?") + return + + reply = [] + + for f in self.msg_handlers: + r = f(email, self.userdict[email], header, msg) + if r: + reply.append(r) + + if reply: + self.m.sendmsg(email, '\r\n'.join(reply)) + + +# +# Message handlers +# + +def sample_msg_handler(email, info, header, msg): + return "Echo!\n" + '\n'.join(msg) + + +# gtalkbot-compatible message handler +class gtalkbot_msg_handler: + def __init__(self, path): + self.plugins = [] + sys.path.insert(0, path) + for f in os.listdir(path): + if f.endswith('.py'): + root, ext = os.path.splitext(f) + self.plugins.append(__import__(root)) + sys.path.pop(0) + self.verbs = {} + + for p in self.plugins: + for v in p.Verbs(): + if v not in self.verbs: + self.verbs[v] = [] + self.verbs[v].append(p) + + self.authenticated_users = [] + + def handle_msg(self, email, info, header, msg): + # XXX: this only handles the first line + vl = msg[0].split(None, 1) + if not vl: + return + if len(vl) < 2: + verb, line = vl[0], '' + else: + verb, line = vl + + if email not in self.authenticated_users and verb != 'auth': + return 'You need to authenticate\n' \ + + 'Use: auth ' + + if verb == 'auth': + if line != info: + return 'Wrong password, try again' + self.authenticated_users.append(email) + return 'Welcome!' + + elif verb == 'help': + if not line: + return 'Use: help ' + + reply = [] + for p in self.plugins: + if 'Help' not in dir(p): + continue + r = p.Help(line) + if r: + reply.append(r) + if reply: + return '\r\n'.join(reply) + else: + return 'Sorry, no help for ' + line + + elif verb in self.verbs: + reply = [] + for p in self.verbs[verb]: + r = p.Command(verb, line) + if r: + reply.append(r) + if reply: + return '\r\n'.join(reply) + else: + return 'Unknown verb' + + else: + return 'Unknown verb' + + + def __call__(self, email, info, header, msg): + return self.handle_msg(email, info, header, msg) + + +def main(): + + # get the login email and password from the parameters + try: + email = sys.argv[1] + passwd = sys.argv[2] + userlistfname = sys.argv[3] + pluginspath = sys.argv[4] + except: + print "Use: msnsbot email password userlist pluginspath" + sys.exit(1) + + # create a user dictionary with email as key, and anything else as + # value (as a single string) + userlist = [ line.strip().split(None, 1) \ + for line in open(userlistfname) ] + userdict = dict( [ x for x in userlist if len(x) > 1 ] ) + + b = bot(email, passwd, userdict) + #b.register_msg_handler(sample_msg_handler) + b.register_msg_handler(gtalkbot_msg_handler(pluginspath)) + b.login() + b.loop() + +if __name__ == '__main__': + main() + + diff --git a/utils/msntk b/utils/msntk index a4d3376..cd6bb36 100755 --- a/utils/msntk +++ b/utils/msntk @@ -21,10 +21,9 @@ works both under linux, windows and probably others too. For further information refer to the documentation or the source (which is always preferred). -Please direct any comments to the msnlib mailing list, -msnlib-devel@auriga.wearlab.de. +Please direct any comments to albertito@blitiri.com.ar. You can find more information, and the package itself, at -http://users.auriga.wearlab.de/~alb/msnlib +http://blitiri.com.ar/p/msnlib/ """