github/SleekXMPP
1
0
Fork 0
mirror of https://github.com/correl/SleekXMPP.git synced 2024-11-27 19:19:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge errors and bot example.

Browse source
This commit is contained in:
Lance Stout 2012-01-18 15:16:56 -08:00
parent 72e1ab47fc
commit 4f4c121d9b
2 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
docs/index.rst
View file

@ -78,12 +78,12 @@ Here's your first SleekXMPP Bot:
self.add_event_handler("session_start", self.session_start) self.add_event_handler("session_start", self.session_start)
self.add_event_handler("message", self.message) self.add_event_handler("message", self.message)
self.register_plugin('xep_0030') # Service Discovery # If you wanted more functionality, here's how to register plugins:
self.register_plugin('xep_0199') # XMPP Ping # self.register_plugin('xep_0030') # Service Discovery
# self.register_plugin('xep_0199') # XMPP Ping
# Here's how to access plugins once you've registered them: # Here's how to access plugins once you've registered them:
# self['xep_0030'].add_feature('echodemo') # self['xep_0030'].add_feature('echo_demo')
# You can also use self.plugin['xep_0030']
# If you are working with an OpenFire server, you will # If you are working with an OpenFire server, you will
# need to use a different SSL version: # need to use a different SSL version:
@ -222,14 +222,25 @@ Additional Info
Credits Credits
------- -------
**Main Author:** Nathan Fritz
**Main Author:** `Nathan Fritz <http://andyet.net/team/fritzy>`_
`fritzy@netflint.net <xmpp:fritzy@netflint.net?message>`_, `fritzy@netflint.net <xmpp:fritzy@netflint.net?message>`_,
`@fritzy <http://twitter.com/fritzy>`_ `@fritzy <http://twitter.com/fritzy>`_
Nathan is also the author of XMPPHP and `Seesmic-AS3-XMPP Nathan is also the author of XMPPHP and `Seesmic-AS3-XMPP
<http://code.google.com/p/seesmic-as3-xmpp/>`_, and a member of the XMPP <http://code.google.com/p/seesmic-as3-xmpp/>`_, and a former member of the XMPP
Council. Council.
**Co-Author:** `Lance Stout <http://andyet.net/team/lance>`_
`lancestout@gmail.com <xmpp:lancestout@gmail.com?message>`_,
`@lancestout <http://twitter.com/lancestout>`_
Both Fritzy and Lance work for `&yet <http://andyet.net>`_, which specializes in
realtime web and XMPP applications.
- `contact@andyet.net <mailto:contact@andyet.net>`_
- `XMPP Consulting <http://xmppconsulting.com>`_
**Co-Author:** Lance Stout **Co-Author:** Lance Stout
`lancestout@gmail.com <xmpp:lancestout@gmail.com?message>`_, `lancestout@gmail.com <xmpp:lancestout@gmail.com?message>`_,
`@lancestout <http://twitter.com/lancestout>`_ `@lancestout <http://twitter.com/lancestout>`_

5
examples/muc.py
View file

@ -76,13 +76,8 @@ class MUCBot(sleekxmpp.ClientXMPP):
event does not provide any additional event does not provide any additional
data. data.
""" """
<<<<<<< HEAD
self.getRoster()
self.sendPresence()
=======
self.get_roster() self.get_roster()
self.send_presence() self.send_presence()
>>>>>>> docs
self.plugin['xep_0045'].joinMUC(self.room, self.plugin['xep_0045'].joinMUC(self.room,
self.nick, self.nick,
# If a room password is needed, use: # If a room password is needed, use: