Update

4 files changed, 11 insertions, 7 deletions

diff --git a/commands/info.js b/commands/info.js
index 11d7c35..b1ec28e 100644
--- a/commands/info.js
+++ b/commands/info.js
@@ -54,7 +54,7 @@ module.exports = async (interaction) => {
     let sizep = bytesToPretty(size);
 
     let fields = [
-        { name: l("Software version", "Version du logiciel", interaction.user.id, interaction.guild ? interaction.guild.id : 0), value: "v" + fs.readFileSync("./config/version.txt") + "." + fs.readFileSync("./.git/refs/heads/trunk").toString().substr(0, 8) + suffix + " (#" + client.shard.count + ")", inline: false },
+        { name: l("Software version", "Version du logiciel", interaction.user.id, interaction.guild ? interaction.guild.id : 0), value: "v" + fs.readFileSync("./config/version.txt").toString().trim() + "." + fs.readFileSync("./.git/refs/heads/trunk").toString().substr(0, 8) + suffix + " (#" + client.shard.count + ")", inline: false },
         { name: l("Kernel version", "Version du noyau", interaction.user.id, interaction.guild ? interaction.guild.id : 0), value: process.version, inline: true },
         { name: l("Experience channel", "Canal d'expériences", interaction.user.id, interaction.guild ? interaction.guild.id : 0), value: channel, inline: true },
         { name: l("Known ponies", "Poneys connus", interaction.user.id, interaction.guild ? interaction.guild.id : 0), value: Object.keys(JSON.parse(fs.readFileSync("./data/data.json").toString())).length.toString(), inline: true },
@@ -75,4 +75,4 @@ module.exports = async (interaction) => {
                 .setFooter({ text: l("made with ♥ by Minteck, a My Little Pony fan", "fait avec ♥ par Minteck, une fan de My Little Pony", interaction.user.id, interaction.guild ? interaction.guild.id : 0) })
         ]
     });
-}
\ No newline at end of file
+}
diff --git a/config/version.txt b/config/version.txt
index da6160c..19b268e 100644
--- a/config/version.txt
+++ b/config/version.txt
@@ -1 +1,5 @@
-0.8.22
\ No newline at end of file
+<<<<<<< HEAD
+0.8.22
+=======
+0.8.23
+>>>>>>> 4be58e9d499e2f2610c179520241b3329b8a622f
diff --git a/update/infobox.js b/update/infobox.js
index b94080c..f53be0e 100644
--- a/update/infobox.js
+++ b/update/infobox.js
@@ -15,7 +15,7 @@ console.log("Gathering infobox for each page...");
             let mwtext = (await axios.get("https://mlp.fandom.com/api.php?format=json&action=query&prop=extracts&exlimit=max&explaintext&titles=" + encodeURI(page.name) + "&redirects=")).data;
             let extracts = "";
             try {
-                sentences = mwextracts.query.pages[Object.keys(mwextracts.query.pages)[0]].extract.replace(/(.*)\n(.*)/, "$2").replace(/(.*)\n\n(.*)/gm, "$2").replace(/([.?!])\s*(?=[A-Z])/g, "$1|").split("|");
+                sentences = mwextracts.query.pages[Object.keys(mwextracts.query.pages)[0]].extract.trim().replace(/(.*)\n(.*)/, "$2").replace(/(.*)\n\n(.*)/gm, "$2").replace(/([.?!])\s*(?=[A-Z])/g, "$1|").split("|");
                 extracts = sentences[0];
                 if (extracts.length < 150 && sentences.length > 1) {
                     extracts = sentences[0] + " " + sentences[1];
@@ -54,8 +54,8 @@ console.log("Gathering infobox for each page...");
                 ) {
                     infoboxes[page.name]["_gen"] = 4;
                 } else if (mwtext.query.pages[Object.keys(mwextracts.query.pages)[0]].extract.toLowerCase().includes("a new generation")
-                        || mwtext.query.pages[Object.keys(mwextracts.query.pages)[0]].extract.toLowerCase().includes("ang")
-                        || mwtext.query.pages[Object.keys(mwextracts.query.pages)[0]].extract.toLowerCase().includes("ang")
+                        || mwtext.query.pages[Object.keys(mwextracts.query.pages)[0]].extract.replace(/[.,?!;()"'-]/g, " ").replace(/\s+/g, " ").toLowerCase().split(" ").includes("ang")
+                        || mwtext.query.pages[Object.keys(mwextracts.query.pages)[0]].extract.replace(/[.,?!;()"'-]/g, " ").replace(/\s+/g, " ").toLowerCase().split(" ").includes("ang")
                 ) {
                     infoboxes[page.name]["_gen"] = 5;
                 } else {
diff --git a/update/parse.js b/update/parse.js
index ebcd9e3..5be5ae5 100644
--- a/update/parse.js
+++ b/update/parse.js
@@ -49,7 +49,7 @@ let ponies = {};
         } else {
             data.extract_fr = data.extract;
         }
-        if (typeof box.coat !== "undefined") data.color = box.coat.replace(/<!--[\s\S]*?-->/g, "").trim().replace(/\[(.*)\/(.{6})\/ (.*)\]/gm, "$2").replace(/{{perbang\|([0-9A-Fa-f].{5})(.*)/g, "$1");
+        if (typeof box.coat !== "undefined") data.color = box.coat.replace(/<!--[\s\S]*?-->/g, "").trim().replace(/\[([a-z.\/ \nA-Z0-9:]*)\/(.{6})\/ (.*)\]/gm, "$2").replace(/{{perbang\|([0-9A-Fa-f].{5})(.*)/g, "$1");
         if (typeof box.main !== "undefined") data.image = "https://mlp.fandom.com/Special:FilePath/" + encodeURI(box.main.replace(/<!--[\s\S]*?-->/g, "").trim());
         if (typeof box.main1 !== "undefined") data.image = "https://mlp.fandom.com/Special:FilePath/" + encodeURI(box.main1.replace(/<!--[\s\S]*?-->/g, "").trim());
         if (typeof box.image !== "undefined") data.image = "https://mlp.fandom.com/Special:FilePath/" + encodeURI(box.image.replace(/<!--[\s\S]*?-->/g, "").trim());