changeset 724:99c52213e3bd

Irccd: fix typo and check for info.name property
author David Demelier <markand@malikania.fr>
date Tue, 17 Jul 2018 20:31:00 +0200
parents e8c4ba5ed1c6
children 0dbe1842a7d8
files libirccd-js/irccd/js/js_plugin.cpp plugins/auth/auth.js
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libirccd-js/irccd/js/js_plugin.cpp	Mon Jul 16 21:47:27 2018 +0200
+++ b/libirccd-js/irccd/js/js_plugin.cpp	Tue Jul 17 20:31:00 2018 +0200
@@ -45,14 +45,17 @@
 
 auto get_metadata(dukx_context& ctx, std::string_view name) -> std::string_view
 {
-    std::string_view ret;
+    std::string_view ret("unknown");
 
     dukx_stack_assert guard(ctx);
     duk_get_global_string(ctx, "info");
 
     if (duk_get_type(ctx, -1) == DUK_TYPE_OBJECT) {
         duk_get_prop_string(ctx, -1, name.data());
-        ret = duk_get_string(ctx, -1);
+
+        if (duk_get_type(ctx, -1) == DUK_TYPE_STRING)
+            ret = duk_get_string(ctx, -1);
+
         duk_pop(ctx);
     }
 
--- a/plugins/auth/auth.js	Mon Jul 16 21:47:27 2018 +0200
+++ b/plugins/auth/auth.js	Tue Jul 17 20:31:00 2018 +0200
@@ -18,7 +18,7 @@
 
 // Plugin information.
 info = {
-    auth: "auth",
+    name: "auth",
     author: "David Demelier <markand@malikania.fr>",
     license: "ISC",
     summary: "Generic plugin to authenticate to services",