Commit Graph

121 Commits

Author SHA1 Message Date
Valentin Lorentz 93ecc2424f Google: Fix encoding issue. 2013-05-13 14:18:22 +02:00
Valentin Lorentz 10fc03ab19 Google: Fix snarfer with Python 3. 2013-02-24 01:51:40 +01:00
Valentin Lorentz 5b432a781e Google: Restore @calc and @phonebook. 2013-02-03 07:53:55 +00:00
Valentin Lorentz 21c17b8248 Google: Fix Python 3 compatibility of the @translate command. 2013-02-01 17:12:03 +01:00
nyuszika7h b2fdf83496 Google: Add translate command (needs testing)
https://github.com/myano/jenni/blob/master/modules/translate.py
is where I got the idea from. Say thanks to sbp and yano too! :)

Conflicts:
	plugins/Google/plugin.py
2013-02-01 14:54:13 +00:00
Valentin Lorentz 33048545ea Revert "Google: Remove translate command since their API is gone"
This reverts commit 304facd167.

Conflicts:
	plugins/Google/test.py
2013-02-01 14:49:53 +00:00
Valentin Lorentz 7e0d868db1 Merge branch 'py3k-backport' into testing 2013-01-06 16:46:29 +01:00
Valentin Lorentz df62ddad78 Google: Fix encoding with Python 3. 2013-01-06 16:46:21 +01:00
Valentin Lorentz 3dba9088b0 Merge remote-tracking branch 'supybot/master' into testing
Conflicts:
	INSTALL
	plugins/ChannelLogger/README.txt
	plugins/ChannelStats/README.txt
	plugins/Google/plugin.py
	plugins/Google/test.py
	plugins/Plugin/test.py
	plugins/Web/test.py
	setup.py
	src/callbacks.py
	src/ircdb.py
	src/irclib.py
	src/utils/str.py
	test/test_irclib.py
2013-01-01 21:11:24 +01:00
James McCoy 748b76404f Google: Use standard json module now that 2.6 is minimum Python version
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2012-09-10 20:07:43 -04:00
James McCoy 6f925e5f7a Google: Remove calc and phonebook commands
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2012-09-05 23:04:10 -04:00
James McCoy 304facd167 Google: Remove translate command since their API is gone
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2012-09-05 22:51:11 -04:00
James McCoy 82ecf36fcd Update my name/contact information
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2012-09-01 10:16:48 -04:00
nyuszika7h de61bb6b93 Google: Add translate command (needs testing)
https://github.com/myano/jenni/blob/master/modules/translate.py
is where I got the idea from. Say thanks to sbp and yano too! :)
2012-08-31 16:52:58 +02:00
Valentin Lorentz 30f711b12f Google: Prevent flooding when no matches are found. 2012-08-26 07:37:40 +00:00
Terje Hoås e1adc011c3 Google: Stop output when there are no result. 2012-08-17 17:16:26 +02:00
Valentin Lorentz 978a702346 Google: Use 'json' module and apply .decode() on data. 2012-08-04 19:50:30 +02:00
Valentin Lorentz d5f3e1844f Google: Add supybot.plugins.Google.oneToOne. 2012-07-30 14:57:52 +00:00
Terje Hoås e19ff328b6 Google: Fix currency conversions. 2012-07-13 19:05:21 +02:00
Valentin Lorentz 4692f831d4 Google: Fix HTML escaping. 2012-05-11 18:07:50 +02:00
nyuszika7h d23757e8fa Google: Remove translate command. Closes GH-337. 2012-05-05 20:45:01 +02:00
Valentin Lorentz 207f6ec2da Google: Fix bad json format. 2012-05-02 15:36:34 +00:00
Terje Hoås a1ab4b7ba0 Google: Fix UnicodeEncodeError in Calc. 2012-03-08 14:24:58 +01:00
Valentin Lorentz 72077c8c97 Google: fix previous cherry-pick. 2011-12-13 18:10:20 +01:00
Daniel Folkinshteyn b991c8679b Google: use web scraping as fallback to ig api
ig api doesn't have everything (for one, timezones),
and also, in case the IG api ever dies.

Conflicts:

	plugins/Google/plugin.py
2011-12-13 18:10:15 +01:00
Daniel Folkinshteyn e1ffe0f4e3 Google: use google ig api for the calc. no more web scraping. let's hope this stays alive.
Conflicts:

	plugins/Google/plugin.py
2011-12-13 18:10:09 +01:00
Valentin Lorentz cf8126223b Google: Apply gholms's patch to fix @calc match. 2011-11-09 10:04:53 +01:00
Valentin Lorentz 8595c177dd Google: fix @calc 2011-03-07 18:20:10 +01:00
Daniel Folkinshteyn 8e80e7b657 fix google calc to work when doing a currency conversion.
made the calcre more generic, so it finds stuff on both math and currency.
nothing a little exploration of google html page source couldn't solve.
2011-02-25 19:24:04 +01:00
Daniel Folkinshteyn bf6f0e2d18 make google translate return detailed google error, instead of the unhelpful "we broke google". 2011-02-25 18:56:56 +01:00
Daniel Folkinshteyn 8d45228642 for google translate, error if destination language is 'auto'. 2011-02-25 18:56:50 +01:00
Daniel Folkinshteyn bdc8fd5285 fix some encoding error for non-ascii langs 2011-02-25 18:36:00 +01:00
Daniel Folkinshteyn ca045128d7 add detected source language display for 'auto' google translate, add test for auto translate. 2011-02-25 18:35:53 +01:00
Daniel Folkinshteyn 6b324674a7 enable google translate to autodetect language with 'auto' fromlang. 2011-02-25 18:35:44 +01:00
Daniel Folkinshteyn a6b9d5fe5f Google: fix encoding bug in lucky --snippet; need to pass encoded string to utils.web.htmlToText 2011-02-14 18:27:40 +01:00
Daniel Folkinshteyn 614e6c3f43 Google: in lucky --snippet, properly convert html to text, using utils.web.htmlToText. 2011-02-14 18:27:26 +01:00
Daniel Folkinshteyn 33c6eabf82 Google: add --snippet option to lucky command, which shows the text snippet for the page. 2011-02-14 18:26:50 +01:00
Daniel Folkinshteyn 7c7b093b33 Google: add some extra matching capability to google calc
now should be able to display any 'special' result from google.
2011-01-29 11:39:59 +01:00
Valentin Lorentz 9917232d9a Internationalize Filter, Format, Games, and Google 2010-10-17 14:50:31 +02:00
James Vega c9274606ce Google: Remove Groups snarfer
The regular expressions were woefully out of date and since there's not a
stable API (or any for that matter), keeping things working is a losing
battle.

Closes: Sf#3057485
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
2010-09-08 22:20:23 -04:00
Daniel Folkinshteyn abf6df9e13 fix google calc to work when doing a currency conversion.
made the calcre more generic, so it finds stuff on both math and currency.
nothing a little exploration of google html page source couldn't solve.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 432228c736)
2010-08-24 19:50:47 -04:00
James Vega afb4e1e07f Use 0 when no results are returned for Google.fight
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 3689460d0f)
2010-08-24 19:40:54 -04:00
James Vega 2b0b74dfe0 Google: Keep the list of supported languages in one place.
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 461f943d97)
2010-08-24 19:01:00 -04:00
Ricky Zhou 4eb30069bf Try using simplejson instead if json-py is installed.
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 416a6e8dd2)
2010-08-24 19:00:14 -04:00
James Vega d7dee482ca Google: Ensure we don't try to use the 3rd party json module.
json-py provides a different interface than simplejson (renamed json when
included with Python2.6).  As such, we test for the different interface and
raise an error when we encounter it.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
2009-05-19 00:55:17 -04:00
James Vega 13715a0ca3 Google: Fix calc by basing the regex off the calc img
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
2009-03-19 21:10:46 -04:00
James Vega 7b906fbf54 Fully qualify the call to universalImport so we don't get a NameError.
Also added some ImportError handlers to aid letting users of distribution
packages know if the distributions strip out the local module copies.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
2009-03-19 20:33:17 -04:00
James Vega dc68e112df Add simplejson to the Google plugin and use universalImport
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
2009-03-15 19:55:14 -04:00
James Vega 8d21b7a8cf Google: Rename safeSearch to searchFilter to ease upgrades 2009-03-11 13:37:27 -04:00
James Vega cfe0ee8462 Actually set the 'rsz' option if it isn't defined. 2009-03-11 13:37:25 -04:00
James Vega f772fbf284 Forgot to utf-8 encode the URL from a Google search 2009-03-11 13:37:25 -04:00
James Vega 6cfde5bcc9 Update googleSnarfer to use the new search method 2009-03-11 13:37:25 -04:00
James Vega 88ca711d6a Change translate to use the (limited) translatable language list. 2009-03-11 13:37:25 -04:00
James Vega 62a8306fbb Rewrite most of Google to use the new AJAX API.
Add a translate command as well.
2009-03-11 13:37:25 -04:00
James Vega a8a7ec56d1 Fix Google.calc ... Google changed their HTML 2007-04-25 19:06:33 +00:00
James Vega 5d954f79fe plugins/Google: Update the URLs referencing the search API. 2006-10-02 12:51:08 +00:00
James Vega a3e4fc5b1d Change the modeline to use softtabstop instead of tabstop. 2006-02-11 15:52:51 +00:00
Jeremy Fincher 9da5d05f8f Fixed a bug in handling of multiplication in results. 2006-01-11 13:48:46 +00:00
James Vega d2dc42ede1 plugins/Google: Fix some formatting in Google.meta's docstring. 2005-07-25 22:05:26 +00:00
James Vega 201d4acd26 plugins/Google: Use a sensical form of English for Google.phonebook's error response. 2005-07-05 05:31:28 +00:00
Jeremy Fincher 490fb0b140 Changed prefixName to prefixNick, which is more appropriate, and has always bothered me. Better now than later. 2005-06-01 21:08:30 +00:00
Jeremy Fincher 47b42eebff Fixed a NameError in an exception handler for a module we don't use anymore. 2005-03-28 13:19:16 +00:00
James Vega 9c7c384d22 Google.metagoogle -> Google.meta 2005-03-25 15:45:44 +00:00
James Vega 9971e991fe Fix the modelines. 2005-03-23 20:07:45 +00:00
James Vega aefcd594df Move structures to utils/ 2005-03-12 18:01:47 +00:00
Jeremy Fincher ff8728b6c1 Moved the titleSnarfer to Web, so we need to insist that we're called before that instead. 2005-02-18 18:46:57 +00:00
Jeremy Fincher 156084c225 Fixed some bugs introduced with the latest refactoring of callCommand, etc. 2005-02-17 22:39:44 +00:00
Jeremy Fincher 2693d404b4 Refactored _callCommand to put it in its appropriate place. 2005-02-16 02:17:05 +00:00
Jeremy Fincher b0cb616709 Changed callbacks.Privmsg to be callbacks.Plugin, and callbacks.PrivmsgCommandAndRegexp to be callbacks.Plugin. 2005-02-09 07:04:04 +00:00
Jeremy Fincher 7b2dbcf6c4 DOTS! 2005-02-02 04:40:00 +00:00
Jeremy Fincher 7313ae3b76 Added Google in the new plugin format. 2005-02-01 12:09:12 +00:00