Commit Graph

10441 Commits

Author SHA1 Message Date
James Lu
aba37ff951 conf.py: Remove reference to non-existent? "user configuration variable"
Closes #654.
2015-02-28 00:13:06 -08:00
Valentin Lorentz
f6c789b018 Merge pull request #1063 from GLolol/channel/autorejoin-delay
Channel: allow adding an auto-rejoin delay
2015-02-28 08:39:34 +01:00
James Lu
e3079f82b2 Merge remote-tracking branch 'upstream/testing' into channel/autorejoin-delay
Conflicts:
	plugins/Channel/config.py
2015-02-27 23:37:11 -08:00
Valentin Lorentz
cf7e4c6512 Merge pull request #1064 from GLolol/channel/part+cycle
Move 'part' command from Admin to Channel and use part messages in Channel.cycle
2015-02-28 07:48:05 +01:00
James Lu
f11d3162ae Merge remote-tracking branch 'upstream/testing' into channel/part+cycle
Conflicts:
	plugins/Admin/config.py
	plugins/Admin/plugin.py
2015-02-27 18:55:20 -08:00
James Lu
f3107a928f Channel: allow adding an auto-rejoin delay via supybot.plugins.Channel.rejoinDelay
Closes #1011.
2015-02-27 18:45:37 -08:00
James Lu
32988ee3a3 Channel.cycle: allow specifying part message + defaults to plugins.Channel.partMsg
Closes #1062.
2015-02-27 18:27:58 -08:00
James Lu
a67fb94875 Move 'part' command from Admin to Channel and require #channel,op instead of admin
Closes #79.
2015-02-27 18:12:52 -08:00
Valentin Lorentz
9076194009 Merge pull request #1041 from GLolol/admin/configurable-partmsg
Admin/Owner: substitute $version in quit and part messages (also make part messages configurable)
2015-02-27 13:15:25 +01:00
Valentin Lorentz
a59784a366 Merge pull request #1057 from kyrias/dictclient-utf8
Make dictclient.py unicode capable
2015-02-21 20:22:19 +01:00
Johannes Löthberg
d4aa4362e5 dictclient: Remove whitespace at end of lines 2015-02-21 20:08:13 +01:00
Johannes Löthberg
1654bfca0c dictclient: Encode as utf-8 instead of ASCII
dict.org has dictionaries with words containing non-ASCII characters.
2015-02-21 20:08:13 +01:00
Valentin Lorentz
0d7e0f73fb Merge pull request #1056 from GLolol/patch-1
Network.whois: simplify message when user isn't on any public channels
2015-02-21 08:57:43 +01:00
James Lu
5f23855d27 oops how do i english 2015-02-20 22:20:49 -08:00
James Lu
41effcea13 Network.whois: simplify message when user isn't on any public channels
The current message ("xyz isn't on any non-secret channels or is using a channel-list hiding umode.") is long and awkwardly worded. 

This also removes an extra period from showing up at the end of the output.
2015-02-20 16:50:40 -08:00
James McCoy
a8cd99f121 commands._getRe: Restore original args for any failure
String.re uses first('regexpMatcher', 'regexpReplacer').  If the args
provided to String.re are not a matcher and are longer than a single IRC
message (e.g., from a nested command), then regexpReplacer would never
be tried.  A too long error should be handled the same as running out of
args while trying to find a valid regexp.

Signed-off-by: James McCoy <vega.james@gmail.com>
2015-02-18 22:09:38 -05:00
Valentin Lorentz
b99ff28e33 utils.web.getUrl: add the 'timeout' argument (and fix the doc of getUrlFd).
Signed-off-by: James McCoy <vega.james@gmail.com>
2015-02-18 19:53:42 -05:00
Valentin Lorentz
1264573b34 Merge remote-tracking branch 'kyrias/say-command' into testing 2015-02-14 13:38:56 +01:00
Johannes Löthberg
75288193ad QuoteGrabs: Add say command
The say command just returns the text of the grab, so you can get just
the quote from a specific qid.
2015-02-14 13:15:13 +01:00
Valentin Lorentz
981476d6d5 String: Return raw bytes when decode returns binary data. 2015-02-11 14:09:16 +00:00
Valentin Lorentz
bcd39743f0 String: Strip all newline characters in base64 output. 2015-02-11 14:08:25 +00:00
Valentin Lorentz
468d2762c1 Seen: Factorize code used for checks. 2015-02-10 09:12:26 +01:00
Valentin Lorentz
02b8c39138 Merge pull request #1051 from GLolol/seen/keyerror
Seen: prevent KeyError when calling commands on channels that the bot is not in
2015-02-10 08:54:08 +01:00
James Lu
a85fbead23 Seen: prevent KeyError when calling commands on channels that the bot is not in
This fixes a bug introdiced by 38ff1a1137.
2015-02-10 01:38:29 -05:00
Valentin Lorentz
7bba16a55e Merge pull request #1050 from Mikaela/languages
src/i18n.py: have languages in alphabetical order
2015-02-08 08:49:56 +01:00
c675654b82 src/i18n.py: have languages in alphabetical order
It's probably not so important, but I don't like them being in any
strange random order. Of course having English first would make sense as
it's the default, but I still prefer alphabetical order.
2015-02-08 09:44:13 +02:00
James Lu
59b39ea45e scripts/supybot: use None as msg for standardSubstitute on Ctrl-C 2015-02-07 10:01:47 -08:00
James Lu
32de4e8270 Merge branch 'testing' into admin/configurable-partmsg 2015-02-07 10:00:48 -08:00
Valentin Lorentz
fa7ef570c0 Merge pull request #1004 from GLolol/karma/nicks-only
Karma: add an option to limit Karma to nicks
2015-02-07 08:41:02 +01:00
Valentin Lorentz
e26fdb9df8 Merge remote-tracking branch 'nyuszika7h/remove-xrl' into testing
Conflicts:
	plugins/ShrinkUrl/plugin.py
2015-02-07 08:39:17 +01:00
Valentin Lorentz
cb6669015e Make ircutils.standardSubstitute accept None as irc and msg. (Preliminary for GH-1041.) 2015-02-07 08:15:42 +01:00
Valentin Lorentz
29de1e137d Fix 2to3 progression percentage (no long go over 100%). 2015-02-07 08:15:42 +01:00
Valentin Lorentz
9b36fc9427 Merge pull request #1048 from Hasimir/gpg-extension
Gpg extension - fix subkey/master key conflict
2015-02-07 08:09:12 +01:00
Valentin Lorentz
e67fa7ff5f Merge pull request #1049 from GLolol/patch-1
src/i18n.py: mention 'en' as supported language & quote the language codes for less ambiguity
2015-02-07 08:01:58 +01:00
James Lu
5e4501d7d2 i18n.py: mention 'en' as supported lang & quote the language codes for less ambiguity.
Ref #1046.
2015-02-06 15:40:44 -08:00
Ben McGinnes
a7bbc46eb9 Streamlining the patch back down to a single line.
Since the keyid should always match the master key, regardless of
whether there's a subkey or not, reduced this to simply make keyid be
the last 16 chars of the master key's fingerprint.
2015-02-07 04:27:51 +11:00
Valentin Lorentz
7af6ca1f40 Merge pull request #1047 from Mikaela/language
src/i18n.py: mention supported languages
2015-02-06 13:31:52 +01:00
Ben McGinnes
861efee8f2 Removed a relic of poor coding options. 2015-02-06 21:44:20 +11:00
Ben McGinnes
432b8f8fb5 Solved the subkey selection issue.
Changes one line and adds six to do this:

  * change keyid = verified.keyid to be keyid0;
  * added an if/else check to see if it's the subkey or master key; and
  * then set keyid according the result of that check;
  * then continues as normal.
2015-02-06 21:33:30 +11:00
544befd2d0 src/i18n.py: mention supported languages
Closes #1046

I used Admin for sources of what languages are supported as it's usually
recommended to start translating from there (first plugins, then core).
2015-02-06 11:58:24 +02:00
Ben McGinnes
720b299e82 Clearsign authorisation via subkey.
Replacement code which might work to enable advanced keys with signing
subkeys to be correctly handled by the bot by associating the subkey
with the relevant master key.

Signing format still only clearsigning, the key details are more
important and auth via encrypted token and decryption is likely to be
more reliable anyway as there is far less chance of some other protocol
messing with the signed content.  Effectively no chance, though the odd
corrupted packet here and there is still possible.  Whereas with
clearsigning it can be broken by all manner of rewriting in
transit (which happens often enough with signed email as it is).

See also Issue #1045 for greater detail of what needs to be fixed and
what is to be done about it.
2015-02-06 18:11:52 +11:00
James Lu
0c85c6d796 supybot: also expand substitutes when exiting on Ctrl-C 2015-02-05 22:34:07 -08:00
James Lu
b243c83e41 Admin/Owner: Use standard substitution for part/quit messages 2015-02-05 20:26:14 -08:00
James Lu
a46f12beeb Merge branch 'owner/quitmsg-version' into admin/configurable-partmsg 2015-02-05 20:13:30 -08:00
Valentin Lorentz
248bc65d44 Merge pull request #1042 from GLolol/channel/nicksinprivate
Channel: prevent mass-highlights with 'nicks' by defaulting the output to private
2015-02-05 08:13:47 +01:00
James Lu
0e0feb1a84 Owner: substitute %version% for the Supybot version in plugins.Owner.quitMsg (Closes ProgVal#847)
Cherry-picked from commit GLolol@205199e.
2015-02-04 21:20:45 -08:00
GLolol
d844b1d19c Admin: allow specifying a default part message in plugins.admin.partmsg (Closes ProgVal#391)
Cherry-picked from commit GLolol@f69c789.
2015-02-04 21:16:10 -08:00
James Lu
c06ed45983 Channel: prevent mass-highlights with 'nicks' by defaulting the output to private
This adds a new config variable plugins.Channel.nicksInPrivate.

Cherry-picked from commit GLolol@2cc9e9d.
2015-02-04 21:15:42 -08:00
Valentin Lorentz
681bd5d85d Count number of bytes instead of number of characters for truncating messages. Closes GH-1038. 2015-02-04 17:31:42 +01:00
Valentin Lorentz
b769d1067f Merge pull request #1040 from Mikaela/readme
remove INSTALL.md && update README.md
2015-02-04 16:56:24 +01:00