From 6360eca21e99947512f4ec6344ca9e817757d3c7 Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval@gmail.com>
Date: Sat, 8 Sep 2012 10:15:18 +0000
Subject: [PATCH] GitHub: Use the v3 API.

---
 GitHub/config.py |  2 +-
 GitHub/plugin.py | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/GitHub/config.py b/GitHub/config.py
index 82b1299..f2a458e 100644
--- a/GitHub/config.py
+++ b/GitHub/config.py
@@ -55,7 +55,7 @@ GitHub = conf.registerPlugin('GitHub')
 #     registry.Boolean(False, _("""Help for someConfigVariableName.""")))
 conf.registerGroup(GitHub, 'api')
 conf.registerGlobalValue(GitHub.api, 'url',
-        registry.String('http://github.com/api/v2/json', _("""The URL of the
+        registry.String('https://api.github.com', _("""The URL of the
         GitHub API to use. You probably don't need to edit it, but I let it
         there, just in case.""")))
 conf.registerGlobalValue(GitHub, 'announces',
diff --git a/GitHub/plugin.py b/GitHub/plugin.py
index 8bf4d71..dce266f 100644
--- a/GitHub/plugin.py
+++ b/GitHub/plugin.py
@@ -226,7 +226,11 @@ class GitHub(callbacks.Plugin):
 
     class repo(callbacks.Commands):
         def _url(self):
-            return instance.registryValue('api.url')
+            url = instance.registryValue('api.url')
+            if url == 'http://github.com/api/v2/json': # old api
+                url = 'https://api.github.com'
+                instance.setRegistryValue('api.url', value=url)
+            return url
 
         @internationalizeDocstring
         def search(self, irc, msg, args, search, optlist):
@@ -239,12 +243,12 @@ class GitHub(callbacks.Plugin):
             for name, value in optlist:
                 if name in args:
                     args[name] = value
-            results = query(self,'repos/search',urllib.quote_plus(search),args)
+            results = query(self, 'legacy/repos/search',
+                    urllib.quote_plus(search), args)
             reply = ' & '.join('%s/%s' % (x['owner'], x['name'])
                                for x in results['repositories'])
             if reply == '':
-                irc.error(_('No repositories matches your search. Try to '
-                            'develop this software yourself ;)'))
+                irc.error(_('No repositories matches your search.'))
             else:
                 irc.reply(reply.encode('utf8'))
         search = wrap(search, ['something',
@@ -273,8 +277,7 @@ class GitHub(callbacks.Plugin):
                             # 1. it wouldn't break anything
                             # 2. it enhances cross-compatiblity
                             pass
-            results = query(self, 'repos/show', '%s/%s' % (owner, name), {})
-            results = results['repository']
+            results = query(self, 'repos', '%s/%s' % (owner, name), {})
             output = []
             for key, value in results.items():
                 if key in enabled: