Commit Graph

34 Commits

Author SHA1 Message Date
Valentin Lorentz
40675ffdfa Merge remote-tracking branch 'supybot/master' into testing
Conflicts:
	plugins/Admin/plugin.py
	plugins/BadWords/config.py
	plugins/Filter/plugin.py
	plugins/Google/plugin.py
	plugins/Math/plugin.py
	plugins/Misc/plugin.py
	plugins/Note/plugin.py
	plugins/RSS/plugin.py
	plugins/Seen/test.py
	plugins/ShrinkUrl/config.py
	plugins/ShrinkUrl/plugin.py
	plugins/ShrinkUrl/test.py
	plugins/Status/plugin.py
	plugins/String/config.py
	plugins/String/plugin.py
	plugins/Time/plugin.py
	plugins/Todo/plugin.py
	plugins/Web/plugin.py
	plugins/__init__.py
	scripts/supybot-botchk
	setup.py
	src/__init__.py
	src/callbacks.py
	src/commands.py
	src/conf.py
	src/drivers/Socket.py
	src/ircdb.py
	src/irclib.py
	src/ircutils.py
	src/questions.py
	src/registry.py
	src/schedule.py
	src/test.py
	src/utils/file.py
	src/utils/gen.py
	src/utils/net.py
	src/utils/web.py
	src/world.py
2013-08-24 11:28:29 +02:00
Valentin Lorentz
caa36121a7 ShrinkUrl: Add ur1.ca support.
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2013-01-08 22:54:02 -05:00
Joe Julian
a8e3081b18 ShrinkUrl: Support for goo.gl url shortener.
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2013-01-08 22:44:35 -05:00
Valentin Lorentz
018ee3456d ShrinkUrl: Retry shrinking twice if it fails. 2013-01-07 20:22:23 +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
Valentin Lorentz
e5e2db15b2 ShrinkUrl: Implement @expand. Closes GH-392. 2012-09-02 10:06:33 +02: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
Joe Julian
653e4dec1b urlquoting the url leads to short urls that prepend "http://" to the url 2012-08-14 18:56:44 +02:00
Valentin Lorentz
24d73eb1f8 ShrinkUrl: Add ur1.ca support. 2012-08-11 11:07:40 +02:00
Valentin Lorentz
5ae3e3fdcf ShrinkUrl: Decode data from web services. 2012-08-05 16:58:09 +02:00
Valentin Lorentz
de5747aecb ShrinkUrl: Use utils.web.getUrl instead of httplib2. 2012-08-04 21:33:58 +02:00
Joe Julian
7cc8feaf32 ShrinkUrl: Support for goo.gl url shortener. 2012-05-28 19:58:15 +02:00
Valentin Lorentz
371a40e004 Internationalize Seen, Services, ShrinkUrl, Status, String, and Success 2010-10-20 09:10:03 +02:00
James Vega
0bfa0d153c ShrinkUrl: Add serviceRotation config.
When configured, the outFilter and shrinkSnarfer use cycle through
serviceRotation's list of services.  Otherwise, the default service is used.

Closes: deb#539858

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
2010-07-11 10:47:37 -04:00
James Vega
a453f56284 ShrinkUrl: Use tinyurl's api-create page to avoid screen-scraping.
Set snarfThrottle to 0 while testing since we know there's nothing other than
the test input that could be causing us to snarf.  Fixes some intermittent
test failures due to fast snarf responses.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
2009-11-04 22:37:53 -05:00
James Vega
25fc2de643 utils.web: Provide access to the raw httpUrlRe/urlRe strings
Using the compiled regexps for a PluginRegexp method's __doc__ doesn't work.

Closes Sourceforge #2879862

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
2009-10-15 22:16:38 -04:00
James Vega
c4de386d8f ShrinkUrl: Remove our 'lazy biotch' message and length check.
If someone wants to specifically request that a URL, which can't possibly be
made shorter using a specific service, be shrunk, we should abide their
request.
2009-10-08 23:14:42 -04:00
James Vega
de4218b26e ShrinkUrl: Add support for x0.no 2009-10-08 22:58:57 -04:00
James Vega
9d66399420 ShrinkUrl: Add support for xrl.us
Closes one part of Debian #539858

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
2009-10-04 23:30:02 -04:00
James Vega
200f716011 ShrinkUrl: Uniformly handle errors while shrinking via ShrinkError.
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
2009-10-04 22:08:55 -04:00
James Vega
c055b16ea8 ShrinkUrl: Use getattr() to simplify use of the growing number of services.
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
2009-10-04 21:54:20 -04:00
James Vega
ca917d3528 Use utils.web.httpUrlRe for the Web/ShrinkUrl snarfer regexes.
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
2009-10-04 21:41:05 -04:00
James Vega
22b3ccfbde ShrinkUrl: Generalize CdbShrunkenUrlDB's support for the different dbs.
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
2009-09-29 20:11:47 -04:00
James Vega
d59ac366b3 ShrinkUrl: Add shrinkSnarfer.showDomain config
As requested by BeteNoire, add a config option to disable showing the domain
of the URL shrunk by the snarfer.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
2009-03-07 23:46:50 -05:00
James Vega
99696986f6 Only tag the ircmsg if we actually get one back from irc.reply. We don't in situations like: @topic fit [tiny $url] 2009-03-11 13:37:24 -04:00
James Vega
a3e4fc5b1d Change the modeline to use softtabstop instead of tabstop. 2006-02-11 15:52:51 +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
James Vega
9971e991fe Fix the modelines. 2005-03-23 20:07:45 +00:00
James Vega
606e92a47f Add supybot.plugins.ShrinkUrl.bold 2005-03-09 23:29:49 +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
18f8044621 Converted ShrinkUrl to use format. 2005-02-01 09:41:39 +00:00
Jeremy Fincher
3d57c404ba Added ShrinkUrl in the new plugin format. 2005-02-01 09:09:49 +00:00