corrade-lsl-templates – Diff between revs 29 and 30

Subversion Repositories:

?pathlinks?

Rev 29 – Rev 41 – Go to most recent revision – Details – Blame – Last modification – View Log

 ///////////////////////////////////////////////////////////////////////////
-//  Copyright (C) Wizardry and Steamworks 2018 - License: CC BY 2.0      //
+//  Copyright (C) Wizardry and Steamworks 2018 - License: GNU GPLv3      //
 ///////////////////////////////////////////////////////////////////////////
 //
 // A database-based joke module for Corrade Eggdrop.
 //
 ///////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2014 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2015 Wizardry and Steamworks - License: CC BY 2.0    //
 ///////////////////////////////////////////////////////////////////////////
 string wasKeyValueGet(string k, string data) {
     if(llStringLength(data) == 0) return "";
     if(llStringLength(k) == 0) return "";
     list a = llParseString2List(data, ["&", "="], []);
-    integer i = llListFindList(a, [ k ]);
+    integer i = llListFindList(llList2ListStrided(a, 0, -1, 2), [ k ]);
-    if(i != -1) return llList2String(a, i+1);
+    if(i != -1) return llList2String(a, 2*i+1);
     return "";
+}
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2013 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2013 Wizardry and Steamworks - License: GNU GPLv3    //
 ///////////////////////////////////////////////////////////////////////////
 string wasKeyValueEncode(list data) {
     list k = llList2ListStrided(data, 0, -1, 2);
     } while(llGetListLength(k) != 0);
     return llDumpList2String(data, "&");
+}
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2011 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2011 Wizardry and Steamworks - License: GNU GPLv3    //
 ///////////////////////////////////////////////////////////////////////////
 // http://was.fm/secondlife/wanderer
 vector wasCirclePoint(float radius) {
     float x = llPow(-1, 1 + (integer) llFrand(2)) * llFrand(radius*2);
         return <x, y, 0>;
     return wasCirclePoint(radius);
+}
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2015 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3    //
 ///////////////////////////////////////////////////////////////////////////
 // escapes a string in conformance with RFC1738
 string wasURLEscape(string i) {
     string o = "";
     } while(i != "");
     return o;
+}
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2015 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3    //
 ///////////////////////////////////////////////////////////////////////////
 list wasCSVToList(string csv) {
     list l = [];
     list s = [];
     // postcondition: length(s) = 0
     return l + m;
+}
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2015 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3    //
 ///////////////////////////////////////////////////////////////////////////
 string wasListToCSV(list l) {
     list v = [];
     do {
     } while(l != []);
     return llDumpList2String(v, ",");
+}
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2015 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3    //
 ///////////////////////////////////////////////////////////////////////////
 // unescapes a string in conformance with RFC1738
 string wasURLUnescape(string i) {
     return llUnescapeURL(
         );
         joke_counter = llList2Integer(
             result,
             llListFindList(result, ["count"]) + 1
-        );
+        ) + 1;
         llOwnerSay("[Joke] There are " + (string)joke_counter + " jokes in the database.");
         state listen_group;
         // We only care about notifications now.
         if(id != "notification")
             return;
         // This script only processes group notifications.
+        if(wasKeyValueGet("type", message) != "group" ||
+            (wasKeyValueGet("type", message) == "group" &&
+            wasURLUnescape(wasKeyValueGet("group", message)) !=
-        if(wasKeyValueGet("type", message) != "group")
+            wasKeyValueGet("group", configuration)))
             return;
         // Get the message sender.
             jump_state = "remove";
             state url;
+        }
         data = llDumpList2String(command, " ");
-        if((integer)data == 0)
+        if((integer)data <= 0)
             data = "";
         jump_state = "get";
         state url;
+    }
+}
 state add {
     state_entry() {
         // DEBUG
-        llOwnerSay("[Joke] Adding to database.");
+        llOwnerSay("[Joke] Adding to database: " + (string)(joke_counter + 1));
         llInstantMessage(
             wasKeyValueGet(
                 "corrade",
                 configuration
         if(wasKeyValueGet("command", body) != "database" ||
             wasKeyValueGet("success", body) != "True") {
             // DEBUG
             llOwnerSay("[Joke] Unable modify database: " +
                 wasURLUnescape(
-                    wasKeyValueGet("error", body)
+                    wasKeyValueGet("data", body)
+                )
             );
             state listen_group;
+        }
         ++joke_counter;