From aee1584dbfeb7f796b7008922a137b939be224f6 Mon Sep 17 00:00:00 2001 From: Seth Falco Date: Wed, 11 Aug 2021 23:04:48 +0200 Subject: [PATCH 1/3] chore: add editorconfig --- .editorconfig | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..b73e65e --- /dev/null +++ b/.editorconfig @@ -0,0 +1,20 @@ +root = true + +[*] +indent_style = space +indent_size = 4 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true +curly_bracket_next_line = false +spaces_around_operators = true + +[*.{js,ts}] +quote_type = double + +[*.{markdown,md}] +trim_trailing_whitespace = false + +[*.tsv] +indent_style = tab From b2ffdc088c5efe14e3480a479e32344089e07bee Mon Sep 17 00:00:00 2001 From: Seth Falco Date: Wed, 11 Aug 2021 23:05:15 +0200 Subject: [PATCH 2/3] i18n: add norwegian comment to desktop file --- Lightcord.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/Lightcord.desktop b/Lightcord.desktop index 8cf799a..d7cec08 100644 --- a/Lightcord.desktop +++ b/Lightcord.desktop @@ -2,6 +2,7 @@ Name=Lightcord StartupWMClass=lightcord Comment[fr_FR]=Un client Discord simple et personalisable +Comment[no]=En enkel - tilpassbar - Discord klient Comment=A simple - customizable - Discord Client Exec=/opt/Lightcord/Lightcord Icon=lightcord From c746a6da1ada7c68f856986a096d643b3ab0964a Mon Sep 17 00:00:00 2001 From: Seth Falco Date: Wed, 11 Aug 2021 23:07:45 +0200 Subject: [PATCH 3/3] minor updates to EmojiModule --- .editorconfig | 3 ++ BetterDiscordApp/src/modules/emojiModule.js | 33 +++++++++++---------- DiscordJS/src/util/Permissions.ts | 2 +- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.editorconfig b/.editorconfig index b73e65e..a11bde3 100644 --- a/.editorconfig +++ b/.editorconfig @@ -18,3 +18,6 @@ trim_trailing_whitespace = false [*.tsv] indent_style = tab + +[*.yml] +indent_size = 2 diff --git a/BetterDiscordApp/src/modules/emojiModule.js b/BetterDiscordApp/src/modules/emojiModule.js index 1bc1b7b..b95ed93 100644 --- a/BetterDiscordApp/src/modules/emojiModule.js +++ b/BetterDiscordApp/src/modules/emojiModule.js @@ -17,11 +17,12 @@ let emojiSearch = BDModules.get(e => e.default && e.default.getDisambiguatedEmoj const appSettings = Lightcord.Api.settings export default new class EmojiModule { - constructor(){ - this.init().catch(err => Utils.err("EmojiModule", "An error occured", err)) // better logging + + constructor() { + this.init().catch(err => Utils.err("EmojiModule", "An error occured", err)) } - async init(){ + async init() { /** Emoji AutoComplete */ if(!AutocompleteModule)AutocompleteModule = await window.Lightcord.Api.ensureExported(e => e.default && e.default.displayName === "Autocomplete") if(!AutoCompletionTemplates)AutoCompletionTemplates = await window.Lightcord.Api.ensureExported(e => e.getAutocompleteOptions) @@ -38,7 +39,7 @@ export default new class EmojiModule { } if(AutocompleteModule && AutoCompletionTemplates && EmojiModuleQuery && Messages && guildModule && emojiSearch){ - console.log(`Patching getAutocompleteOptions of AutoCompletionTemplates`, AutoCompletionTemplates) + Utils.log("EmojiModule", `Patching getAutocompleteOptions of AutoCompletionTemplates`, AutoCompletionTemplates) const getAutocompleteOptions = AutoCompletionTemplates.getAutocompleteOptions AutoCompletionTemplates.getAutocompleteOptions = function(e, t, n, r, a){ const value = getAutocompleteOptions.call(this, ...arguments) @@ -81,20 +82,20 @@ export default new class EmojiModule { } return value } - }else{ - console.error(new Error("Couldn't start autocompletion of Lightcord's emojis.")) + } else { + Utils.err("EmojiModule", "Couldn't start auto-completion of Lightcord's emojis.") } /** Emoji display */ while (!BDV2.MessageComponent) await new Promise(resolve => setTimeout(resolve, 100)); - if (!this.cancelEmojiRender){ // TODO: Proper emoji formatting / rendering + if (!this.cancelEmojiRender) { // TODO: Proper emoji formatting / rendering this.cancelEmoteRender = Utils.monkeyPatch(BDV2.MessageComponent, "default", {before: (data) => { const message = Utils.getNestedProp(data.methodArguments[0], "childrenMessageContent.props.message") if(!message)return const content = Utils.getNestedProp(data.methodArguments[0], "childrenMessageContent.props.content") if(!content || !content.length)return - + /** * @type {{ * raw: string, @@ -104,16 +105,16 @@ export default new class EmojiModule { * }[]} */ let emojis = [] - + const newContent = [] - for(let node of content){ + for(let node of content) { if (typeof(node) !== "string") { newContent.push(node) continue - }; + } let parsed; let hasParsed = false - + do { parsed = Constants.EmojiRegex.exec(node); if (parsed) { @@ -137,7 +138,7 @@ export default new class EmojiModule { } } } while (parsed); - + if(hasParsed){ const words = node.split(" ").map((word, index, arr) => { if(!word)return "" @@ -197,7 +198,7 @@ export default new class EmojiModule { emojiDescriptors: this.props.emojiDescriptors.map(e => { e.isDisabled = false }) - })) + })) } } EmojiPickerListRow.default.displayName = "EmojiPickerListRow" @@ -211,7 +212,7 @@ export default new class EmojiModule { } start(){ - + } } @@ -263,4 +264,4 @@ function setEmojiUsable(usable){ } return isEmojiDisabled.call(this, ...arguments) } -} \ No newline at end of file +} diff --git a/DiscordJS/src/util/Permissions.ts b/DiscordJS/src/util/Permissions.ts index 91df208..446639e 100644 --- a/DiscordJS/src/util/Permissions.ts +++ b/DiscordJS/src/util/Permissions.ts @@ -92,7 +92,7 @@ export default class Permissions extends BitField { * - `MANAGE_WEBHOOKS` * - `MANAGE_EMOJIS` * @type {Object} - * @see {@link https://discordapp.com/developers/docs/topics/permissions} + * @see {@link https://discord.com/developers/docs/topics/permissions} */ static FLAGS:{ CREATE_INSTANT_INVITE: number,