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
Valentin Lorentz
331d064e59
Merge pull request #237 from Mkaysi/mkaysi
...
String: added l10n-fi.
2011-10-21 09:17:30 -07:00
Mika Suomalainen
49ae4576b3
String: added l10n-fi.
2011-10-21 17:28:08 +03:00
Valentin Lorentz
079ec6ad5c
Merge pull request #236 from Mkaysi/mkaysi
...
Status: added l10n-fi.
2011-10-18 10:56:40 -07:00
Mika Suomalainen
e0185a01a0
String: start l10n-fi.
...
Currently only the first string is translated.
2011-10-18 18:02:37 +03:00
Mika Suomalainen
be9b027e1a
Status: added l10n-fi.
2011-10-18 17:55:14 +03:00
Daniel Folkinshteyn
b533290c7a
Web: fix problems with title snarfer and unicode due to bug in HTMLParser in python 2.6+
...
Upstream bug: http://bugs.python.org/issue3932
Rather than override the unescape method with the patch posted, we just convert the page
text to unicode before passing it to the HTMLParser. UTF8 and Latin1 will eat just about
anything.
2011-10-11 13:06:27 -04:00
James Vega
1c321409b8
Topic: Ensure do315's response is for a channel in our state object
...
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 44eb449ba4
)
Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
2011-10-11 11:56:02 -04:00
James Vega
60834f239f
Honor supybot-test's timeout option and document the units
...
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 4661acb3a3
)
Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
2011-10-11 11:55:39 -04:00
James Vega
a8736d9a64
Seen: Anchor nick regexp to ensure valid match.
...
When searching for 'st*ke', 'stryker' would incorrectly match, 'stryke' would
be added to the nick set and the subsequent lookup would cause a KeyError.
This is fixed both by anchoring the regexp ('^st.*ke$' instead of 'st.*ke')
and adding searchNick to the nick set instead of the string that matched the
pattern.
Closes: Sf#3377381
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 0cd4939678
)
Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
2011-10-11 11:55:27 -04:00
James Vega
59936f52f3
Update Internet.hexip to handle IPv6
...
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit b0e595fbd2
)
Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
2011-10-11 11:55:16 -04:00
James Vega
5c9139990b
Update Internet.dns to handle IPv6 IPs and responses
...
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit d56381436c
)
Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
2011-10-11 11:55:06 -04:00
James Vega
36eb3501cf
Add utils.net.isIPV4, with utils.net.isIP checking v4 or v6
...
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
2011-10-11 11:53:59 -04:00
Valentin Lorentz
a46176e3b1
Fix URL to plugins and default page charset in HTTP server.
2011-10-02 12:11:30 +02:00
Valentin Lorentz
4e658bbdec
Merge pull request #223 from Mkaysi/mkaysi
...
ShrinkUrl: added l10n-fi.
2011-09-30 10:26:49 -07:00
Mika Suomalainen
0a30915579
ShrinkUrl: added l10n-fi.
...
First translation in a long time. I will try to continue translating, but shcool
is slowing them.
2011-09-30 20:15:43 +03:00
Mika Suomalainen
ba4e4a6c47
Merge remote-tracking branch 'progval/testing' into mkaysi
2011-09-18 11:40:38 +03:00
Valentin Lorentz
90ad25668e
Misc: Fix order of replies of @tell, in order to fix issue with nesting.
...
Using @ignore [tell foo bar] was telling 'The operation succeeded' to foo, and ignore 'bar'.
2011-09-18 10:31:09 +02:00
Valentin Lorentz
669a8a86e8
Merge pull request #214 from Tannn3r/master
...
Updated several README.txt
2011-09-18 01:24:00 -07:00
Valentin Lorentz
e9697ffcf9
Merge pull request #213 from nyuszika7h/testing
...
Add SASL support to core.
2011-09-18 01:23:34 -07:00
nyuszika7h
25dcadfe68
conf.py: remove surrounding spaces around '=' for sasl_username.
2011-09-14 11:39:00 +02:00
nyuszika7h
e140fc76f5
conf.py: Change username to sasl_username and add it as last argument.
2011-09-13 19:55:31 +02:00
nyuszika7h
ca502c6814
irclib.py: Added network name to SASL authentication success/fail.
2011-09-13 19:55:01 +02:00
nyuszika7h
c8c2f125a1
conf.py: remove part about server-specific password for supybot.networks.<network>.sasl.password.
2011-09-13 17:01:18 +02:00
Mika Suomalainen
e02104edf1
Merge remote-tracking branch 'progval/testing' into l10n-fi
2011-09-13 17:11:03 +03:00
nyuszika7h
dcaefbdcf5
Add SASL support to core.
2011-09-13 11:07:52 +02:00
Tanner
e0625fa8a1
Time: Added a description to README.txt
2011-09-12 17:34:14 -05:00