Commit Graph

9206 Commits

Author SHA1 Message Date
Mika Suomalainen
e77aeb805b User: continue l10n-fi. 2011-12-21 13:13:10 +02:00
Mika Suomalainen
2f6e64868e Merge branch 'testing' of github.com:ProgVal/Limnoria into mkaysi 2011-12-20 19:10:18 +02:00
Mika Suomalainen
3a57cda34a User: add partial l10n-fi. 2011-12-20 19:09:36 +02:00
Valentin Lorentz
993c004bbe Merge pull request #288 from Mkaysi/mkaysi
URL: Add l10n-fi.
2011-12-20 07:57:12 -08:00
Mika Suomalainen
4e38be73ba URL: add l10n-fi. 2011-12-20 17:18:47 +02:00
Valentin Lorentz
aef609f61f Merge branch 'testing' 2011-12-19 01:32:25 +01:00
James McCoy
ff96b898f9 RSS._getConverter: Encode strings before handing them off to other functions
When the feed has a specified encoding, we'll be dealing with unicode objects
in the response from feedparser.parse().  To avoid possible UnicodeErrors, we
need to encode() before handing the string off to other functions, so the
other functions are always dealing with bytestrings instead of bytestrings and
unicode objects.  Mixing unicode and bytestrings will cause implicit
conversions of the unicode objects, which will most likely use the wrong
encoding.

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>

Conflicts:

	plugins/RSS/plugin.py
2011-12-19 01:32:05 +01:00
Mika Suomalainen
4e91e84f51 Merge branch 'testing' of github.com:ProgVal/Limnoria into mkaysi 2011-12-18 21:20:47 +02:00
Valentin Lorentz
ba3d3acff8 Merge pull request #287 from nyuszika7h/testing
Unix: Make configuration variables fortune.short and fortune.offensive channel-specific
2011-12-18 11:18:36 -08:00
nyuszika7h
8af27f4f64 Unix: Make configuration variable fortune.offensive channel-specific 2011-12-18 14:24:35 +01:00
nyuszika7h
751a3ef921 Unix: Make configuration variable fortune.short channel-specific 2011-12-18 14:21:46 +01:00
Mika Suomalainen
49aac12f31 Merge branch 'testing' of github.com:ProgVal/Limnoria into mkaysi 2011-12-18 13:41:28 +02:00
Daniel Folkinshteyn
43a3285f48 core: avoid casting data to string if it is already an instance of basestring, in irc.reply. 2011-12-18 12:39:05 +01:00
Mika Suomalainen
fbc6ffc36b Merge branch 'testing' of github.com:ProgVal/Limnoria into mkaysi 2011-12-18 12:59:26 +02:00
Mika Suomalainen
0677e62206 Unix: add l10n-fi. 2011-12-18 12:55:32 +02:00
Mika Suomalainen
7dba155038 Unix: add l10n-fi. 2011-12-18 18:53:59 +08:00
Daniel Folkinshteyn
e0c08d3f98 core: avoid casting data to string if it is already an instance of basestring, in irc.reply. 2011-12-13 18:21:38 -05:00
Mika Suomalainen
c10f62b57b Unix: add partial l10n-fi. 2011-12-14 01:31:39 +08:00
James McCoy
d9531d2d29 Fix parsing of 004 message for supported umodes/chanmodes
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-12-14 01:31:28 +08: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
5217f855b0 Fix previous merge (again). 2011-12-13 18:09:52 +01:00
Valentin Lorentz
332420bad9 Fix previous merge.
Conflicts:

	src/drivers/Socket.py
	src/version.py
2011-12-13 18:09:15 +01:00
James McCoy
d1bc7922ee Simplify handling of per-network waitingJoins
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-12-13 18:08:00 +01:00
Daniel Folkinshteyn
761435ba1a Services: catch occasional error when removing waiting joins from list
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-12-13 18:07:56 +01:00
Daniel Folkinshteyn
8c3304c520 Services: fix problem with some channels being mixed up between networks on startup, when noJoinsUntilIdentified is true.
When noJoinsUntilIdentified config is true, the bot holds join messages in a 'waitingJoins' list, and processes them
once nickserv identification comes through. The problem was that when the bot is configured to join multiple networks,
join messages from different networks would get appended to the same list, without any differentiation by which message
belongs to which network. Thus, if there are messages waiting for multiple networks, it would often be the case that
whichever network got identification done first, would 'pick up' other network's join messages.

This fix stores the network name along with the join messages in the list, and has each network pick out only its own
join messages.

Conflicts:

	src/version.py

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>

Conflicts:

	plugins/Services/plugin.py
2011-12-13 18:07:22 +01:00
James McCoy
7e05510faa Only use ircmsg.whois's mask argument if it's non-empty.
Closes: Sf#3121298
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-12-13 18:06:31 +01:00
James McCoy
b8c43dc5cc Perform all received* IrcMsg tagging in one spot.
This also fixes a long-standing failing Misc test since it was relying on the
receivedAt tag.

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-12-13 18:06:26 +01:00
James McCoy
f0233c370f Prevent nesting of Misc.tell
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-12-13 18:05:21 +01:00
James McCoy
d1df9e8306 Use socket.inet_aton for isIPV4 since Windows doesn't (always?) have inet_pton
Closes: Sf#3430008
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>

Conflicts:

	src/utils/net.py
2011-12-13 18:05:14 +01:00
Daniel Folkinshteyn
ce9d04eac9 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.
2011-12-12 14:57:10 -05:00
Daniel Folkinshteyn
4fe8fe4b10 Google: use google ig api for the calc. no more web scraping. let's hope this stays alive. 2011-12-12 12:59:27 -05:00
James McCoy
05adad617d Simplify handling of per-network waitingJoins
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
(cherry picked from commit c90fafebe7)

Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
2011-12-12 11:26:31 -05:00
James McCoy
faf2608c83 Bug fixes in src/ircmsgs.py
unbans did send the repr() of the ban list, and IrcMsg.__hash__ did try to hash a list.

Conflicts:

	src/version.py

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
(cherry picked from commit 998819da58)

Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
2011-12-12 11:26:07 -05:00
James McCoy
e2f27512bc Only use ircmsg.whois's mask argument if it's non-empty.
Closes: Sf#3121298
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
(cherry picked from commit f6f9e654cb)

Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
2011-12-12 11:25:45 -05:00
James McCoy
be9415912c Perform all received* IrcMsg tagging in one spot.
This also fixes a long-standing failing Misc test since it was relying on the
receivedAt tag.

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
(cherry picked from commit 4ddfae427f)

Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
2011-12-12 11:25:26 -05:00
Valentin Lorentz
c606ba6d80 Debug: Fix import.
(cherry picked from commit a79e9c0cad)

Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
2011-12-12 11:25:10 -05:00
James McCoy
bcdc8ecb00 Prevent nesting of Misc.tell
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
(cherry picked from commit 5b4c150d03)

Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
2011-12-12 11:24:52 -05:00
James McCoy
63ec70bc08 Use socket.inet_aton for isIPV4 since Windows doesn't (always?) have inet_pton
Closes: Sf#3430008
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
(cherry picked from commit 360a2036ac)

Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
2011-12-12 11:24:42 -05:00
James McCoy
d8ead9bc29 One last fix to umode filtering.
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
(cherry picked from commit 4833976294)

Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
2011-12-12 11:24:34 -05:00
James McCoy
2fb9ac2024 Fix IRC.do376's handling of supported state
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
(cherry picked from commit d6336421e0)

Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
2011-12-12 11:24:24 -05:00
James McCoy
23f07cadc2 Fix parsing of 004 message for supported umodes/chanmodes
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
(cherry picked from commit 4232e40e26)

Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
2011-12-12 11:24:04 -05:00
James McCoy
ab9365f172 Fix filtering of unsupported umodes
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
(cherry picked from commit 3bfda3cc7a)

Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
2011-12-12 11:23:45 -05:00
James McCoy
865e87cf74 Misc: Avoid setting up "invalid command" flood handling if its not enabled
Closes: Sf#3088554
Signed-off-by: James McCoy <vega.james@gmail.com>
2011-12-12 11:22:16 -05:00
James McCoy
23bfe116ff irclib: Filter out unsupported umodes before sending them to the server
Closes: Sf#3075891
Signed-off-by: James McCoy <vega.james@gmail.com>
(cherry picked from commit b23480b915)

Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
2011-12-12 11:13:58 -05:00
James McCoy
edbf43f81f irclib: Add support for 004 messages from the server
At a minimum, the message gives us the server name, ircd version, supported
umodes, and supported channel modes.  Add the umodes and channel modes to
self.supported.

Some IRCds (e.g., hybrid and ircd-seven) have an extra arg which seems to be
the channel modes that require arguments.

Signed-off-by: James McCoy <vega.james@gmail.com>
(cherry picked from commit c9e548bdd9)

Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
2011-12-12 11:13:23 -05:00
James McCoy
c2b6633fe7 Channel.nicks: Raise error so we don't actually reply with the nicks.
Closes: Sf#3396388
Signed-off-by: James McCoy <vega.james@gmail.com>
(cherry picked from commit 0869a8e271)

Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
2011-12-12 11:13:03 -05:00
Valentin Lorentz
3248bd79c4 NickCapture: Fix plugin help and l10n-fr. Closes GH-116.
Conflicts:

	plugins/NickCapture/locale/fr.po
	plugins/NickCapture/messages.pot
	src/version.py

Signed-off-by: James McCoy <vega.james@gmail.com>
(cherry picked from commit a1a90f7673)

Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
2011-12-12 11:12:09 -05:00
Valentin Lorentz
90b7a83127 Topic: fix typo in @unlock help.
Conflicts:

	plugins/Topic/locale/fr.po
	plugins/Topic/messages.pot
	src/version.py

Signed-off-by: James McCoy <vega.james@gmail.com>
(cherry picked from commit f1690e6867)

Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
2011-12-12 11:11:41 -05:00