X-Git-Url: https://git.kaliko.me/?p=sid.git;a=blobdiff_plain;f=bot.py;h=42644bc457b77e85ee7016404ff4ca9cfc2b3cc7;hp=e02d96fa744a433ff61e2d461f910f0be830ddf5;hb=2dd50775877e07ba7aba08bdb04c6b8b05fb6555;hpb=ee38f3ae1e801fd160978b2c5804d4cc056683f6

diff --git a/bot.py b/bot.py
index e02d96f..42644bc 100644
--- a/bot.py
+++ b/bot.py
@@ -4,32 +4,25 @@
 import getpass
 
 from sid.sid import MUCBot
-from sid.echo import Echo
+from sid.ping import Ping
 from sid.feeds import Feeds
 
 JID = 'bot@example.org'
 NICK = 'sid'
-PASS = getpass.getpass('Password: ')
+PASS = getpass.getpass('Password for "{}": '.format(JID))
 ROOM = 'room@conf.example.org'
 
 def main():
     Feeds.TEMPO = 60
     xmpp = MUCBot(JID, PASS, ROOM, NICK)
     xmpp.register_bot_plugin(Feeds)
-    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
+    xmpp.register_bot_plugin(Ping)
+    try:
+        xmpp.connect()
+        xmpp.process()
+    except KeyboardInterrupt:
         xmpp.shutdown_plugins()
-        xmpp.log.info('Done')
-    else:
-        xmpp.log.info('Unable to connect.')
+    xmpp.log.info('Done')
 
 # Script starts here
 if __name__ == '__main__':