lightcordwarez
/
BetterDiscordAddons
mirror of https://github.com/mwittrien/BetterDiscordAddons.git
1
0
Fork 0
Code Issues 21 Releases Wiki Activity

Update Translator.plugin.js

This commit is contained in:
Mirco Wittrien 2023-02-15 13:57:48 +01:00
parent 09753897a4
commit b917868d99
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Plugins/Translator/Translator.plugin.js
View File

@ -2,7 +2,7 @@
* @name Translator * @name Translator
* @author DevilBro * @author DevilBro
* @authorId 278543574059057154 * @authorId 278543574059057154
* @version 2.5.0 * @version 2.5.1
* @description Allows you to translate Messages and your outgoing Messages within Discord * @description Allows you to translate Messages and your outgoing Messages within Discord
* @invite Jx3TjNS * @invite Jx3TjNS
* @donate https://www.paypal.me/MircoWittrien * @donate https://www.paypal.me/MircoWittrien
@ -1323,16 +1323,17 @@ module.exports = (_ => {
} }
removeExceptions (string, place) { removeExceptions (string, place) {
let emojiRegex = /[\uD83C-\uDBFF\uDC00-\uDFFF]+/;
let excepts = {}, newString = [], count = 0; let excepts = {}, newString = [], count = 0;
if (place == messageTypes.RECEIVED) { if (place == messageTypes.RECEIVED) {
let text = [], i = 0; let text = [], i = 0;
string.split("").forEach(chara => { string.split("").forEach((chara, index, array) => {
if (chara == "<" && text[i]) i++; if (chara == "<" && text[i] || emojiRegex.test(chara) && emojiRegex.test(array[index+1])) i++;
text[i] = text[i] ? text[i] + chara : chara; text[i] = text[i] ? text[i] + chara : chara;
if (chara == ">") i++; if (chara == ">" || emojiRegex.test(chara) && emojiRegex.test(array[index-1])) i++;
}); });
for (let j in text) { for (let j in text) {
if (text[j].indexOf("<") == 0) { if (text[j].indexOf("<") == 0 || emojiRegex.test(text[j])) {
newString.push(`{{${count}}}`); newString.push(`{{${count}}}`);
excepts[count] = text[j]; excepts[count] = text[j];
count++; count++;
@ -1343,7 +1344,7 @@ module.exports = (_ => {
else { else {
let usedExceptions = BDFDB.ArrayUtils.is(this.settings.exceptions.wordStart) ? this.settings.exceptions.wordStart : []; let usedExceptions = BDFDB.ArrayUtils.is(this.settings.exceptions.wordStart) ? this.settings.exceptions.wordStart : [];
string.split(" ").forEach(word => { string.split(" ").forEach(word => {
if (word.indexOf("<@!") == 0 || word.indexOf("<#") == 0 || word.indexOf(":") == 0 || word.indexOf("<:") == 0 || word.indexOf("<a:") == 0 || word.indexOf("@") == 0 || word.indexOf("#") == 0 || usedExceptions.some(n => word.indexOf(n) == 0 && word.length > 1)) { if (emojiRegex.test(word) || word.indexOf("<@!") == 0 || word.indexOf("<#") == 0 || word.indexOf(":") == 0 || word.indexOf("<:") == 0 || word.indexOf("<a:") == 0 || word.indexOf("@") == 0 || word.indexOf("#") == 0 || usedExceptions.some(n => word.indexOf(n) == 0 && word.length > 1)) {
newString.push(`{{${count}}}`); newString.push(`{{${count}}}`);
excepts[count] = word; excepts[count] = word;
count++; count++;