Mercurial > irccd

changeset 68:3c21e70972bc stable-2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from release-2.0
author David Demelier <markand@malikania.fr>
date Sun, 13 Mar 2016 22:34:30 +0100
parents 424cd7780372 (current diff) d421d73b34e5 (diff)
children aa58ff8b6543 47fd3f6b32c5
files
diffstat 6 files changed, 13 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsigs	Tue Mar 01 08:53:30 2016 +0100
+++ b/.hgsigs	Sun Mar 13 22:34:30 2016 +0100
@@ -1,1 +1,2 @@
 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=
--- a/.hgtags	Tue Mar 01 08:53:30 2016 +0100
+++ b/.hgtags	Sun Mar 13 22:34:30 2016 +0100
@@ -1,1 +1,2 @@
 92b0be5ce4b0cc77254585563069719e01c575d5 2.0.0
+02bb385da6e342bbfe232b10ab6d63c1d8c47ca7 2.0.1
--- a/CHANGES.md	Tue Mar 01 08:53:30 2016 +0100
+++ b/CHANGES.md	Sun Mar 13 22:34:30 2016 +0100
@@ -1,6 +1,11 @@
 IRC Client Daemon CHANGES
 =========================
 
+irccd 2.0.1 2016-03-13
+----------------------
+
+  - Plugin plugin: fix invalid usage.
+
 irccd 2.0.0 2016-03-01
 ----------------------
 
--- a/cmake/IrccdVersion.cmake	Tue Mar 01 08:53:30 2016 +0100
+++ b/cmake/IrccdVersion.cmake	Sun Mar 13 22:34:30 2016 +0100
@@ -19,7 +19,7 @@
 # Irccd version.
 set(IRCCD_VERSION_MAJOR "2")
 set(IRCCD_VERSION_MINOR "0")
-set(IRCCD_VERSION_PATCH "0")
+set(IRCCD_VERSION_PATCH "1")
 set(IRCCD_VERSION "${IRCCD_VERSION_MAJOR}.${IRCCD_VERSION_MINOR}.${IRCCD_VERSION_PATCH}")
 
 #
@@ -32,7 +32,7 @@
 #
 set(IRCCD_RELEASE_DATE_YEAR 2016)
 set(IRCCD_RELEASE_DATE_MONTH 03)
-set(IRCCD_RELEASE_DATE_DAY 01)
+set(IRCCD_RELEASE_DATE_DAY 13)
 set(IRCCD_RELEASE_DATE "${IRCCD_RELEASE_DATE_YEAR}-${IRCCD_RELEASE_DATE_MONTH}-${IRCCD_RELEASE_DATE_DAY}")
 
 # All plugins.
--- a/irccd/js-plugin.cpp	Tue Mar 01 08:53:30 2016 +0100
+++ b/irccd/js-plugin.cpp	Sun Mar 13 22:34:30 2016 +0100
@@ -73,10 +73,10 @@
 		} catch (...) {
 			ctx.push(js::Undefined{});
 		}
+	} else {
+		ctx.push(ctx.getGlobal<js::RawPointer<Plugin>>("\xff""\xff""plugin")->info());
 	}
 
-	ctx.push(ctx.getGlobal<js::RawPointer<Plugin>>("\xff""\xff""plugin")->info());
-
 	return 1;
 }
 
--- a/plugins/plugin/plugin.js	Tue Mar 01 08:53:30 2016 +0100
+++ b/plugins/plugin/plugin.js	Sun Mar 13 22:34:30 2016 +0100
@@ -100,7 +100,7 @@
 
 	usage: function (server, origin, target)
 	{
-		server.message(target, Util.format(formats["usage"], commands.keywords(server, origin)));
+		server.message(target, Util.format(formats["usage"], commands.keywords(server, target, origin)));
 	},
 
 	execute: function (server, origin, target, message, query)
@@ -124,6 +124,7 @@
 			commands.list(server, origin, target, query);
 			break;
 		default:
+			commands.usage(server, origin, target);
 			break;
 		}
 	}