Mercurial > irccd

changeset 64:5a42be98e9a8 release-2.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix #430: invalid info in plugin - Fix invalid conditional in Irccd.Plugin.info (js-plugin.cpp) which always returns the current plugin information, - Add usage warning when running `!plugin` with no arguments. Task: #430 Errata: 20160307
author David Demelier <markand@malikania.fr>
date Mon, 07 Mar 2016 19:08:11 +0100
parents adfc2be5ee30
children 02bb385da6e3
files irccd/js-plugin.cpp plugins/plugin/plugin.js
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/irccd/js-plugin.cpp	Tue Mar 01 08:53:16 2016 +0100
+++ b/irccd/js-plugin.cpp	Mon Mar 07 19:08:11 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:16 2016 +0100
+++ b/plugins/plugin/plugin.js	Mon Mar 07 19:08:11 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;
 		}
 	}