Commit Graph

9412 Commits

Author SHA1 Message Date
Terje Hoås
599f80ec5f Google: Filter out [, before attempting to interpret Googles response as json. 2013-09-25 10:20:43 +02:00
Valentin Lorentz
657b76d174 Fix merge. 2013-09-22 20:29:52 +02:00
Valentin Lorentz
990b911c06 Merge remote-tracking branch 'supybot/master' into testing
Conflicts:
	src/callbacks.py
	src/ircdb.py
2013-09-22 20:16:20 +02:00
James McCoy
6361b1e856 ircdb: Deduplicate hostmasks in IrcUser.addAuth
If addAuth is called with a hostmask that already exists (exactly, not
just equivalent patterns) in self.auth, remove the entry for the old
authentication.  This essentially updates the timeout for the hostmask.

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2013-09-22 11:13:52 -04:00
Valentin Lorentz
83a2895e18 Format: Add command @stripformatting. 2013-09-21 12:09:37 +00:00
Valentin Lorentz
4e2962b39e Fix error when writing hostmask-collision error message. 2013-09-17 13:32:52 +00:00
Valentin Lorentz
26d7fd7aa1 Seen: Fix docstring of @since. 2013-09-14 20:24:13 +02:00
Valentin Lorentz
0a439012c1 setup.py: Fix 0fb2ee1bf7 for Git version. 2013-09-11 19:27:10 +02:00
Valentin Lorentz
dfafee3ff2 Misc: Adapt GitHub's version format to the new one (introduced in 0fb2ee1bf7). 2013-09-11 17:17:32 +00:00
Valentin Lorentz
0fb2ee1bf7 setup.py: Change format of the version number (illegal in rpm and buggy in deb packages). 2013-09-11 19:13:59 +02:00
James McCoy
4bc549c1ed Prevent exception when replying with a genericNoCapability error
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2013-08-31 23:04:38 -04:00
Valentin Lorentz
cf975227ba Factoids: Fix help of @random.
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2013-08-26 21:38:03 -04:00
Valentin Lorentz
01a6ed6540 Fix use of rsplit for IPv6 addresses.
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2013-08-26 21:37:12 -04:00
Valentin Lorentz
0cb22ce6be Fix previous commit. 2013-08-25 21:58:10 +02:00
Valentin Lorentz
8f8e208072 Revert jamessan's switch to setuptools. 2013-08-25 21:51:34 +02:00
Valentin Lorentz
81ce98656f Alias: Allow interrogation mark. 2013-08-25 15:41:56 +02:00
Valentin Lorentz
d78ae3de7b Aka: Fix encoding issue with Python 2. 2013-08-25 15:41:06 +02:00
Valentin Lorentz
d26a1a5be9 Aka: Fix typo. 2013-08-25 01:23:53 +02:00
Valentin Lorentz
fba38a5df9 Aka: Prevent overriding of other plugins commands. 2013-08-25 01:07:45 +02:00
Valentin Lorentz
10d9c43ab8 Merge remote-tracking branch 'supybot/master' into testing 2013-08-24 19:50:34 +02:00
James McCoy
0283bb7f9a ShrinkUrl: Fix the check for ur1ca results.
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2013-08-24 08:51:33 -04:00
Valentin Lorentz
3099c1aae9 setup.py: Install optional dependencies. 2013-08-24 11:57:33 +02:00
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
James McCoy
ea7f1f8419 Socket: Match the expected API of reconnect
driver.reconnect(wait=True) should flag a driver to reconnect, but not
immediately.  The Socket driver lost its handling of this flag in
8730832e.

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2013-08-24 00:29:16 -04:00
James McCoy
a483fef39d RSS: Ensure results is declared before trying to access it
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2013-08-24 00:04:29 -04:00
James McCoy
e7d0bfd2d0 commands: Handle OverflowError in _int
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2013-08-23 23:36:44 -04:00
Arnout Engelen
58e7e61d69 Only reset the cached feed when the response actually contains headlines
Some feeds, such as those from sourceforge.net, will sometimes show an error
page rather than a feed. In this case the feed cache used to be cleared for
that feed, causing all 'old' headlines to be flooded to the channel as soon
as the feed came back online.

This patch hopefully fixes that by only resetting the cache when the returned
page actually contains headlines.

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2013-08-23 23:13:28 -04:00
James McCoy
333067c151 Provide a default help message for commands without help.
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2013-08-23 22:57:13 -04:00
James McCoy
e421722960 Fix crash if a custom error message is provided to somethingWithoutSpaces
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2013-08-23 22:06:07 -04:00
James McCoy
c73ead8aef supybot-botchk: Directly execute supybot instead of running it in sh
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2013-08-23 21:42:01 -04:00
Valentin Lorentz
960e1da61c commands.py: Fix error message of getSomethingWithoutSpaces.
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2013-08-23 00:29:11 -04:00
James McCoy
5b329df6f0 Socket: Try all resolved addresses before scheduling a reconnect
Instead of assuming the first address returned from getaddrinfo can be
reached, try each one in turn until a connection is established.

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2013-08-22 23:43:09 -04:00
James McCoy
88e4f73777 getSocket: Use returned family to create the socket
The existing code was parsing the passed in host to determine what type
of socket family to create.  getaddrinfo already provides this for us,
so there's no need to perform our own, potentially buggy, parsing.

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2013-08-22 23:40:28 -04:00
Valentin Lorentz
f32f36fea4 Alias: Also allow exclamation marks, as they are allowed by the registry. 2013-08-22 14:03:37 +02:00
Valentin Lorentz
ccafbf4847 Aka: Speed up commands listing by statically listing builtin commands instead of invoking parent's listCommands(). 2013-08-21 20:56:18 +02:00
Valentin Lorentz
d2762d9fb9 Aka: Add explicit error message if sqlalchemy is not installed. 2013-08-21 18:04:16 +02:00
Valentin Lorentz
790bda4664 Web: Fix nesting of commands (bug introduced in d8a4ef8421). 2013-08-20 11:37:39 +02:00
Valentin Lorentz
d14f5df76f ChannelLogger: Rewrite relayed nicks. Closes GH-507. 2013-08-19 17:22:56 +02:00
Valentin Lorentz
1724d6867b Conditional: Fix handling of exceptions. 2013-08-18 17:37:42 +02:00
Valentin Lorentz
43f1e5cd24 Topic: Fix previous commit. 2013-08-17 19:51:17 +00:00
Valentin Lorentz
410472c317 Topic: Change behavior of supybot.plugins.Topic.alwaysSetOnJoin to only apply if the actual topic differs from the default. 2013-08-17 19:30:28 +00:00
Valentin Lorentz
b57be07f1c Topic: Add supybot.plugins.Topic.alwaysSetOnJoin. 2013-08-17 17:48:25 +00:00
Valentin Lorentz
e3acc03fd6 Another fix for b46a0dd6a2. 2013-08-17 19:27:52 +02:00
Valentin Lorentz
f3ecc33678 Fix commit b46a0dd (breaks tests for Alias and Aka). 2013-08-17 17:08:55 +02:00
Valentin Lorentz
dfdc7f1cd1 Merge pull request #506 from kytvi2p/unicode2.x
Unicode fixes for python 2.x
2013-08-17 07:54:45 -07:00
Kill Your TV
b46a0dd6a2 Unicode fixes for python 2.x
These changes have been tested with Python 3.2.3 and Python 2.7.5.
2013-08-17 14:12:10 +00:00
Valentin Lorentz
e1d0ab2774 Aka: Fix support for non-ascii commands name with Python 2 (bug introduced in 64300b8a02). 2013-08-17 16:12:06 +02:00
Valentin Lorentz
dd37f8dd3f Socket: Forward DNS queries via the socks proxy (if any). 2013-08-17 15:47:39 +02:00
Valentin Lorentz
921ff2ae07 Aka: Fix case-sensitivity. 2013-08-17 07:02:21 +00:00
Valentin Lorentz
e120ab7eab User: Add custom error message for @gpg add arguments. 2013-08-16 16:23:08 +02:00