✨ Add get_server block

Androz2091 · Apr 14, 2020 · fac19cf · fac19cf
1 parent af81c21
commit fac19cf
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 2 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -20,6 +20,7 @@ import "./blocks/discord/base/";
 import "./blocks/discord/joins/";
 import "./blocks/discord/message/";
 import "./blocks/discord/channels/";
+import "./blocks/discord/servers/";
 import "./blocks/text/";
 import "./prompt";
 

diff --git a/src/blocks/discord/servers/get_server.js b/src/blocks/discord/servers/get_server.js
@@ -0,0 +1,59 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_get_server";
+
+const blockData = {
+    "message0": "%{BKY_GET_SERVER}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "VALUE",
+            "check": "String"
+        },
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "%{BKY_NAME}",
+                    "NAME"
+                ],
+                [
+                    "id",
+                    "ID"
+                ]
+            ]
+        }
+    ],
+    "colour": "#F56476",
+    "output": "Server",
+    "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.guilds.cache.find((guild) => guild.name === ${value}`, Blockly.JavaScript.ORDER_NONE ];
+    } else {
+        return [ `s4d.client.guilds.cache.get(${value})`, Blockly.JavaScript.ORDER_NONE ];
+    }
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_MISSING_SERVER_VALUE",
+        types: [
+            "VALUE"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/servers/index.js b/src/blocks/discord/servers/index.js
@@ -0,0 +1 @@
+import "./get_server";
diff --git a/src/locales/en.js b/src/locales/en.js
@@ -109,7 +109,11 @@ const blocklyMessages = {
     TOOLBOX_JOINS: "Joins",
     TOOLBOX_ACTIONS: "Actions",
     TOOLBOX_MESSAGES: "Messages",
-    TOOLBOX_BASE: "Base"
+    TOOLBOX_BASE: "Base",
+    TOOLBOX_SERVER: "Servers",
+    FIND_SERVER: "Find a server",
+    GET_SERVER: "get the server with %2 equal to %1",
+    RES_GET_SERVER_SERVER: "You must specify a valid server name or ID!",
 };
 
 export const applyBlocklyLocale = () => {

diff --git a/src/locales/fr.js b/src/locales/fr.js
@@ -110,7 +110,11 @@ const blocklyMessages = {
     TOOLBOX_JOINS: "Arrivées",
     TOOLBOX_ACTIONS: "Actions",
     TOOLBOX_MESSAGES: "Messages",
-    TOOLBOX_BASE: "Base"
+    TOOLBOX_BASE: "Base",
+    TOOLBOX_SERVER: "Serveurs",
+    FIND_SERVER: "Trouver un serveur",
+    GET_SERVER: "obtenir le serveur dont le %2 est %1",
+    RES_GET_SERVER_SERVER: "Vous devez préciser un nom ou un identifiant de serveur valide !",
 };
 
 export const applyBlocklyLocale = () => {

diff --git a/src/toolbox.js b/src/toolbox.js
@@ -403,6 +403,10 @@ export default (Blockly) => {
             <block type="s4d_joining_member_raw"></block>
             <block type="s4d_joining_guild"></block>
         </category>
+        <category name="{{ TOOLBOX_SERVER }}" colour="#547AA5">
+            <label text="%{BKY_FIND_SERVER}"></label>
+            <block type="s4d_get_server"></block>
+        </category>
         <category name="{{ TOOLBOX_CHANNELS }}" colour="#40BF4A">
             <label text="%{BKY_FIND_CHANNEL}"></label>
             <block type="s4d_get_channel"></block>