Mercurial > irccd
changeset 287:e27204f923e9 stable-2
Merge from release-2.0
author | David Demelier <markand@malikania.fr> |
---|---|
date | Tue, 01 Nov 2016 13:44:12 +0100 |
parents | 47fd3f6b32c5 (current diff) 5280cc921e66 (diff) |
children | 38fd58a0b962 9bc2da03dbe1 |
files | |
diffstat | 6 files changed, 28 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsigs Tue Apr 19 10:16:26 2016 +0200 +++ b/.hgsigs Tue Nov 01 13:44:12 2016 +0100 @@ -1,3 +1,4 @@ 223487a685b101f5bcbd3e6a7f457d551953bf99 0 iQEcBAABCAAGBQJW1UpnAAoJEKHa+bhAI/MfKRQH/jdmDihcOvqa+4njFcdeUEeonW7YZbRyJenz3fuitMSBu0QdfIHcaSMZlHE7lFTpaj7kEjjssrpPcbjSxkIemi2FHoCkXmHBGYVMQxhHLko5m339FzvXXrK24W6e1IUygTE0iSKEAUjg0Li8U1OY2WPvvOHyNaissbd9AMCBDL38cuudq+jsC9YO/b1UXekuw25f9sLmNpvf4IkmyVbZ0VYnMe4/FmLDfz5OWpjqaFJeVqX46Zd71zbe2ISuHOec+o1RUPAOwyGpZeoOfjoZ20K/OrsZCbpcEZX86u/mW25cKcryJzB66WHJUKz9/UpqwB9kt1nGUClM9xISWz3UPOo= 79de523688edfb418f0f9605033a2c8dac1cd7cf 0 iQEcBAABCAAGBQJW5dzPAAoJEKHa+bhAI/Mf0qIH/jmb/2Oltif7R2kSeQcW9NHfPlqF/gvOIN5FaraoYdkwHumwLxys5FzhIghkJgvNMT313Xez0UjtdSO/3ZmjX1P+D/Rz3NfMddFDyiXWMn8D/MVN6DskQw6mb4W9miB0fBl++pc4e7T0UvZdYar4ddOl6WE2HDda6828gq2ecBBEyTkPOglzbiRwm05zmAvE5DxjEElu/2V70oHJJUscHOnC8YZVJnav1Hq6iU5RTpmuBtY7TN6/+Q7i9o+4b1xkQ8zAVpu9gBo7ptVhQ8MSnIprwO+E8XFmQDA/67tDgquzURZvVRmehMCaWhljWVLTG3CVOVQEp/k9ip5CKRoE+oY= 02409acc34e21fa08a781f6f68aef66dc734a132 0 iQEcBAABCAAGBQJXFekwAAoJEKHa+bhAI/MfxG4IAK9Es4VcTU5HZ+VfpuFxjx5NcbEzbdqexUFI4m4Z8/LWD7Xb9RT0bekomEDHGT91csQFJ1es1Aeekbgw1XDk/wwYphaTUTNKF8L9VWRKdRbGQT8AjkOxJXfjMviGJbUa7lkQNllwLexvwPmnMJP8+A/QVf5EWlim8rxpeaKqrpwmizd4UhvLb7w5F5YyIHVsI8FizFL9VdnFplK+iQgSMX2mRUkAGOHCno7MIxilcmUGy/6yzV7VyuJHmkGjluBxURp73HQSAIVM3SwJagpWZS6zZ5tI5PFf6gw9rlByJJOLcbuuvUaAKLYhKISi5qlLmKRW097sJxCF4bgWfUVUp1w= +ef19e4c406cf9611650fe25354170485ab27b819 0 iQEcBAABCAAGBQJYGI4KAAoJEKHa+bhAI/MfdlIH/jP3ktybzbMISVHeZOx5Kd6sQYyEQP5u0StQ3Sgj/oV+tqn3UWrTypKXJZWeI1yb3KYtHfcmP8l/nKeN0Zz3c05qh+J+MuBCoBNL1yP8ZHqarKrhPjkoC5OQoUgegsMEOcCBK7j8VXmSJ5DUXpn1Drd9dQ7qKE3fu84knHWe0ViVThbFFQsqBv5DQOgA+Pl5GN1JzeMWo/hWHjHldrsFC2xOeDJNuJ42RgmFmKaj7MHO9Nsu6aLZwDzkZvoImPzsO/AAQsrqAHC2um85LptCsWZ3LFw8aC1UqmlvvcdXLivChHs0+Qwr9VrGGlcaZ8mLaD4ucCG2LUR9EjmtwOCkJvc=
--- a/.hgtags Tue Apr 19 10:16:26 2016 +0200 +++ b/.hgtags Tue Nov 01 13:44:12 2016 +0100 @@ -1,3 +1,4 @@ 92b0be5ce4b0cc77254585563069719e01c575d5 2.0.0 02bb385da6e342bbfe232b10ab6d63c1d8c47ca7 2.0.1 de1c1e4a5dbb3f9d03a6833333f03f595f79e33d 2.0.2 +d37069bcbbab340c122a4f6fbb028c02996cc143 2.0.3
--- a/cmake/IrccdVersion.cmake Tue Apr 19 10:16:26 2016 +0200 +++ b/cmake/IrccdVersion.cmake Tue Nov 01 13:44:12 2016 +0100 @@ -19,7 +19,7 @@ # Irccd version. set(IRCCD_VERSION_MAJOR "2") set(IRCCD_VERSION_MINOR "0") -set(IRCCD_VERSION_PATCH "2") +set(IRCCD_VERSION_PATCH "3") set(IRCCD_VERSION "${IRCCD_VERSION_MAJOR}.${IRCCD_VERSION_MINOR}.${IRCCD_VERSION_PATCH}") # @@ -31,8 +31,8 @@ # IRCCD_RELEASE_DATE_DAY 2 digits (01 = first day of month) # set(IRCCD_RELEASE_DATE_YEAR 2016) -set(IRCCD_RELEASE_DATE_MONTH 04) -set(IRCCD_RELEASE_DATE_DAY 19) +set(IRCCD_RELEASE_DATE_MONTH 11) +set(IRCCD_RELEASE_DATE_DAY 01) set(IRCCD_RELEASE_DATE "${IRCCD_RELEASE_DATE_YEAR}-${IRCCD_RELEASE_DATE_MONTH}-${IRCCD_RELEASE_DATE_DAY}") # All plugins.
--- a/plugins/auth/auth.js Tue Apr 19 10:16:26 2016 +0200 +++ b/plugins/auth/auth.js Tue Nov 01 13:44:12 2016 +0100 @@ -50,7 +50,7 @@ if (!username) { Logger.warning("missing username for quakenet backend on " + server.toString()); } else { - Logger.log("authenticating to Q on " + server.toString()); + Logger.info("authenticating to Q on " + server.toString()); server.message("Q@CServe.quakenet.org", Util.format("AUTH #{username} #{password}", { "username": username, "password": password
--- a/plugins/logger/logger.js Tue Apr 19 10:16:26 2016 +0200 +++ b/plugins/logger/logger.js Tue Nov 01 13:44:12 2016 +0100 @@ -83,7 +83,7 @@ function write(fmt, args) { - var path = Util.format(Plugin.config["path"], args); + var path = Util.format(Plugin.config["file"], args); var directory = File.dirname(path); /* Try to create the directory */ @@ -95,15 +95,22 @@ Logger.debug("opening: " + path); var str = Util.format(formats[fmt], args); - var file = new File(path, "wa"); + var file = new File(path, "a"); file.write(str + "\n"); } function onLoad() { - if (Plugin.config["path"] === undefined) - throw new Error("Missing 'path' option"); + if (Plugin.config["file"] === undefined) + throw new Error("Missing 'file' option"); + + loadFormats(); +} + +function onReload() +{ + loadFormats(); } function onChannelMode(server, origin, channel, mode, arg)
--- a/plugins/logger/logger.md Tue Apr 19 10:16:26 2016 +0200 +++ b/plugins/logger/logger.md Tue Nov 01 13:44:12 2016 +0100 @@ -37,17 +37,17 @@ The following options are available under the `[plugin.logger]` section: - **file**: (string) the path to the file where to store logs, - - **cmode**: (string) format for channel mode change, - - **cnotice**: (string) format for channel notices, - - **join**: (string) format when someone joins a channel, - - **kick**: (string) format when someone has been kicked, - - **me**: (string) format for emote actions, - - **message**: (string) format for channel messages, - - **mode**: (string) format for user mode change, - - **notice**: (string) format on private notices, - - **part**: (string) format when someone leaves a channel, - - **query**: (string) format on private messages, - - **topic**: (string) format when a topic is changed. + - **format-cmode**: (string) format for channel mode change, + - **format-cnotice**: (string) format for channel notices, + - **format-join**: (string) format when someone joins a channel, + - **format-kick**: (string) format when someone has been kicked, + - **format-me**: (string) format for emote actions, + - **format-message**: (string) format for channel messages, + - **format-mode**: (string) format for user mode change, + - **format-notice**: (string) format on private notices, + - **format-part**: (string) format when someone leaves a channel, + - **format-query**: (string) format on private messages, + - **format-topic**: (string) format when a topic is changed. ### Keywords supported