Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-27 05:09:23 +01:00
Code Issues Projects Releases Wiki Activity

Google: Fix @calc.

Browse Source
This commit is contained in:
Valentin Lorentz 2013-05-30 13:13:19 +02:00
parent 2bf0364c0e
commit 6e8b7be0f1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/Google/plugin.py
View File

@ -294,7 +294,7 @@ class Google(callbacks.PluginRegexp):
(self.registryValue('baseUrl', channel), s) (self.registryValue('baseUrl', channel), s)
return url return url
def _googleUrlIG(self, s): def _googleUrlIG(self, s, channel):
s = s.replace('+', '%2B') s = s.replace('+', '%2B')
s = s.replace(' ', '+') s = s.replace(' ', '+')
url = r'http://%s/ig/calculator?hl=en&q=%s' % \ url = r'http://%s/ig/calculator?hl=en&q=%s' % \
@ -312,7 +312,10 @@ class Google(callbacks.PluginRegexp):
Uses Google's calculator to calculate the value of <expression>. Uses Google's calculator to calculate the value of <expression>.
""" """
urlig = self._googleUrlIG(expr) channel = msg.args[0]
if not isChannel(channel):
channel = None
urlig = self._googleUrlIG(expr, channel)
js = utils.web.getUrl(urlig).decode('utf8') js = utils.web.getUrl(urlig).decode('utf8')
# Convert JavaScript to JSON. Ouch. # Convert JavaScript to JSON. Ouch.
js = js \ js = js \