From 4f86f920c6a42fbfe44a8bb11e26c549feeea9a5 Mon Sep 17 00:00:00 2001 From: Cubester Date: Fri, 17 Jan 2025 01:35:02 -0500 Subject: [PATCH 01/14] Webhooks extension --- docs/CubesterYT/Webhooks.md | 33 +++++ extensions/CubesterYT/Webhooks.js | 225 ++++++++++++++++++++++++++++++ extensions/extensions.json | 2 +- images/CubesterYT/Webhooks.svg | 88 ++++++++++++ 4 files changed, 347 insertions(+), 1 deletion(-) create mode 100644 docs/CubesterYT/Webhooks.md create mode 100644 extensions/CubesterYT/Webhooks.js create mode 100644 images/CubesterYT/Webhooks.svg diff --git a/docs/CubesterYT/Webhooks.md b/docs/CubesterYT/Webhooks.md new file mode 100644 index 0000000000..61939ee67c --- /dev/null +++ b/docs/CubesterYT/Webhooks.md @@ -0,0 +1,33 @@ +# Webhooks + +This extension allows you to use [Webhooks](https://en.wikipedia.org/wiki/Webhook). It provides a simple way to save multiple Webhooks to your project for easy management and easy data handling. + +These blocks are made with simplicity in mind so that your project isn't messy when you implement Webhooks. + +## Adding a Webhook + +When loading the extension, you are provided with a button, `Add a Webhook`, to make a new Webhook. It will prompt you to type in a name, which the Webhook registers under, and then prompt you to provide the URL of the Webhook. Please make sure the Webhook URL is valid before making the Webhook, else the extension can't send anything. + +## Deleting a Webhook + +You can delete a specific Webhook by pressing the `Delete a Webhook` button, where you will be prompted to enter the name of the Webhook you wish to delete. + +## Blocks + +```scratch +(data of [Webhook v] :: #C73A63) +``` + +This block reports the data the Webhook chosen from the dropdown is currently assigned to. + +```scratch +set data of [Webhook v] to [{"key":"value"}] and type to [application/json v] :: #C73A63 +``` + +This block is used to set data to the chosen Webhook from the list. It only supports JSON inputs, but using the second dropdown, you can make the content type either `application/json` or `application/x-www-form-urlencoded`. The extension will automatically handle conversions for your ease. + +```scratch +send data to [Webhook v] :: #C73A63 +``` + +This block sends the data that is set for the selected Webhook. \ No newline at end of file diff --git a/extensions/CubesterYT/Webhooks.js b/extensions/CubesterYT/Webhooks.js new file mode 100644 index 0000000000..90730504ab --- /dev/null +++ b/extensions/CubesterYT/Webhooks.js @@ -0,0 +1,225 @@ +// Name: Webhooks +// ID: cubesterWebhooks +// Description: A modern, very capable, Webhook extension. +// By: CubesterYT +// License: MPL-2.0 + +// Version V.1.0.0 + +(function (Scratch) { + "use strict"; + + const icon = ""; + + let hideFromPalette = true; + let webhooks; + function setupStorage() { + if (!Scratch.vm.runtime.extensionStorage["cubesterWebhooks"]) { + Scratch.vm.runtime.extensionStorage["cubesterWebhooks"] = + Object.create(null); + Scratch.vm.runtime.extensionStorage["cubesterWebhooks"].webhooks = + Object.create(null); + } + webhooks = Scratch.vm.runtime.extensionStorage["cubesterWebhooks"].webhooks; + } + setupStorage(); + Scratch.vm.runtime.on("PROJECT_LOADED", setupStorage); + + function toForm(data) { + const parts = []; + const process = (name, value) => { + if (value === null || value === undefined) { + parts.push(`${encodeURIComponent(name)}=null`); + } else if ( + typeof value === "string" || + typeof value === "number" || + typeof value === "boolean" + ) { + parts.push(`${encodeURIComponent(name)}=${encodeURIComponent(value)}`); + } else if (Array.isArray(value)) { + value.forEach((elem, index) => process(`${name}[${index}]`, elem)); + } else if (typeof value === "object") { + Object.keys(value).forEach((key) => + process(`${name}[${key}]`, value[key]) + ); + } + }; + Object.keys(data).forEach((key) => process(key, data[key])); + return parts.join("&"); + } + + class Webhooks { + getInfo() { + return { + id: "cubesterWebhooks", + name: Scratch.translate("Webhooks"), + color1: "#C73A63", + menuIconURI: icon, + docsURI: "https://extensions.turbowarp.org/CubesterYT/Webhooks", + + blocks: [ + "---", + + { + func: "addWebhook", + text: Scratch.translate("Add a Webhook"), + blockType: Scratch.BlockType.BUTTON, + }, + { + func: "deleteWebhook", + text: Scratch.translate("Delete a Webhook"), + blockType: Scratch.BlockType.BUTTON, + hideFromPalette, + }, + { + opcode: "data", + text: Scratch.translate("data of [WEBHOOK]"), + blockType: Scratch.BlockType.REPORTER, + disableMonitor: true, + hideFromPalette, + arguments: { + WEBHOOK: { + type: Scratch.ArgumentType.STRING, + menu: "WEBHOOKS", + }, + }, + }, + { + opcode: "setData", + text: Scratch.translate( + "set data of [WEBHOOK] to [JSON] and type to [TYPE]" + ), + blockType: Scratch.BlockType.COMMAND, + hideFromPalette, + arguments: { + WEBHOOK: { + type: Scratch.ArgumentType.STRING, + menu: "WEBHOOKS", + }, + JSON: { + type: Scratch.ArgumentType.STRING, + defaultValue: '{"key":"value"}', + }, + TYPE: { + type: Scratch.ArgumentType.STRING, + menu: "TYPE", + }, + }, + }, + { + opcode: "postData", + text: Scratch.translate("send data to [WEBHOOK]"), + blockType: Scratch.BlockType.COMMAND, + hideFromPalette, + arguments: { + WEBHOOK: { + type: Scratch.ArgumentType.STRING, + menu: "WEBHOOKS", + }, + }, + }, + ], + menus: { + WEBHOOKS: { + acceptReporters: false, + items: "_webhookMenu", + }, + TYPE: { + acceptReporters: false, + items: ["application/json", "application/x-www-form-urlencoded"], + }, + }, + }; + } + + addWebhook() { + let name; + do { + name = prompt(Scratch.translate("Enter Webhook name:")); + if (name === null) { + return; + } + if (Object.keys(webhooks).includes(name)) { + alert( + Scratch.translate( + "This Webhook already exists! Please try a different name." + ) + ); + } + } while (Object.keys(webhooks).includes(name)); + let URL = prompt(Scratch.translate("Enter Webhook URL:")); + webhooks[name] = { URL, DATA: {}, TYPE: "application/json" }; + hideFromPalette = false; + Scratch.vm.extensionManager.refreshBlocks(); + } + deleteWebhook() { + let name; + do { + name = prompt(Scratch.translate("Enter Webhook name:")); + if (name === null) { + return; + } + if (!Object.keys(webhooks).includes(name)) { + alert( + Scratch.translate( + "This Webhook does not exist. Please enter a valid webhook name." + ) + ); + } + } while (!Object.keys(webhooks).includes(name)); + delete webhooks[name]; + if (Object.keys(webhooks).length === 0) { + hideFromPalette = true; + Scratch.vm.extensionManager.refreshBlocks(); + } + } + data(args) { + try { + switch (webhooks[args.WEBHOOK].TYPE) { + case "application/json": + return JSON.stringify(webhooks[args.WEBHOOK].DATA); + case "application/x-www-form-urlencoded": + return toForm(webhooks[args.WEBHOOK].DATA); + } + } catch (error) { + return ""; + } + } + setData(args) { + try { + webhooks[args.WEBHOOK].DATA = JSON.parse( + Scratch.Cast.toString(args.JSON) + ); + webhooks[args.WEBHOOK].TYPE = args.TYPE; + } catch (error) { + return; + } + } + postData(args) { + try { + Scratch.fetch(webhooks[args.WEBHOOK].URL, { + method: "POST", + headers: { + "Content-type": webhooks[args.WEBHOOK].TYPE, + }, + body: + webhooks[args.WEBHOOK].TYPE === "application/json" + ? JSON.stringify(webhooks[args.WEBHOOK].DATA) + : toForm(webhooks[args.WEBHOOK].DATA), + }); + } catch (error) { + return; + } + } + + _webhookMenu() { + if (Object.keys(webhooks).length > 0) { + return Object.keys(webhooks); + } else { + return [""]; + } + } + } + + Scratch.extensions.register(new Webhooks()); +})(Scratch); diff --git a/extensions/extensions.json b/extensions/extensions.json index 9027c00ac9..873ddb6e72 100644 --- a/extensions/extensions.json +++ b/extensions/extensions.json @@ -88,9 +88,9 @@ "vercte/dictionaries", "godslayerakp/http", "godslayerakp/ws", + "CubesterYT/Webhooks", "Lily/CommentBlocks", "veggiecan/LongmanDictionary", - "CubesterYT/TurboHook", "Alestore/nfcwarp", "steamworks", "itchio", diff --git a/images/CubesterYT/Webhooks.svg b/images/CubesterYT/Webhooks.svg new file mode 100644 index 0000000000..0d9f91f736 --- /dev/null +++ b/images/CubesterYT/Webhooks.svg @@ -0,0 +1,88 @@ + + + + From 7effd946b9aade0435b92db0221ad9dbc9a977ad Mon Sep 17 00:00:00 2001 From: Cubester Date: Fri, 17 Jan 2025 18:38:47 -0500 Subject: [PATCH 02/14] URL Validation (Protection against inserting an invalid URL) --- extensions/CubesterYT/Webhooks.js | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/extensions/CubesterYT/Webhooks.js b/extensions/CubesterYT/Webhooks.js index 90730504ab..c133a2bb53 100644 --- a/extensions/CubesterYT/Webhooks.js +++ b/extensions/CubesterYT/Webhooks.js @@ -25,6 +25,15 @@ setupStorage(); Scratch.vm.runtime.on("PROJECT_LOADED", setupStorage); + function isURLValid(string) { + try { + const url = new URL(string); + return url.protocol === "http:" || url.protocol === "https:"; + } catch (error) { + return false; + } + } + function toForm(data) { const parts = []; const process = (name, value) => { @@ -147,7 +156,20 @@ ); } } while (Object.keys(webhooks).includes(name)); - let URL = prompt(Scratch.translate("Enter Webhook URL:")); + let URL; + do { + URL = prompt(Scratch.translate("Enter Webhook URL:")); + if (URL === null) { + return; + } + if (!isURLValid(URL)) { + alert( + Scratch.translate( + "Invalid URL! Please make sure you provide a valid URL." + ) + ); + } + } while (!isURLValid(URL)); webhooks[name] = { URL, DATA: {}, TYPE: "application/json" }; hideFromPalette = false; Scratch.vm.extensionManager.refreshBlocks(); From 76487e3f7c5e4d08b1ff210fc4d371e479d39820 Mon Sep 17 00:00:00 2001 From: Cubester Date: Fri, 17 Jan 2025 18:57:07 -0500 Subject: [PATCH 03/14] Icon --- extensions/CubesterYT/Webhooks.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/CubesterYT/Webhooks.js b/extensions/CubesterYT/Webhooks.js index c133a2bb53..f70da5e1da 100644 --- a/extensions/CubesterYT/Webhooks.js +++ b/extensions/CubesterYT/Webhooks.js @@ -9,7 +9,8 @@ (function (Scratch) { "use strict"; - const icon = ""; + const icon = + "data:image/svg+xml;base64,<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->

<svg
   width="64"
   height="64"
   viewBox="0 0 16.933333 16.933333"
   version="1.1"
   id="svg1"
   xml:space="preserve"
   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
   sodipodi:docname="WebhooksIcon.svg"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
     id="namedview1"
     pagecolor="#505050"
     bordercolor="#ffffff"
     borderopacity="1"
     inkscape:showpageshadow="0"
     inkscape:pageopacity="0"
     inkscape:pagecheckerboard="1"
     inkscape:deskcolor="#505050"
     inkscape:document-units="px"
     inkscape:zoom="8.18"
     inkscape:cx="32.273839"
     inkscape:cy="33.06846"
     inkscape:window-width="1920"
     inkscape:window-height="1017"
     inkscape:window-x="-8"
     inkscape:window-y="-8"
     inkscape:window-maximized="1"
     inkscape:current-layer="layer1" /><defs
     id="defs1" /><g
     inkscape:label="Layer 1"
     inkscape:groupmode="layer"
     id="layer1"><circle
       style="opacity:1;fill:#c73a63;stroke-width:0.270447;fill-opacity:1"
       id="path2"
       cx="8.4666662"
       cy="8.4666662"
       r="8.4666662" /><path
       fill="#000000"
       d="M 8.2152276,2.73269 H 8.2008939 L 8.0575446,2.7613574 Q 7.5844923,2.8187033 7.1329427,3.0265543 6.6813921,3.2344098 6.3373531,3.5784487 5.7496211,4.1088414 5.5202629,4.8829272 5.3912484,5.312975 5.4055833,5.7860274 5.419917,6.2590797 5.5776022,6.6891276 5.8212963,7.3341999 6.3230183,7.8072523 L 6.5093731,7.9792712 5.3195732,9.9144861 Q 4.9468657,9.9001521 4.674502,10.014833 q -0.4300479,0.186355 -0.6450713,0.573398 -0.100347,0.215024 -0.1290145,0.444382 -0.028667,0.229359 0.028668,0.458718 0.1146796,0.430047 0.4730523,0.688076 0.2150245,0.14335 0.4730523,0.207857 0.258029,0.06451 0.5160579,0.02867 0.258029,-0.03584 0.4945551,-0.179185 0.2365262,-0.14335 0.3942103,-0.358374 0.172019,-0.243693 0.2078566,-0.559061 0.03584,-0.31537 -0.078841,-0.587734 -0.014334,-0.07168 -0.100347,-0.200688 L 6.265679,10.444875 7.9572009,7.6925704 Q 8.0432142,7.5635559 8.0718805,7.4918808 L 7.9285312,7.4488796 Q 7.7995168,7.4202122 7.7421764,7.3915447 7.4124733,7.2481954 7.1472775,6.9973344 6.8820806,6.7464735 6.7387313,6.4311052 6.4950383,5.9150473 6.6097169,5.355985 6.6670517,5.026282 6.853411,4.7395834 7.0397647,4.4528848 7.2977937,4.2521962 7.8281864,3.8651528 8.4732577,3.8651528 8.8603011,3.8508191 9.2258417,4.0013341 9.5913823,4.1518514 9.8637461,4.43855 q 0.2436929,0.2293582 0.3798749,0.5518944 0.136181,0.3225361 0.150517,0.6522392 0,0.2436941 -0.08601,0.6020668 l 1.003445,0.2723638 0.114679,0.014334 Q 11.626938,5.9150462 11.526596,5.2986446 11.469261,4.8255923 11.247066,4.3883765 11.024874,3.9511606 10.680837,3.6214576 10.078769,3.0193908 9.20434,2.8187022 9.1183267,2.7900348 8.9463111,2.7613563 L 8.7456214,2.7326889 Z m 0.2580279,1.7775308 q -0.2436931,0 -0.4873872,0.100347 Q 7.7421742,4.7109148 7.5486525,4.9044343 7.3551319,5.097955 7.2691218,5.3559839 7.1544422,5.6426825 7.2117868,5.9867214 q 0.043001,0.2580279 0.2006885,0.4873872 0.1576841,0.2293593 0.4013783,0.3583738 0.3440378,0.2150234 0.8027553,0.1863526 0.043001,0.057346 0.07168,0.1146808 L 10.2938,9.871486 q 0.043,0.086013 0.08601,0.129014 0.387044,-0.372707 0.838594,-0.5088894 0.451551,-0.1361814 0.93177,-0.050173 0.48022,0.086013 0.838594,0.3727076 0.458717,0.3583728 0.62357,0.8815988 0.164851,0.523225 0.0071,1.053617 -0.11468,0.401378 -0.408545,0.716747 -0.293867,0.315368 -0.695245,0.473052 -0.444383,0.186354 -0.953273,0.121847 -0.50889,-0.06451 -0.910267,-0.351206 -0.05734,-0.043 -0.186354,-0.143349 l -0.07168,-0.08601 q -0.05734,0.043 -0.157685,0.14335 l -0.6737399,0.659406 q 0.329703,0.329704 0.7454149,0.551894 0.415713,0.222192 0.87443,0.308202 l 0.315369,0.05735 h 0.559062 l 0.401378,-0.07168 q 0.917435,-0.186354 1.576842,-0.860096 0.315369,-0.315368 0.523225,-0.723914 0.207857,-0.408545 0.279531,-0.852928 0.07168,-0.516057 -0.02867,-1.024948 Q 14.708939,10.158181 14.450914,9.7424683 14.192885,9.3267552 13.820176,9.011387 13.447469,8.6960177 13.003086,8.5096639 12.515698,8.3089753 11.992473,8.2803057 11.469248,8.2516383 10.967525,8.3806527 L 10.723832,8.4523323 9.5627039,6.4884467 Q 9.7490577,6.2160829 9.7920632,5.958054 9.8637318,5.4993365 9.6057084,5.0979583 9.3763502,4.7395856 8.9749719,4.5962363 8.7312778,4.510223 8.4732489,4.510223 Z M 4.4308057,8.2946416 Q 3.5993806,8.4809965 2.9973127,9.0543936 2.3235718,9.6851301 2.1228778,10.559561 l -0.057313,0.344038 v 0.530392 l 0.028711,0.157684 q 0.028712,0.186355 0.057313,0.286699 0.100336,0.444383 0.3512014,0.845762 0.2508621,0.401377 0.6092348,0.702411 0.7167465,0.587732 1.6485174,0.702411 0.5447264,0.05734 1.089454,-0.06451 0.5447275,-0.121847 1.003445,-0.408545 0.7597509,-0.487388 1.1181247,-1.30448 0.100347,-0.243693 0.2006886,-0.645071 0.086013,-0.01433 0.2580289,0 l 1.7918664,0.02867 q 0.200688,0 0.286697,0.01433 0.157684,0.2867 0.358374,0.444384 0.200689,0.157683 0.451551,0.229358 0.250861,0.07168 0.508889,0.05734 0.401379,-0.043 0.716746,-0.286697 0.387043,-0.301035 0.458719,-0.774087 0.02867,-0.243693 -0.02151,-0.473053 -0.05017,-0.229358 -0.193522,-0.430048 -0.229358,-0.315368 -0.587732,-0.458717 -0.243694,-0.1003471 -0.50889,-0.093175 -0.265196,0.00715 -0.50889,0.107509 -0.401377,0.172019 -0.616402,0.530391 l -0.043,0.08601 q -0.200689,0 -0.6020672,-0.01433 L 8.3012661,10.659907 Q 8.0862427,10.645577 7.6848645,10.645577 L 6.968118,10.631247 7.011119,10.87494 Q 7.1258023,11.49133 6.8247689,12.036058 6.6240803,12.4231 6.2513717,12.681129 5.8786631,12.939158 5.4342804,12.996498 4.9325584,13.082511 4.4308354,12.888989 3.9291134,12.695468 3.6137452,12.279754 3.2123669,11.778032 3.2267018,11.147296 3.2410355,10.616903 3.5564048,10.158186 3.7427596,9.8858208 4.0151223,9.6994682 4.2874861,9.5131134 4.6028543,9.4271033 l 0.1290145,-0.043001 z"
       id="path1"
       style="fill:#ffffff;stroke-width:0.0143349" /></g></svg>
"; let hideFromPalette = true; let webhooks; From c568479b278f036d32b8f8b601ba6341a3cd8e26 Mon Sep 17 00:00:00 2001 From: Cubester Date: Fri, 17 Jan 2025 19:00:48 -0500 Subject: [PATCH 04/14] Clean this up --- extensions/CubesterYT/Webhooks.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/extensions/CubesterYT/Webhooks.js b/extensions/CubesterYT/Webhooks.js index f70da5e1da..46d1292444 100644 --- a/extensions/CubesterYT/Webhooks.js +++ b/extensions/CubesterYT/Webhooks.js @@ -12,19 +12,20 @@ const icon = "data:image/svg+xml;base64,<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->

<svg
   width="64"
   height="64"
   viewBox="0 0 16.933333 16.933333"
   version="1.1"
   id="svg1"
   xml:space="preserve"
   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
   sodipodi:docname="WebhooksIcon.svg"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
     id="namedview1"
     pagecolor="#505050"
     bordercolor="#ffffff"
     borderopacity="1"
     inkscape:showpageshadow="0"
     inkscape:pageopacity="0"
     inkscape:pagecheckerboard="1"
     inkscape:deskcolor="#505050"
     inkscape:document-units="px"
     inkscape:zoom="8.18"
     inkscape:cx="32.273839"
     inkscape:cy="33.06846"
     inkscape:window-width="1920"
     inkscape:window-height="1017"
     inkscape:window-x="-8"
     inkscape:window-y="-8"
     inkscape:window-maximized="1"
     inkscape:current-layer="layer1" /><defs
     id="defs1" /><g
     inkscape:label="Layer 1"
     inkscape:groupmode="layer"
     id="layer1"><circle
       style="opacity:1;fill:#c73a63;stroke-width:0.270447;fill-opacity:1"
       id="path2"
       cx="8.4666662"
       cy="8.4666662"
       r="8.4666662" /><path
       fill="#000000"
       d="M 8.2152276,2.73269 H 8.2008939 L 8.0575446,2.7613574 Q 7.5844923,2.8187033 7.1329427,3.0265543 6.6813921,3.2344098 6.3373531,3.5784487 5.7496211,4.1088414 5.5202629,4.8829272 5.3912484,5.312975 5.4055833,5.7860274 5.419917,6.2590797 5.5776022,6.6891276 5.8212963,7.3341999 6.3230183,7.8072523 L 6.5093731,7.9792712 5.3195732,9.9144861 Q 4.9468657,9.9001521 4.674502,10.014833 q -0.4300479,0.186355 -0.6450713,0.573398 -0.100347,0.215024 -0.1290145,0.444382 -0.028667,0.229359 0.028668,0.458718 0.1146796,0.430047 0.4730523,0.688076 0.2150245,0.14335 0.4730523,0.207857 0.258029,0.06451 0.5160579,0.02867 0.258029,-0.03584 0.4945551,-0.179185 0.2365262,-0.14335 0.3942103,-0.358374 0.172019,-0.243693 0.2078566,-0.559061 0.03584,-0.31537 -0.078841,-0.587734 -0.014334,-0.07168 -0.100347,-0.200688 L 6.265679,10.444875 7.9572009,7.6925704 Q 8.0432142,7.5635559 8.0718805,7.4918808 L 7.9285312,7.4488796 Q 7.7995168,7.4202122 7.7421764,7.3915447 7.4124733,7.2481954 7.1472775,6.9973344 6.8820806,6.7464735 6.7387313,6.4311052 6.4950383,5.9150473 6.6097169,5.355985 6.6670517,5.026282 6.853411,4.7395834 7.0397647,4.4528848 7.2977937,4.2521962 7.8281864,3.8651528 8.4732577,3.8651528 8.8603011,3.8508191 9.2258417,4.0013341 9.5913823,4.1518514 9.8637461,4.43855 q 0.2436929,0.2293582 0.3798749,0.5518944 0.136181,0.3225361 0.150517,0.6522392 0,0.2436941 -0.08601,0.6020668 l 1.003445,0.2723638 0.114679,0.014334 Q 11.626938,5.9150462 11.526596,5.2986446 11.469261,4.8255923 11.247066,4.3883765 11.024874,3.9511606 10.680837,3.6214576 10.078769,3.0193908 9.20434,2.8187022 9.1183267,2.7900348 8.9463111,2.7613563 L 8.7456214,2.7326889 Z m 0.2580279,1.7775308 q -0.2436931,0 -0.4873872,0.100347 Q 7.7421742,4.7109148 7.5486525,4.9044343 7.3551319,5.097955 7.2691218,5.3559839 7.1544422,5.6426825 7.2117868,5.9867214 q 0.043001,0.2580279 0.2006885,0.4873872 0.1576841,0.2293593 0.4013783,0.3583738 0.3440378,0.2150234 0.8027553,0.1863526 0.043001,0.057346 0.07168,0.1146808 L 10.2938,9.871486 q 0.043,0.086013 0.08601,0.129014 0.387044,-0.372707 0.838594,-0.5088894 0.451551,-0.1361814 0.93177,-0.050173 0.48022,0.086013 0.838594,0.3727076 0.458717,0.3583728 0.62357,0.8815988 0.164851,0.523225 0.0071,1.053617 -0.11468,0.401378 -0.408545,0.716747 -0.293867,0.315368 -0.695245,0.473052 -0.444383,0.186354 -0.953273,0.121847 -0.50889,-0.06451 -0.910267,-0.351206 -0.05734,-0.043 -0.186354,-0.143349 l -0.07168,-0.08601 q -0.05734,0.043 -0.157685,0.14335 l -0.6737399,0.659406 q 0.329703,0.329704 0.7454149,0.551894 0.415713,0.222192 0.87443,0.308202 l 0.315369,0.05735 h 0.559062 l 0.401378,-0.07168 q 0.917435,-0.186354 1.576842,-0.860096 0.315369,-0.315368 0.523225,-0.723914 0.207857,-0.408545 0.279531,-0.852928 0.07168,-0.516057 -0.02867,-1.024948 Q 14.708939,10.158181 14.450914,9.7424683 14.192885,9.3267552 13.820176,9.011387 13.447469,8.6960177 13.003086,8.5096639 12.515698,8.3089753 11.992473,8.2803057 11.469248,8.2516383 10.967525,8.3806527 L 10.723832,8.4523323 9.5627039,6.4884467 Q 9.7490577,6.2160829 9.7920632,5.958054 9.8637318,5.4993365 9.6057084,5.0979583 9.3763502,4.7395856 8.9749719,4.5962363 8.7312778,4.510223 8.4732489,4.510223 Z M 4.4308057,8.2946416 Q 3.5993806,8.4809965 2.9973127,9.0543936 2.3235718,9.6851301 2.1228778,10.559561 l -0.057313,0.344038 v 0.530392 l 0.028711,0.157684 q 0.028712,0.186355 0.057313,0.286699 0.100336,0.444383 0.3512014,0.845762 0.2508621,0.401377 0.6092348,0.702411 0.7167465,0.587732 1.6485174,0.702411 0.5447264,0.05734 1.089454,-0.06451 0.5447275,-0.121847 1.003445,-0.408545 0.7597509,-0.487388 1.1181247,-1.30448 0.100347,-0.243693 0.2006886,-0.645071 0.086013,-0.01433 0.2580289,0 l 1.7918664,0.02867 q 0.200688,0 0.286697,0.01433 0.157684,0.2867 0.358374,0.444384 0.200689,0.157683 0.451551,0.229358 0.250861,0.07168 0.508889,0.05734 0.401379,-0.043 0.716746,-0.286697 0.387043,-0.301035 0.458719,-0.774087 0.02867,-0.243693 -0.02151,-0.473053 -0.05017,-0.229358 -0.193522,-0.430048 -0.229358,-0.315368 -0.587732,-0.458717 -0.243694,-0.1003471 -0.50889,-0.093175 -0.265196,0.00715 -0.50889,0.107509 -0.401377,0.172019 -0.616402,0.530391 l -0.043,0.08601 q -0.200689,0 -0.6020672,-0.01433 L 8.3012661,10.659907 Q 8.0862427,10.645577 7.6848645,10.645577 L 6.968118,10.631247 7.011119,10.87494 Q 7.1258023,11.49133 6.8247689,12.036058 6.6240803,12.4231 6.2513717,12.681129 5.8786631,12.939158 5.4342804,12.996498 4.9325584,13.082511 4.4308354,12.888989 3.9291134,12.695468 3.6137452,12.279754 3.2123669,11.778032 3.2267018,11.147296 3.2410355,10.616903 3.5564048,10.158186 3.7427596,9.8858208 4.0151223,9.6994682 4.2874861,9.5131134 4.6028543,9.4271033 l 0.1290145,-0.043001 z"
       id="path1"
       style="fill:#ffffff;stroke-width:0.0143349" /></g></svg>
"; + const runtime = Scratch.vm.runtime; + let hideFromPalette = true; let webhooks; function setupStorage() { - if (!Scratch.vm.runtime.extensionStorage["cubesterWebhooks"]) { - Scratch.vm.runtime.extensionStorage["cubesterWebhooks"] = - Object.create(null); - Scratch.vm.runtime.extensionStorage["cubesterWebhooks"].webhooks = + if (!runtime.extensionStorage["cubesterWebhooks"]) { + runtime.extensionStorage["cubesterWebhooks"] = Object.create(null); + runtime.extensionStorage["cubesterWebhooks"].webhooks = Object.create(null); } - webhooks = Scratch.vm.runtime.extensionStorage["cubesterWebhooks"].webhooks; + webhooks = runtime.extensionStorage["cubesterWebhooks"].webhooks; } setupStorage(); - Scratch.vm.runtime.on("PROJECT_LOADED", setupStorage); + runtime.on("PROJECT_LOADED", setupStorage); function isURLValid(string) { try { From fd23b2330452662e7ebe02749bd7c04fdd82a782 Mon Sep 17 00:00:00 2001 From: SharkPool <139097378+SharkPool-SP@users.noreply.github.com> Date: Fri, 17 Jan 2025 20:52:24 -0800 Subject: [PATCH 05/14] Webhooks.js -- dont allow empty string names --- extensions/CubesterYT/Webhooks.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/CubesterYT/Webhooks.js b/extensions/CubesterYT/Webhooks.js index 46d1292444..e6562c194a 100644 --- a/extensions/CubesterYT/Webhooks.js +++ b/extensions/CubesterYT/Webhooks.js @@ -147,7 +147,7 @@ let name; do { name = prompt(Scratch.translate("Enter Webhook name:")); - if (name === null) { + if (name === null || name === "") { return; } if (Object.keys(webhooks).includes(name)) { From a61f3dd11dc369be1884f4b192ddfb48fd486e3d Mon Sep 17 00:00:00 2001 From: Cubester Date: Sat, 18 Jan 2025 16:11:20 -0500 Subject: [PATCH 06/14] This is the proper way --- extensions/CubesterYT/Webhooks.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/extensions/CubesterYT/Webhooks.js b/extensions/CubesterYT/Webhooks.js index e6562c194a..9667b268e8 100644 --- a/extensions/CubesterYT/Webhooks.js +++ b/extensions/CubesterYT/Webhooks.js @@ -147,9 +147,16 @@ let name; do { name = prompt(Scratch.translate("Enter Webhook name:")); - if (name === null || name === "") { + if (name === null) { return; } + if (name === "") { + alert( + Scratch.translate( + "Please enter a name with at least one character!" + ) + ); + } if (Object.keys(webhooks).includes(name)) { alert( Scratch.translate( @@ -157,7 +164,7 @@ ) ); } - } while (Object.keys(webhooks).includes(name)); + } while (Object.keys(webhooks).includes(name) || name === ""); let URL; do { URL = prompt(Scratch.translate("Enter Webhook URL:")); From ea1538999ae89a33ab8daa50425903c609bf593b Mon Sep 17 00:00:00 2001 From: Cubester Date: Sat, 18 Jan 2025 16:40:17 -0500 Subject: [PATCH 07/14] Just to be safe --- extensions/CubesterYT/Webhooks.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/CubesterYT/Webhooks.js b/extensions/CubesterYT/Webhooks.js index 9667b268e8..df8ae860b3 100644 --- a/extensions/CubesterYT/Webhooks.js +++ b/extensions/CubesterYT/Webhooks.js @@ -201,8 +201,8 @@ delete webhooks[name]; if (Object.keys(webhooks).length === 0) { hideFromPalette = true; - Scratch.vm.extensionManager.refreshBlocks(); } + Scratch.vm.extensionManager.refreshBlocks(); } data(args) { try { From 50462c6ee24c0802258d0e07bea0aac312b679eb Mon Sep 17 00:00:00 2001 From: Cubester Date: Sat, 18 Jan 2025 17:18:33 -0500 Subject: [PATCH 08/14] Monkey discovers how to make :fire: --- extensions/CubesterYT/Webhooks.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/CubesterYT/Webhooks.js b/extensions/CubesterYT/Webhooks.js index df8ae860b3..f7223c49d5 100644 --- a/extensions/CubesterYT/Webhooks.js +++ b/extensions/CubesterYT/Webhooks.js @@ -181,7 +181,7 @@ } while (!isURLValid(URL)); webhooks[name] = { URL, DATA: {}, TYPE: "application/json" }; hideFromPalette = false; - Scratch.vm.extensionManager.refreshBlocks(); + Scratch.vm.extensionManager.refreshBlocks("cubesterWebhooks"); } deleteWebhook() { let name; @@ -202,7 +202,7 @@ if (Object.keys(webhooks).length === 0) { hideFromPalette = true; } - Scratch.vm.extensionManager.refreshBlocks(); + Scratch.vm.extensionManager.refreshBlocks("cubesterWebhooks"); } data(args) { try { From 0d171a39aa32a5c28989b0874475d24a4712285b Mon Sep 17 00:00:00 2001 From: Cubester Date: Sat, 18 Jan 2025 18:52:23 -0500 Subject: [PATCH 09/14] Adhere to reviewer --- extensions/CubesterYT/Webhooks.js | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/extensions/CubesterYT/Webhooks.js b/extensions/CubesterYT/Webhooks.js index f7223c49d5..6c5d5801ce 100644 --- a/extensions/CubesterYT/Webhooks.js +++ b/extensions/CubesterYT/Webhooks.js @@ -13,6 +13,7 @@ "data:image/svg+xml;base64,<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->

<svg
   width="64"
   height="64"
   viewBox="0 0 16.933333 16.933333"
   version="1.1"
   id="svg1"
   xml:space="preserve"
   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
   sodipodi:docname="WebhooksIcon.svg"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
     id="namedview1"
     pagecolor="#505050"
     bordercolor="#ffffff"
     borderopacity="1"
     inkscape:showpageshadow="0"
     inkscape:pageopacity="0"
     inkscape:pagecheckerboard="1"
     inkscape:deskcolor="#505050"
     inkscape:document-units="px"
     inkscape:zoom="8.18"
     inkscape:cx="32.273839"
     inkscape:cy="33.06846"
     inkscape:window-width="1920"
     inkscape:window-height="1017"
     inkscape:window-x="-8"
     inkscape:window-y="-8"
     inkscape:window-maximized="1"
     inkscape:current-layer="layer1" /><defs
     id="defs1" /><g
     inkscape:label="Layer 1"
     inkscape:groupmode="layer"
     id="layer1"><circle
       style="opacity:1;fill:#c73a63;stroke-width:0.270447;fill-opacity:1"
       id="path2"
       cx="8.4666662"
       cy="8.4666662"
       r="8.4666662" /><path
       fill="#000000"
       d="M 8.2152276,2.73269 H 8.2008939 L 8.0575446,2.7613574 Q 7.5844923,2.8187033 7.1329427,3.0265543 6.6813921,3.2344098 6.3373531,3.5784487 5.7496211,4.1088414 5.5202629,4.8829272 5.3912484,5.312975 5.4055833,5.7860274 5.419917,6.2590797 5.5776022,6.6891276 5.8212963,7.3341999 6.3230183,7.8072523 L 6.5093731,7.9792712 5.3195732,9.9144861 Q 4.9468657,9.9001521 4.674502,10.014833 q -0.4300479,0.186355 -0.6450713,0.573398 -0.100347,0.215024 -0.1290145,0.444382 -0.028667,0.229359 0.028668,0.458718 0.1146796,0.430047 0.4730523,0.688076 0.2150245,0.14335 0.4730523,0.207857 0.258029,0.06451 0.5160579,0.02867 0.258029,-0.03584 0.4945551,-0.179185 0.2365262,-0.14335 0.3942103,-0.358374 0.172019,-0.243693 0.2078566,-0.559061 0.03584,-0.31537 -0.078841,-0.587734 -0.014334,-0.07168 -0.100347,-0.200688 L 6.265679,10.444875 7.9572009,7.6925704 Q 8.0432142,7.5635559 8.0718805,7.4918808 L 7.9285312,7.4488796 Q 7.7995168,7.4202122 7.7421764,7.3915447 7.4124733,7.2481954 7.1472775,6.9973344 6.8820806,6.7464735 6.7387313,6.4311052 6.4950383,5.9150473 6.6097169,5.355985 6.6670517,5.026282 6.853411,4.7395834 7.0397647,4.4528848 7.2977937,4.2521962 7.8281864,3.8651528 8.4732577,3.8651528 8.8603011,3.8508191 9.2258417,4.0013341 9.5913823,4.1518514 9.8637461,4.43855 q 0.2436929,0.2293582 0.3798749,0.5518944 0.136181,0.3225361 0.150517,0.6522392 0,0.2436941 -0.08601,0.6020668 l 1.003445,0.2723638 0.114679,0.014334 Q 11.626938,5.9150462 11.526596,5.2986446 11.469261,4.8255923 11.247066,4.3883765 11.024874,3.9511606 10.680837,3.6214576 10.078769,3.0193908 9.20434,2.8187022 9.1183267,2.7900348 8.9463111,2.7613563 L 8.7456214,2.7326889 Z m 0.2580279,1.7775308 q -0.2436931,0 -0.4873872,0.100347 Q 7.7421742,4.7109148 7.5486525,4.9044343 7.3551319,5.097955 7.2691218,5.3559839 7.1544422,5.6426825 7.2117868,5.9867214 q 0.043001,0.2580279 0.2006885,0.4873872 0.1576841,0.2293593 0.4013783,0.3583738 0.3440378,0.2150234 0.8027553,0.1863526 0.043001,0.057346 0.07168,0.1146808 L 10.2938,9.871486 q 0.043,0.086013 0.08601,0.129014 0.387044,-0.372707 0.838594,-0.5088894 0.451551,-0.1361814 0.93177,-0.050173 0.48022,0.086013 0.838594,0.3727076 0.458717,0.3583728 0.62357,0.8815988 0.164851,0.523225 0.0071,1.053617 -0.11468,0.401378 -0.408545,0.716747 -0.293867,0.315368 -0.695245,0.473052 -0.444383,0.186354 -0.953273,0.121847 -0.50889,-0.06451 -0.910267,-0.351206 -0.05734,-0.043 -0.186354,-0.143349 l -0.07168,-0.08601 q -0.05734,0.043 -0.157685,0.14335 l -0.6737399,0.659406 q 0.329703,0.329704 0.7454149,0.551894 0.415713,0.222192 0.87443,0.308202 l 0.315369,0.05735 h 0.559062 l 0.401378,-0.07168 q 0.917435,-0.186354 1.576842,-0.860096 0.315369,-0.315368 0.523225,-0.723914 0.207857,-0.408545 0.279531,-0.852928 0.07168,-0.516057 -0.02867,-1.024948 Q 14.708939,10.158181 14.450914,9.7424683 14.192885,9.3267552 13.820176,9.011387 13.447469,8.6960177 13.003086,8.5096639 12.515698,8.3089753 11.992473,8.2803057 11.469248,8.2516383 10.967525,8.3806527 L 10.723832,8.4523323 9.5627039,6.4884467 Q 9.7490577,6.2160829 9.7920632,5.958054 9.8637318,5.4993365 9.6057084,5.0979583 9.3763502,4.7395856 8.9749719,4.5962363 8.7312778,4.510223 8.4732489,4.510223 Z M 4.4308057,8.2946416 Q 3.5993806,8.4809965 2.9973127,9.0543936 2.3235718,9.6851301 2.1228778,10.559561 l -0.057313,0.344038 v 0.530392 l 0.028711,0.157684 q 0.028712,0.186355 0.057313,0.286699 0.100336,0.444383 0.3512014,0.845762 0.2508621,0.401377 0.6092348,0.702411 0.7167465,0.587732 1.6485174,0.702411 0.5447264,0.05734 1.089454,-0.06451 0.5447275,-0.121847 1.003445,-0.408545 0.7597509,-0.487388 1.1181247,-1.30448 0.100347,-0.243693 0.2006886,-0.645071 0.086013,-0.01433 0.2580289,0 l 1.7918664,0.02867 q 0.200688,0 0.286697,0.01433 0.157684,0.2867 0.358374,0.444384 0.200689,0.157683 0.451551,0.229358 0.250861,0.07168 0.508889,0.05734 0.401379,-0.043 0.716746,-0.286697 0.387043,-0.301035 0.458719,-0.774087 0.02867,-0.243693 -0.02151,-0.473053 -0.05017,-0.229358 -0.193522,-0.430048 -0.229358,-0.315368 -0.587732,-0.458717 -0.243694,-0.1003471 -0.50889,-0.093175 -0.265196,0.00715 -0.50889,0.107509 -0.401377,0.172019 -0.616402,0.530391 l -0.043,0.08601 q -0.200689,0 -0.6020672,-0.01433 L 8.3012661,10.659907 Q 8.0862427,10.645577 7.6848645,10.645577 L 6.968118,10.631247 7.011119,10.87494 Q 7.1258023,11.49133 6.8247689,12.036058 6.6240803,12.4231 6.2513717,12.681129 5.8786631,12.939158 5.4342804,12.996498 4.9325584,13.082511 4.4308354,12.888989 3.9291134,12.695468 3.6137452,12.279754 3.2123669,11.778032 3.2267018,11.147296 3.2410355,10.616903 3.5564048,10.158186 3.7427596,9.8858208 4.0151223,9.6994682 4.2874861,9.5131134 4.6028543,9.4271033 l 0.1290145,-0.043001 z"
       id="path1"
       style="fill:#ffffff;stroke-width:0.0143349" /></g></svg>
"; const runtime = Scratch.vm.runtime; + const keys = Object.keys; let hideFromPalette = true; let webhooks; @@ -50,12 +51,12 @@ } else if (Array.isArray(value)) { value.forEach((elem, index) => process(`${name}[${index}]`, elem)); } else if (typeof value === "object") { - Object.keys(value).forEach((key) => + keys(value).forEach((key) => process(`${name}[${key}]`, value[key]) ); } }; - Object.keys(data).forEach((key) => process(key, data[key])); + keys(data).forEach((key) => process(key, data[key])); return parts.join("&"); } @@ -157,14 +158,14 @@ ) ); } - if (Object.keys(webhooks).includes(name)) { + if (keys(webhooks).includes(name)) { alert( Scratch.translate( "This Webhook already exists! Please try a different name." ) ); } - } while (Object.keys(webhooks).includes(name) || name === ""); + } while (keys(webhooks).includes(name) || name === ""); let URL; do { URL = prompt(Scratch.translate("Enter Webhook URL:")); @@ -190,16 +191,16 @@ if (name === null) { return; } - if (!Object.keys(webhooks).includes(name)) { + if (!keys(webhooks).includes(name)) { alert( Scratch.translate( "This Webhook does not exist. Please enter a valid webhook name." ) ); } - } while (!Object.keys(webhooks).includes(name)); + } while (!keys(webhooks).includes(name)); delete webhooks[name]; - if (Object.keys(webhooks).length === 0) { + if (keys(webhooks).length === 0) { hideFromPalette = true; } Scratch.vm.extensionManager.refreshBlocks("cubesterWebhooks"); @@ -207,10 +208,10 @@ data(args) { try { switch (webhooks[args.WEBHOOK].TYPE) { - case "application/json": - return JSON.stringify(webhooks[args.WEBHOOK].DATA); case "application/x-www-form-urlencoded": return toForm(webhooks[args.WEBHOOK].DATA); + default: + return JSON.stringify(webhooks[args.WEBHOOK].DATA); } } catch (error) { return ""; @@ -244,8 +245,8 @@ } _webhookMenu() { - if (Object.keys(webhooks).length > 0) { - return Object.keys(webhooks); + if (keys(webhooks).length > 0) { + return keys(webhooks); } else { return [""]; } From 13977e0eef0cc63b501e5b15f6d591fe83d2aa48 Mon Sep 17 00:00:00 2001 From: Cubester Date: Sat, 18 Jan 2025 18:55:28 -0500 Subject: [PATCH 10/14] Formatting is crazy --- extensions/CubesterYT/Webhooks.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/extensions/CubesterYT/Webhooks.js b/extensions/CubesterYT/Webhooks.js index 6c5d5801ce..8090630da4 100644 --- a/extensions/CubesterYT/Webhooks.js +++ b/extensions/CubesterYT/Webhooks.js @@ -51,9 +51,7 @@ } else if (Array.isArray(value)) { value.forEach((elem, index) => process(`${name}[${index}]`, elem)); } else if (typeof value === "object") { - keys(value).forEach((key) => - process(`${name}[${key}]`, value[key]) - ); + keys(value).forEach((key) => process(`${name}[${key}]`, value[key])); } }; keys(data).forEach((key) => process(key, data[key])); From 6c05a97b20fc98b3aa985f19d6555761198b6eff Mon Sep 17 00:00:00 2001 From: Muffin Date: Mon, 20 Jan 2025 13:04:10 -0600 Subject: [PATCH 11/14] using object.create(null) when initializing the storage doesnt make sense since it wont be null when restoring storage that already exists --- extensions/CubesterYT/Webhooks.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/CubesterYT/Webhooks.js b/extensions/CubesterYT/Webhooks.js index 8090630da4..d3cfd473e4 100644 --- a/extensions/CubesterYT/Webhooks.js +++ b/extensions/CubesterYT/Webhooks.js @@ -19,9 +19,9 @@ let webhooks; function setupStorage() { if (!runtime.extensionStorage["cubesterWebhooks"]) { - runtime.extensionStorage["cubesterWebhooks"] = Object.create(null); - runtime.extensionStorage["cubesterWebhooks"].webhooks = - Object.create(null); + runtime.extensionStorage["cubesterWebhooks"] = { + webhooks: {} + }; } webhooks = runtime.extensionStorage["cubesterWebhooks"].webhooks; } From b5c1c1503b382e6737b075541cc278bfaef78932 Mon Sep 17 00:00:00 2001 From: Cubester Date: Mon, 20 Jan 2025 14:35:44 -0500 Subject: [PATCH 12/14] Fixes --- extensions/CubesterYT/Webhooks.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/extensions/CubesterYT/Webhooks.js b/extensions/CubesterYT/Webhooks.js index d3cfd473e4..5da653b8c1 100644 --- a/extensions/CubesterYT/Webhooks.js +++ b/extensions/CubesterYT/Webhooks.js @@ -20,10 +20,13 @@ function setupStorage() { if (!runtime.extensionStorage["cubesterWebhooks"]) { runtime.extensionStorage["cubesterWebhooks"] = { - webhooks: {} + webhooks: {}, }; } webhooks = runtime.extensionStorage["cubesterWebhooks"].webhooks; + if (keys(webhooks).length > 0) { + hideFromPalette = false; + } } setupStorage(); runtime.on("PROJECT_LOADED", setupStorage); @@ -142,10 +145,10 @@ }; } - addWebhook() { + async addWebhook() { let name; do { - name = prompt(Scratch.translate("Enter Webhook name:")); + name = await prompt(Scratch.translate("Enter Webhook name:")); if (name === null) { return; } @@ -166,7 +169,7 @@ } while (keys(webhooks).includes(name) || name === ""); let URL; do { - URL = prompt(Scratch.translate("Enter Webhook URL:")); + URL = await prompt(Scratch.translate("Enter Webhook URL:")); if (URL === null) { return; } @@ -182,10 +185,10 @@ hideFromPalette = false; Scratch.vm.extensionManager.refreshBlocks("cubesterWebhooks"); } - deleteWebhook() { + async deleteWebhook() { let name; do { - name = prompt(Scratch.translate("Enter Webhook name:")); + name = await prompt(Scratch.translate("Enter Webhook name:")); if (name === null) { return; } From 411295c2c08331c01141b7c9b0f12676de5c3aeb Mon Sep 17 00:00:00 2001 From: Cubester Date: Mon, 20 Jan 2025 15:44:11 -0500 Subject: [PATCH 13/14] =?UTF-8?q?Monkey=20acquires=20new=20brain=20cell=20?= =?UTF-8?q?=F0=9F=A7=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extensions/CubesterYT/Webhooks.js | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/extensions/CubesterYT/Webhooks.js b/extensions/CubesterYT/Webhooks.js index 5da653b8c1..7576808cf5 100644 --- a/extensions/CubesterYT/Webhooks.js +++ b/extensions/CubesterYT/Webhooks.js @@ -13,7 +13,6 @@ "data:image/svg+xml;base64,<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->

<svg
   width="64"
   height="64"
   viewBox="0 0 16.933333 16.933333"
   version="1.1"
   id="svg1"
   xml:space="preserve"
   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
   sodipodi:docname="WebhooksIcon.svg"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
     id="namedview1"
     pagecolor="#505050"
     bordercolor="#ffffff"
     borderopacity="1"
     inkscape:showpageshadow="0"
     inkscape:pageopacity="0"
     inkscape:pagecheckerboard="1"
     inkscape:deskcolor="#505050"
     inkscape:document-units="px"
     inkscape:zoom="8.18"
     inkscape:cx="32.273839"
     inkscape:cy="33.06846"
     inkscape:window-width="1920"
     inkscape:window-height="1017"
     inkscape:window-x="-8"
     inkscape:window-y="-8"
     inkscape:window-maximized="1"
     inkscape:current-layer="layer1" /><defs
     id="defs1" /><g
     inkscape:label="Layer 1"
     inkscape:groupmode="layer"
     id="layer1"><circle
       style="opacity:1;fill:#c73a63;stroke-width:0.270447;fill-opacity:1"
       id="path2"
       cx="8.4666662"
       cy="8.4666662"
       r="8.4666662" /><path
       fill="#000000"
       d="M 8.2152276,2.73269 H 8.2008939 L 8.0575446,2.7613574 Q 7.5844923,2.8187033 7.1329427,3.0265543 6.6813921,3.2344098 6.3373531,3.5784487 5.7496211,4.1088414 5.5202629,4.8829272 5.3912484,5.312975 5.4055833,5.7860274 5.419917,6.2590797 5.5776022,6.6891276 5.8212963,7.3341999 6.3230183,7.8072523 L 6.5093731,7.9792712 5.3195732,9.9144861 Q 4.9468657,9.9001521 4.674502,10.014833 q -0.4300479,0.186355 -0.6450713,0.573398 -0.100347,0.215024 -0.1290145,0.444382 -0.028667,0.229359 0.028668,0.458718 0.1146796,0.430047 0.4730523,0.688076 0.2150245,0.14335 0.4730523,0.207857 0.258029,0.06451 0.5160579,0.02867 0.258029,-0.03584 0.4945551,-0.179185 0.2365262,-0.14335 0.3942103,-0.358374 0.172019,-0.243693 0.2078566,-0.559061 0.03584,-0.31537 -0.078841,-0.587734 -0.014334,-0.07168 -0.100347,-0.200688 L 6.265679,10.444875 7.9572009,7.6925704 Q 8.0432142,7.5635559 8.0718805,7.4918808 L 7.9285312,7.4488796 Q 7.7995168,7.4202122 7.7421764,7.3915447 7.4124733,7.2481954 7.1472775,6.9973344 6.8820806,6.7464735 6.7387313,6.4311052 6.4950383,5.9150473 6.6097169,5.355985 6.6670517,5.026282 6.853411,4.7395834 7.0397647,4.4528848 7.2977937,4.2521962 7.8281864,3.8651528 8.4732577,3.8651528 8.8603011,3.8508191 9.2258417,4.0013341 9.5913823,4.1518514 9.8637461,4.43855 q 0.2436929,0.2293582 0.3798749,0.5518944 0.136181,0.3225361 0.150517,0.6522392 0,0.2436941 -0.08601,0.6020668 l 1.003445,0.2723638 0.114679,0.014334 Q 11.626938,5.9150462 11.526596,5.2986446 11.469261,4.8255923 11.247066,4.3883765 11.024874,3.9511606 10.680837,3.6214576 10.078769,3.0193908 9.20434,2.8187022 9.1183267,2.7900348 8.9463111,2.7613563 L 8.7456214,2.7326889 Z m 0.2580279,1.7775308 q -0.2436931,0 -0.4873872,0.100347 Q 7.7421742,4.7109148 7.5486525,4.9044343 7.3551319,5.097955 7.2691218,5.3559839 7.1544422,5.6426825 7.2117868,5.9867214 q 0.043001,0.2580279 0.2006885,0.4873872 0.1576841,0.2293593 0.4013783,0.3583738 0.3440378,0.2150234 0.8027553,0.1863526 0.043001,0.057346 0.07168,0.1146808 L 10.2938,9.871486 q 0.043,0.086013 0.08601,0.129014 0.387044,-0.372707 0.838594,-0.5088894 0.451551,-0.1361814 0.93177,-0.050173 0.48022,0.086013 0.838594,0.3727076 0.458717,0.3583728 0.62357,0.8815988 0.164851,0.523225 0.0071,1.053617 -0.11468,0.401378 -0.408545,0.716747 -0.293867,0.315368 -0.695245,0.473052 -0.444383,0.186354 -0.953273,0.121847 -0.50889,-0.06451 -0.910267,-0.351206 -0.05734,-0.043 -0.186354,-0.143349 l -0.07168,-0.08601 q -0.05734,0.043 -0.157685,0.14335 l -0.6737399,0.659406 q 0.329703,0.329704 0.7454149,0.551894 0.415713,0.222192 0.87443,0.308202 l 0.315369,0.05735 h 0.559062 l 0.401378,-0.07168 q 0.917435,-0.186354 1.576842,-0.860096 0.315369,-0.315368 0.523225,-0.723914 0.207857,-0.408545 0.279531,-0.852928 0.07168,-0.516057 -0.02867,-1.024948 Q 14.708939,10.158181 14.450914,9.7424683 14.192885,9.3267552 13.820176,9.011387 13.447469,8.6960177 13.003086,8.5096639 12.515698,8.3089753 11.992473,8.2803057 11.469248,8.2516383 10.967525,8.3806527 L 10.723832,8.4523323 9.5627039,6.4884467 Q 9.7490577,6.2160829 9.7920632,5.958054 9.8637318,5.4993365 9.6057084,5.0979583 9.3763502,4.7395856 8.9749719,4.5962363 8.7312778,4.510223 8.4732489,4.510223 Z M 4.4308057,8.2946416 Q 3.5993806,8.4809965 2.9973127,9.0543936 2.3235718,9.6851301 2.1228778,10.559561 l -0.057313,0.344038 v 0.530392 l 0.028711,0.157684 q 0.028712,0.186355 0.057313,0.286699 0.100336,0.444383 0.3512014,0.845762 0.2508621,0.401377 0.6092348,0.702411 0.7167465,0.587732 1.6485174,0.702411 0.5447264,0.05734 1.089454,-0.06451 0.5447275,-0.121847 1.003445,-0.408545 0.7597509,-0.487388 1.1181247,-1.30448 0.100347,-0.243693 0.2006886,-0.645071 0.086013,-0.01433 0.2580289,0 l 1.7918664,0.02867 q 0.200688,0 0.286697,0.01433 0.157684,0.2867 0.358374,0.444384 0.200689,0.157683 0.451551,0.229358 0.250861,0.07168 0.508889,0.05734 0.401379,-0.043 0.716746,-0.286697 0.387043,-0.301035 0.458719,-0.774087 0.02867,-0.243693 -0.02151,-0.473053 -0.05017,-0.229358 -0.193522,-0.430048 -0.229358,-0.315368 -0.587732,-0.458717 -0.243694,-0.1003471 -0.50889,-0.093175 -0.265196,0.00715 -0.50889,0.107509 -0.401377,0.172019 -0.616402,0.530391 l -0.043,0.08601 q -0.200689,0 -0.6020672,-0.01433 L 8.3012661,10.659907 Q 8.0862427,10.645577 7.6848645,10.645577 L 6.968118,10.631247 7.011119,10.87494 Q 7.1258023,11.49133 6.8247689,12.036058 6.6240803,12.4231 6.2513717,12.681129 5.8786631,12.939158 5.4342804,12.996498 4.9325584,13.082511 4.4308354,12.888989 3.9291134,12.695468 3.6137452,12.279754 3.2123669,11.778032 3.2267018,11.147296 3.2410355,10.616903 3.5564048,10.158186 3.7427596,9.8858208 4.0151223,9.6994682 4.2874861,9.5131134 4.6028543,9.4271033 l 0.1290145,-0.043001 z"
       id="path1"
       style="fill:#ffffff;stroke-width:0.0143349" /></g></svg>
"; const runtime = Scratch.vm.runtime; - const keys = Object.keys; let hideFromPalette = true; let webhooks; @@ -24,7 +23,7 @@ }; } webhooks = runtime.extensionStorage["cubesterWebhooks"].webhooks; - if (keys(webhooks).length > 0) { + if (Object.keys(webhooks).length > 0) { hideFromPalette = false; } } @@ -54,10 +53,12 @@ } else if (Array.isArray(value)) { value.forEach((elem, index) => process(`${name}[${index}]`, elem)); } else if (typeof value === "object") { - keys(value).forEach((key) => process(`${name}[${key}]`, value[key])); + Object.keys(value).forEach((key) => + process(`${name}[${key}]`, value[key]) + ); } }; - keys(data).forEach((key) => process(key, data[key])); + Object.keys(data).forEach((key) => process(key, data[key])); return parts.join("&"); } @@ -146,6 +147,7 @@ } async addWebhook() { + const list = Object.keys(webhooks); let name; do { name = await prompt(Scratch.translate("Enter Webhook name:")); @@ -159,14 +161,14 @@ ) ); } - if (keys(webhooks).includes(name)) { + if (list.includes(name)) { alert( Scratch.translate( "This Webhook already exists! Please try a different name." ) ); } - } while (keys(webhooks).includes(name) || name === ""); + } while (list.includes(name) || name === ""); let URL; do { URL = await prompt(Scratch.translate("Enter Webhook URL:")); @@ -186,22 +188,23 @@ Scratch.vm.extensionManager.refreshBlocks("cubesterWebhooks"); } async deleteWebhook() { + const list = Object.keys(webhooks); let name; do { name = await prompt(Scratch.translate("Enter Webhook name:")); if (name === null) { return; } - if (!keys(webhooks).includes(name)) { + if (!list.includes(name)) { alert( Scratch.translate( "This Webhook does not exist. Please enter a valid webhook name." ) ); } - } while (!keys(webhooks).includes(name)); + } while (!list.includes(name)); delete webhooks[name]; - if (keys(webhooks).length === 0) { + if (Object.keys(webhooks).length === 0) { hideFromPalette = true; } Scratch.vm.extensionManager.refreshBlocks("cubesterWebhooks"); @@ -246,8 +249,9 @@ } _webhookMenu() { - if (keys(webhooks).length > 0) { - return keys(webhooks); + const list = Object.keys(webhooks); + if (list.length > 0) { + return list; } else { return [""]; } From 99fd5228cdbf96870508c0766adb9a060231accc Mon Sep 17 00:00:00 2001 From: Cubester Date: Mon, 20 Jan 2025 15:55:45 -0500 Subject: [PATCH 14/14] `try catch` isn't always the way --- extensions/CubesterYT/Webhooks.js | 47 +++++++++++++++---------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/extensions/CubesterYT/Webhooks.js b/extensions/CubesterYT/Webhooks.js index 7576808cf5..982083895b 100644 --- a/extensions/CubesterYT/Webhooks.js +++ b/extensions/CubesterYT/Webhooks.js @@ -210,42 +210,41 @@ Scratch.vm.extensionManager.refreshBlocks("cubesterWebhooks"); } data(args) { - try { - switch (webhooks[args.WEBHOOK].TYPE) { - case "application/x-www-form-urlencoded": - return toForm(webhooks[args.WEBHOOK].DATA); - default: - return JSON.stringify(webhooks[args.WEBHOOK].DATA); - } - } catch (error) { + if (!webhooks[args.WEBHOOK]) { return ""; } + switch (webhooks[args.WEBHOOK].TYPE) { + case "application/x-www-form-urlencoded": + return toForm(webhooks[args.WEBHOOK].DATA); + default: + return JSON.stringify(webhooks[args.WEBHOOK].DATA); + } } setData(args) { + if (!webhooks[args.WEBHOOK]) { + return; + } try { webhooks[args.WEBHOOK].DATA = JSON.parse( Scratch.Cast.toString(args.JSON) ); - webhooks[args.WEBHOOK].TYPE = args.TYPE; - } catch (error) { - return; - } + } catch (error) {} + webhooks[args.WEBHOOK].TYPE = args.TYPE; } postData(args) { - try { - Scratch.fetch(webhooks[args.WEBHOOK].URL, { - method: "POST", - headers: { - "Content-type": webhooks[args.WEBHOOK].TYPE, - }, - body: - webhooks[args.WEBHOOK].TYPE === "application/json" - ? JSON.stringify(webhooks[args.WEBHOOK].DATA) - : toForm(webhooks[args.WEBHOOK].DATA), - }); - } catch (error) { + if (!webhooks[args.WEBHOOK]) { return; } + Scratch.fetch(webhooks[args.WEBHOOK].URL, { + method: "POST", + headers: { + "Content-type": webhooks[args.WEBHOOK].TYPE, + }, + body: + webhooks[args.WEBHOOK].TYPE === "application/json" + ? JSON.stringify(webhooks[args.WEBHOOK].DATA) + : toForm(webhooks[args.WEBHOOK].DATA), + }); } _webhookMenu() {