James McCoy
97e71bd2cd
Just create schedule.schedule/drivers.Twisted.poller without any guard
...
These module-level variables had historically been created such that reloading
the module wouldn't redefine the variable. However, none of our code reloads
the modules and the guard to prevent redefining the variable was broken so it
would've been redefined anyway.
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2012-05-22 22:38:44 -04:00
Valentin Lorentz
14609b3bb2
Add self as an argument to methos in src/dbi.py
2012-05-22 21:15:58 -04:00
Valentin Lorentz
1fe4cef61b
Import os before using it.
2012-05-22 21:14:42 -04:00
James McCoy
66ac089a53
Channel: Perform proper capability checks in devoice.
...
Closes: Sf#3524393
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2012-05-20 20:57:13 -04:00
James McCoy
ca23cbb774
Merge branch 'maint/0.83.4'
2011-12-06 01:18:18 -05:00
James McCoy
c90fafebe7
Simplify handling of per-network waitingJoins
...
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-12-06 00:55:29 -05:00
Daniel Folkinshteyn
1e1b39783b
Services: catch occasional error when removing waiting joins from list
...
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-12-06 00:53:19 -05:00
Daniel Folkinshteyn
d5648ab534
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>
2011-12-06 00:53:07 -05:00
Daniel Folkinshteyn
71bcc2bc7c
Services: add some more strings indicating identification success.
...
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-12-06 00:38:29 -05:00
James McCoy
998819da58
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>
2011-12-06 00:22:40 -05:00
James McCoy
f6f9e654cb
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-06 00:08:01 -05:00
James McCoy
4ddfae427f
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-05 23:52:38 -05:00
Valentin Lorentz
a79e9c0cad
Debug: Fix import.
2011-12-05 23:21:23 -05:00
James McCoy
5b4c150d03
Prevent nesting of Misc.tell
...
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-12-05 23:13:09 -05:00
James McCoy
360a2036ac
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>
2011-12-05 22:48:09 -05:00
James McCoy
8b73f78b3e
Merge branch 'maint/0.83.4'
...
Conflicts:
plugins/Misc/plugin.py
src/ircutils.py
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-11-13 15:26:19 -05:00
James McCoy
4833976294
One last fix to umode filtering.
...
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-11-13 15:10:16 -05:00
James McCoy
d6336421e0
Fix IRC.do376's handling of supported state
...
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-11-07 05:58:48 -05:00
James McCoy
4232e40e26
Fix parsing of 004 message for supported umodes/chanmodes
...
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-11-07 05:58:27 -05:00
James McCoy
3bfda3cc7a
Fix filtering of unsupported umodes
...
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-11-06 22:20:55 -05:00
James McCoy
c91916ae5e
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-10-29 17:53:35 -04:00
James McCoy
92ff5f469a
Merge branch 'check-umodes' into maint/0.83.4
2011-10-29 17:26:05 -04:00
James McCoy
02c0d0ce3c
Merge branch 'check-umodes'
2011-10-29 17:25:57 -04:00
James McCoy
b23480b915
irclib: Filter out unsupported umodes before sending them to the server
...
Closes: Sf#3075891
Signed-off-by: James McCoy <vega.james@gmail.com>
2011-10-29 17:22:42 -04:00
James McCoy
c9e548bdd9
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>
2011-10-29 17:22:27 -04:00
James McCoy
9b5019e79d
Merge branch 'nick-access' into maint/0.83.4
2011-10-23 20:33:48 -04:00
James McCoy
755fe11982
Merge branch 'nick-access'
2011-10-23 20:33:41 -04:00
James McCoy
0869a8e271
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>
2011-10-23 20:26:39 -04:00
James McCoy
3c69fad3de
Merge branch 'typos' into maint/0.83.4
2011-10-23 19:42:02 -04:00
James McCoy
9b855beec6
Merge branch 'typos'
2011-10-23 19:41:54 -04:00
Valentin Lorentz
a1a90f7673
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>
2011-10-23 19:38:54 -04:00
Valentin Lorentz
f1690e6867
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>
2011-10-23 19:36:46 -04:00
Valentin Lorentz
9561c9f417
Topic: Fix bad doctring
...
Conflicts:
plugins/Topic/messages.pot
Signed-off-by: James McCoy <vega.james@gmail.com>
2011-10-23 19:36:08 -04:00
Valentin Lorentz
8fb4cbcdc6
Factoids: Fix typo.
...
Conflicts:
plugins/Factoids/locale/fi.po
plugins/Factoids/locale/fr.po
plugins/Factoids/messages.pot
src/version.py
Signed-off-by: James McCoy <vega.james@gmail.com>
2011-10-23 19:30:07 -04:00
Valentin Lorentz
8056da06f6
Channel: fix NameError: 'replyirc' -> 'replyIrc'. Closes GH-73.
...
Conflicts:
src/version.py
Signed-off-by: James McCoy <vega.james@gmail.com>
2011-10-23 19:30:01 -04:00
Valentin Lorentz
fa8385596d
Karma: fix typo. Closes GH-38.
...
Conflicts:
plugins/Karma/locale/fi.po
plugins/Karma/locale/fr.po
plugins/Karma/messages.pot
Signed-off-by: James McCoy <vega.james@gmail.com>
2011-10-23 19:29:52 -04:00
Valentin Lorentz
70a6e6932d
Protector: Fix variable name.
...
Signed-off-by: James McCoy <vega.james@gmail.com>
2011-10-23 19:04:12 -04:00
James McCoy
fb8f0741e7
Merge branch 'relay-nick-hostmask' into maint/0.83.4
2011-10-22 16:10:43 -04:00
James McCoy
05529e22a5
Merge branch 'relay-nick-hostmask'
2011-10-22 16:10:38 -04:00
Valentin Lorentz
ce4d26514b
Relay: remove redundant nick on join/part when hostmasks enabled
...
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-10-22 16:10:23 -04:00
James McCoy
58eee3c995
Merge branch 'automode-conf' into maint/0.83.4
2011-10-22 16:06:57 -04:00
James McCoy
bab5bc671c
Merge branch 'automode-conf'
2011-10-22 16:06:51 -04:00
Valentin Lorentz
5dcbe57fa3
AutoMode: fix bans.
...
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-10-22 16:06:37 -04:00
James McCoy
d5593bbba2
Merge branch 'disable'
2011-10-22 15:52:44 -04:00
James McCoy
3db5727a9d
Merge branch 'disable' into maint/0.83.4
2011-10-22 15:52:34 -04:00
Valentin Lorentz
8fb97c56bc
Owner: Fix bug with @enable and @disable if a plugin is given. Closes GH-43. Closes GH-44.
...
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-10-22 15:52:19 -04:00
James McCoy
964c73f591
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>
2011-10-22 15:23:56 -04:00
James McCoy
01c8dc7f78
String.decode: Only encode('utf-8') when the decode string is unicode
...
Closes: Sf#3165718
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-10-22 14:57:20 -04:00
Daniel Folkinshteyn
8f7c4bdf7f
Fix banmask creation. Thanks Progval for the patch!
...
fixes https://sourceforge.net/tracker/?func=detail&aid=3088559&group_id=58965&atid=489447
incorporating patch https://sourceforge.net/tracker/?func=detail&aid=3163843&group_id=58965&atid=489449
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-10-22 14:25:26 -04:00
Daniel Folkinshteyn
df5391dcf7
Socket driver: implement ssl connection support.
...
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-10-22 14:09:06 -04:00