⚡ Use s4dmessage instead of s4d#message

Androz2091 · Apr 18, 2020 · 808a971 · 808a971
1 parent 9daf37e
commit 808a971
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 18 deletions.
diff --git a/src/blocks/discord/joins/joining_guild.js b/src/blocks/discord/joins/joining_guild.js
@@ -18,7 +18,7 @@ Blockly.Blocks[blockName] = {
 };
 
 Blockly.JavaScript[blockName] = function() {
-    const code = ["s4d.memberJoining.guild", Blockly.JavaScript.ORDER_NONE];
+    const code = ["s4d.joiningMember.guild", Blockly.JavaScript.ORDER_NONE];
     return code;
 };
 

diff --git a/src/blocks/discord/message/delete_message.js b/src/blocks/discord/message/delete_message.js
@@ -19,7 +19,7 @@ Blockly.Blocks[blockName] = {
 };
 
 Blockly.JavaScript[blockName] = function(){
-    const code = `s4d.message.delete();\n`;
+    const code = `s4dmessage.delete();\n`;
     return code;
 };
 

diff --git a/src/blocks/discord/message/mentioned_member.js b/src/blocks/discord/message/mentioned_member.js
@@ -18,7 +18,7 @@ Blockly.Blocks[blockName] = {
 };
 
 Blockly.JavaScript[blockName] = function() {
-    const code = [`s4d.message.mentions.members.first()`, Blockly.JavaScript.ORDER_NONE];
+    const code = [`s4dmessage.mentions.members.first()`, Blockly.JavaScript.ORDER_NONE];
     return code;
 };
 

diff --git a/src/blocks/discord/message/message_author.js b/src/blocks/discord/message/message_author.js
@@ -18,7 +18,7 @@ Blockly.Blocks[blockName] = {
 };
 
 Blockly.JavaScript[blockName] = function() {
-    const code = ["s4d.message.member", Blockly.JavaScript.ORDER_NONE];
+    const code = ["s4dmessage.member", Blockly.JavaScript.ORDER_NONE];
     return code;
 };
 

diff --git a/src/blocks/discord/message/message_author_raw.js b/src/blocks/discord/message/message_author_raw.js
@@ -40,13 +40,13 @@ Blockly.Blocks[blockName] = {
 Blockly.JavaScript[blockName] = function(block) {
     const searchType = block.getFieldValue("SEARCH_TYPE");
     if(searchType === "ID"){
-        const code = ["s4d.message.author.id", Blockly.JavaScript.ORDER_NONE];
+        const code = ["s4dmessage.author.id", Blockly.JavaScript.ORDER_NONE];
         return code;
     } else if(searchType === "USERNAME"){
-        const code = ["s4d.message.author.username", Blockly.JavaScript.ORDER_NONE];
+        const code = ["s4dmessage.author.username", Blockly.JavaScript.ORDER_NONE];
         return code;
     } else if(searchType === "NICKNAME"){
-        const code = ["(s4d.message.member || await s4d.message.guild.members.fetch(s4d.message.author.id)).nickname", Blockly.JavaScript.ORDER_NONE];
+        const code = ["(s4dmessage.member || await s4dmessage.guild.members.fetch(s4dmessage.author.id)).nickname", Blockly.JavaScript.ORDER_NONE];
         return code;
     }
 };

diff --git a/src/blocks/discord/message/message_channel.js b/src/blocks/discord/message/message_channel.js
@@ -18,7 +18,7 @@ Blockly.Blocks[blockName] = {
 };
 
 Blockly.JavaScript[blockName] = function() {
-    const code = ["s4d.message.channel", Blockly.JavaScript.ORDER_NONE];
+    const code = ["s4dmessage.channel", Blockly.JavaScript.ORDER_NONE];
     return code;
 };
 

diff --git a/src/blocks/discord/message/message_channel_raw.js b/src/blocks/discord/message/message_channel_raw.js
@@ -36,10 +36,10 @@ Blockly.Blocks[blockName] = {
 Blockly.JavaScript[blockName] = function(block) {
     const searchType = block.getFieldValue("SEARCH_TYPE");
     if(searchType === "ID"){
-        const code = ["(s4d.message.channel || {}).id", Blockly.JavaScript.ORDER_NONE];
+        const code = ["(s4dmessage.channel || {}).id", Blockly.JavaScript.ORDER_NONE];
         return code;
     } else if(searchType === "NAME"){
-        const code = ["(s4d.message.channel || {}).name", Blockly.JavaScript.ORDER_NONE];
+        const code = ["(s4dmessage.channel || {}).name", Blockly.JavaScript.ORDER_NONE];
         return code;
     }
 };

diff --git a/src/blocks/discord/message/message_content.js b/src/blocks/discord/message/message_content.js
@@ -18,7 +18,7 @@ Blockly.Blocks[blockName] = {
 };
 
 Blockly.JavaScript[blockName] = function() {
-    const code = ["s4d.message.content", Blockly.JavaScript.ORDER_NONE];
+    const code = ["s4dmessage.content", Blockly.JavaScript.ORDER_NONE];
     return code;
 };
 

diff --git a/src/blocks/discord/message/message_guild.js b/src/blocks/discord/message/message_guild.js
@@ -18,7 +18,7 @@ Blockly.Blocks[blockName] = {
 };
 
 Blockly.JavaScript[blockName] = function() {
-    const code = ["s4d.message.guild", Blockly.JavaScript.ORDER_NONE];
+    const code = ["s4dmessage.guild", Blockly.JavaScript.ORDER_NONE];
     return code;
 };
 

diff --git a/src/blocks/discord/message/message_guild_raw.js b/src/blocks/discord/message/message_guild_raw.js
@@ -36,10 +36,10 @@ Blockly.Blocks[blockName] = {
 Blockly.JavaScript[blockName] = function(block) {
     const searchType = block.getFieldValue("SEARCH_TYPE");
     if(searchType === "ID"){
-        const code = ["(s4d.message.guild || {}).id", Blockly.JavaScript.ORDER_NONE];
+        const code = ["(s4dmessage.guild || {}).id", Blockly.JavaScript.ORDER_NONE];
         return code;
     } else if(searchType === "NAME"){
-        const code = ["(s4d.message.guild || {}).name", Blockly.JavaScript.ORDER_NONE];
+        const code = ["(s4dmessage.guild || {}).name", Blockly.JavaScript.ORDER_NONE];
         return code;
     }
 };

diff --git a/src/blocks/discord/message/on_message.js b/src/blocks/discord/message/on_message.js
@@ -24,6 +24,6 @@ Blockly.Blocks[blockName] = {
 
 Blockly.JavaScript[blockName] = function(block) {
     const statements = Blockly.JavaScript.statementToCode(block, "STATEMENTS");
-    const code = `s4d.client.on('message', async (param1) => {\ns4d.message = param1;\n${statements}s4d.message = null\n});\n`;
+    const code = `s4d.client.on('message', async (s4dmessage) => {\n${statements}\n});\n`;
     return code;
 };
diff --git a/src/blocks/discord/message/reply.js b/src/blocks/discord/message/reply.js
@@ -30,14 +30,14 @@ Blockly.JavaScript[blockName] = function(block){
     if(block.getInput("CONTENT").connection.targetConnection){
         const contentType = block.getInput("CONTENT").connection.targetConnection.getSourceBlock().outputConnection.check_[0];
         if(contentType === "MessageEmbed"){
-            const code = `s4d.message.channel.send({ embed: ${content} });\n`;
+            const code = `s4dmessage.channel.send({ embed: ${content} });\n`;
             return code;
         } else {
-            const code = `s4d.message.channel.send(String(${content}));\n`;
+            const code = `s4dmessage.channel.send(String(${content}));\n`;
             return code;
         }
     } else {
-        const code = `s4d.message.channel.send(String(${content}));\n`;
+        const code = `s4dmessage.channel.send(String(${content}));\n`;
         return code;
     }
 };