🔀 Merge develop branch for 1.5.0

src/App.vue

@@ -1,6 +1,6 @@
 <template>
     <div id="app">
-        <NavBarComponent></NavBarComponent>
+        <NavBarComponent id="navSpace"></NavBarComponent>
         <BlocklyComponent id="blocklySpace" :options="options"></BlocklyComponent>
         <v-tour name="start-tour" :steps="vueTourOptions.steps" :options="vueTourOptions"></v-tour>
     </div>
@@ -12,15 +12,16 @@ import Blockly from "blockly";
 import NavBarComponent from "./components/NavigationBar/NavigationBar.vue";
 import BlocklyComponent from "./components/BlocklyComponent.vue";
 
-import toolbox from "./toolbox";
-
 Blockly.Tooltip.HOVER_MS = 100;
 
 // Load blocks
-import "./blocks/discord/actions/";
 import "./blocks/discord/base/";
 import "./blocks/discord/joins/";
 import "./blocks/discord/message/";
+import "./blocks/discord/channels/";
+import "./blocks/discord/servers/";
+import "./blocks/discord/roles/";
+import "./blocks/discord/members/";
 import "./blocks/text/";
 import "./prompt";
 
@@ -57,8 +58,7 @@ export default {
                     maxScale: 3,
                     minScale: 0.3,
                     scaleSpeed: 1.2
-                },
-                toolbox
+                }
             },
             vueTourOptions: {
                 labels: {

src/blocks/discord/channels/get_channel.js

@@ -0,0 +1,59 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_get_channel";
+
+const blockData = {
+    "message0": "%{BKY_GET_CHANNEL}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "VALUE",
+            "check": "String"
+        },
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "%{BKY_NAME}",
+                    "NAME"
+                ],
+                [
+                    "id",
+                    "ID"
+                ]
+            ]
+        }
+    ],
+    "colour": "#a55b80",
+    "output": "Channel",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block){
+    const value = Blockly.JavaScript.valueToCode(block, "VALUE", Blockly.JavaScript.ORDER_ATOMIC);
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "NAME"){
+        return [ `s4d.client.channels.cache.find((channel) => channel.name === ${value}`, Blockly.JavaScript.ORDER_NONE ];
+    } else {
+        return [ `s4d.client.channels.cache.get(${value})`, Blockly.JavaScript.ORDER_NONE ];
+    }
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_MISSING_CHANNEL_VALUE",
+        types: [
+            "VALUE"
+        ]
+    }
+]);

src/blocks/discord/channels/index.js

@@ -0,0 +1,2 @@
+import "./get_channel";
+import "./send_channel";

src/blocks/discord/channels/send_channel.js

@@ -0,0 +1,66 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_send_channel";
+
+const blockData = {
+    "message0": "%{BKY_SEND_CHANNEL}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "CONTENT",
+            "check": [ "MessageEmbed", "String", "Number" ]
+        },
+        {
+            "type": "input_value",
+            "name": "CHANNEL",
+            "check": "Channel"
+        },
+    ],
+    "colour": "#4C97FF",
+    "previousStatement": null,
+    "nextStatement": null,
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block){
+    const channel = Blockly.JavaScript.valueToCode(block, "CHANNEL", Blockly.JavaScript.ORDER_ATOMIC);
+    const content = Blockly.JavaScript.valueToCode(block, "CONTENT", Blockly.JavaScript.ORDER_ATOMIC);
+    if(block.getInput("CONTENT").connection.targetConnection){
+        const contentType = block.getInput("CONTENT").connection.targetConnection.getSourceBlock().outputConnection.check_[0];
+        if(contentType === "MessageEmbed"){
+            const code = `${channel}.send({ embed: ${content} });\n`;
+            return code;
+        } else {
+            const code = `${channel}.send(String(${content}));\n`;
+            return code;
+        }
+    } else {
+        const code = `${channel}.send(String(${content}));\n`;
+        return code;
+    }
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_SEND_CHANNEL_CONTENT",
+        types: [
+            "CONTENT"
+        ]
+    },
+    {
+        type: "notempty",
+        message: "RES_SEND_CHANNEL_CHANNEL",
+        types: [
+            "CHANNEL"
+        ]
+    }
+]);

src/blocks/discord/joins/index.js

@@ -1,4 +1,5 @@
 import "./joining_guild";
+import "./joining_guild_raw";
 import "./joining_member";
 import "./joining_member_raw";
 import "./on_member_join";