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

+ Fixing notifications 

+ adding sending emoji
This commit is contained in:
Jean Ouina 2020-06-11 13:11:34 +02:00
parent 677d0a9945
commit 7eb053fd5a
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BetterDiscordApp/js/main.js
View File

File diff suppressed because one or more lines are too long

26
BetterDiscordApp/src/modules/emojiModule.js
View File

@ -23,18 +23,14 @@ export default new class EmojiModule {
}
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)
if(!EmojiModuleQuery)EmojiModuleQuery = await window.Lightcord.Api.ensureExported(e => e.default && e.default.queryEmojiResults)
if(!Messages)Messages = await window.Lightcord.Api.ensureExported(e => e.default && e.default.Messages && e.default.Messages.EMOJI_MATCHING)
if(!guildModule)guildModule = await window.Lightcord.Api.ensureExported(e => e.default && e.default.getGuild && e.default.getGuilds && !e.default.isFetching)
if(!emojiSearch)emojiSearch = await window.Lightcord.Api.ensureExported(e => e.default && e.default.getDisambiguatedEmojiContext)
if(true /** AutocompleteModule && AutoCompletionTemplates && EmojiModuleQuery && Messages && guildModule && emojiSearch */){/*
if(!this.cancelAutocompleteRender){
this.cancelAutocompleteRender = Utils.monkeyPatch(AutocompleteModule, "default", {
})
}*/
if(AutocompleteModule && AutoCompletionTemplates && EmojiModuleQuery && Messages && guildModule && emojiSearch){
console.log(`Patching getAutocompleteOptions of AutoCompletionTemplates`, AutoCompletionTemplates)
const getAutocompleteOptions = AutoCompletionTemplates.getAutocompleteOptions
AutoCompletionTemplates.getAutocompleteOptions = function(e, t, n, r, a){
@ -61,9 +57,12 @@ export default new class EmojiModule {
return "." + e + "."
}))
},
getPlainText(id, emojis){
var emojis = emojis.emojis;
return null == emojis || null == emojis[id] ? "" : "." + emojis[id].name + "."
getPlainText(id, guild){
var emojis = guild.emojis;
if (null == emojis || null == emojis[id]) return "";
var emoji = emojis[id],
isAnimated = emoji.animated ? "a" : "";
return emoji.managed || null == emoji.id ? "." + emoji.name + "." : "<" + isAnimated + "." + (emoji.originalName || emoji.name) + "." + emoji.id + ">"
},
getRawText(id, guild){
var emojis = guild.emojis;
@ -79,8 +78,8 @@ export default new class EmojiModule {
console.error(new Error("Couldn't start autocompletion of Lightcord's emojis."))
}
/** Emoji display */
while (!BDV2.MessageComponent) await new Promise(resolve => setTimeout(resolve, 100));
if (!this.cancelEmojiRender){
this.cancelEmoteRender = Utils.monkeyPatch(BDV2.MessageComponent, "default", {before: (data) => {
const message = Utils.getNestedProp(data.methodArguments[0], "childrenMessageContent.props.message")
@ -224,8 +223,11 @@ function setEmojiUsable(usable){
if(!isEmojiDisabled)isEmojiDisabled = EmojiFilterModule.default.isEmojiDisabled
hasPatched = true
EmojiFilterModule.default.isEmojiDisabled = function(){
if(isUsable)return false
EmojiFilterModule.default.isEmojiDisabled = function(emoji){
if(isUsable){
if(emoji.surrogates || emoji.diversity)return true
return false
}
return isEmojiDisabled.call(this, ...arguments)
}
}

4
modules/discord_desktop_core/core/app/notificationScreen.js
View File

@ -137,13 +137,13 @@ function handleNotificationClick(e, notificationId) {
let isClosing = []
function handleNotificationClose(e, notificationId) {
if(isClosing.includes(notificationId))return
isClosing.push(notificationId)
if (notificationWindow) {
webContentsSend(notificationWindow, 'FADE_OUT', notificationId);
}
isClosing.push(notificationId)
setTimeout(() => {
notifications = notifications.filter(notification => notification.id !== notificationId);
isClosing = isClosing.filter(e => e.id !== notificationId)
isClosing = isClosing.filter(e => e!== notificationId)
updateNotifications();
}, VARIABLES.outDuration);
}