Update the plugins to use the PluginAPI

Also:
- Add get_conversation_messages() to PluginAPI
- Make plugins_autoload colon-separated instead of space-separated
    (for consistency)
- Replace a JID() with a safeJID() in the uptime plugin

1 files changed, 5 insertions, 6 deletions

diff --git a/plugins/uptime.py b/plugins/uptime.py
index 5390f9f7..cc47b46f 100644
--- a/plugins/uptime.py
+++ b/plugins/uptime.py
@@ -1,12 +1,11 @@
 from plugin import BasePlugin
 import tabs
-from common import parse_secs_to_str
+from common import parse_secs_to_str, safeJID
 from sleekxmpp.xmlstream import ET
-from sleekxmpp.xmlstream.stanzabase import JID
 
 class Plugin(BasePlugin):
     def init(self):
-        self.add_command('uptime', self.command_uptime,
+        self.api.add_command('uptime', self.command_uptime,
                 usage='<jid>',
                 help='Ask for the uptime of a server or component (see XEP-0012).',
                 short='Get the uptime')
@@ -14,10 +13,10 @@ class Plugin(BasePlugin):
     def command_uptime(self, arg):
         def callback(iq):
             for query in iq.xml.getiterator('{jabber:iq:last}query'):
-                self.core.information('Server %s online since %s' % (iq['from'], parse_secs_to_str(int(query.attrib['seconds']))), 'Info')
+                self.api.information('Server %s online since %s' % (iq['from'], parse_secs_to_str(int(query.attrib['seconds']))), 'Info')
                 return
-            self.core.information('Could not retrieve uptime', 'Error')
-        jid = JID(arg)
+            self.api.information('Could not retrieve uptime', 'Error')
+        jid = safeJID(arg)
         if not jid.server:
             return
         iq = self.core.xmpp.makeIqGet(ito=jid.server)