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

stuff

This commit is contained in:
Mirco Wittrien 2020-05-30 20:03:50 +02:00
parent db6d7b3638
commit 2b29c5db40
6 changed files with 56 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Plugins/BDFDB.js
View File

@ -2576,7 +2576,7 @@
else { else {
if (configIsObject) config = BDFDB.ObjectUtils.sort(config); if (configIsObject) config = BDFDB.ObjectUtils.sort(config);
BDFDB.DataUtils.cached[pluginName] = configIsObject ? BDFDB.ObjectUtils.deepAssign({}, config) : config; BDFDB.DataUtils.cached[pluginName] = configIsObject ? BDFDB.ObjectUtils.deepAssign({}, config) : config;
LibraryRequires.fs.writeFileSync(configPath, JSON.stringify(config, null, " ")); InternalBDFDB.writeConfig(configPath, config);
} }
}; };
@ -2618,7 +2618,7 @@
else { else {
if (configIsObject) config = BDFDB.ObjectUtils.sort(config); if (configIsObject) config = BDFDB.ObjectUtils.sort(config);
BDFDB.DataUtils.cached[pluginName] = configIsObject ? BDFDB.ObjectUtils.deepAssign({}, config) : config; BDFDB.DataUtils.cached[pluginName] = configIsObject ? BDFDB.ObjectUtils.deepAssign({}, config) : config;
LibraryRequires.fs.writeFileSync(configPath, JSON.stringify(config, null, " ")); InternalBDFDB.writeConfig(configPath, config);
} }
}; };
BDFDB.DataUtils.get = function (plugin, key, id) { BDFDB.DataUtils.get = function (plugin, key, id) {
@ -2641,6 +2641,10 @@
if (id === undefined) return newC; if (id === undefined) return newC;
else return newC[id] === undefined ? null : newC[id]; else return newC[id] === undefined ? null : newC[id];
}; };
InternalBDFDB.writeConfig = function (path, config) {
try {LibraryRequires.fs.writeFileSync(path, JSON.stringify(config, null, " "));}
catch (err) {}
};
InternalBDFDB.readConfig = function (path) { InternalBDFDB.readConfig = function (path) {
try {return JSON.parse(LibraryRequires.fs.readFileSync(path));} try {return JSON.parse(LibraryRequires.fs.readFileSync(path));}
catch (err) {return {};} catch (err) {return {};}

2
Plugins/BDFDB.min.js vendored
View File

File diff suppressed because one or more lines are too long

19
Plugins/GoogleSearchReplace/GoogleSearchReplace.plugin.js
View File

@ -47,7 +47,7 @@ var GoogleSearchReplace = (_ => {
if (!window.BDFDB || typeof BDFDB != "object" || !BDFDB.loaded || !this.started) return; if (!window.BDFDB || typeof BDFDB != "object" || !BDFDB.loaded || !this.started) return;
let settings = BDFDB.DataUtils.get(this, "settings"); let settings = BDFDB.DataUtils.get(this, "settings");
let engines = BDFDB.DataUtils.get(this, "engines"); let engines = BDFDB.DataUtils.get(this, "engines");
let settingsPanel, settingsItems = [], engineitems = []; let settingsPanel, settingsItems = [];
for (let key in settings) settingsItems.push(BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsSaveItem, { for (let key in settings) settingsItems.push(BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsSaveItem, {
className: BDFDB.disCN.marginbottom8, className: BDFDB.disCN.marginbottom8,
@ -57,19 +57,18 @@ var GoogleSearchReplace = (_ => {
label: this.defaults.settings[key].description, label: this.defaults.settings[key].description,
value: settings[key] value: settings[key]
})); }));
for (let key in engines) engineitems.push(BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsSaveItem, {
className: BDFDB.disCN.marginbottom8,
type: "Switch",
plugin: this,
keys: ["engines", key],
label: this.defaults.engines[key].name,
value: engines[key]
}));
settingsItems.push(BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsPanelInner, { settingsItems.push(BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsPanelInner, {
title: "Search Engines:", title: "Search Engines:",
first: settingsItems.length == 0, first: settingsItems.length == 0,
last: true, last: true,
children: engineitems children: Object.keys(engines).filter(n => n && n != "_all").map(key => BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsSaveItem, {
className: BDFDB.disCN.marginbottom8,
type: "Switch",
plugin: this,
keys: ["engines", key],
label: this.defaults.engines[key].name,
value: engines[key]
}))
})); }));
return settingsPanel = BDFDB.PluginUtils.createSettingsPanel(this, settingsItems); return settingsPanel = BDFDB.PluginUtils.createSettingsPanel(this, settingsItems);

57
Plugins/NotificationSounds/NotificationSounds.plugin.js
View File

@ -45,6 +45,25 @@ var NotificationSounds = (_ => {
"discodo": {implemented:false, name:"Unknown", src:"/assets/ae7d16bb2eea76b9b9977db0fad66658.mp3", mute:true, focus:null, include:true}, "discodo": {implemented:false, name:"Unknown", src:"/assets/ae7d16bb2eea76b9b9977db0fad66658.mp3", mute:true, focus:null, include:true},
"overlayunlock": {implemented:false, name:"Overlay Unlocked", src:"/assets/ad322ffe0a88436296158a80d5d11baa.mp3", mute:true, focus:null, include:true} "overlayunlock": {implemented:false, name:"Overlay Unlocked", src:"/assets/ad322ffe0a88436296158a80d5d11baa.mp3", mute:true, focus:null, include:true}
}; };
/* NEVER CHANGE THE SRC LINKS IN THE PLUGIN FILE, TO ADD NEW SONGS ADD THEM IN THE SETTINGS GUI IN THE PLUGINS PAGE */
const defaultAudios = {
"---": {
"---": null
},
"Default": {
"Communication Channel": "https://notificationsounds.com/soundfiles/63538fe6ef330c13a05a3ed7e599d5f7/file-sounds-917-communication-channel.wav",
"Isn't it": "https://notificationsounds.com/soundfiles/ba2fd310dcaa8781a9a652a31baf3c68/file-sounds-969-isnt-it.wav",
"Job Done": "https://notificationsounds.com/soundfiles/5b69b9cb83065d403869739ae7f0995e/file-sounds-937-job-done.wav",
"Served": "https://notificationsounds.com/soundfiles/b337e84de8752b27eda3a12363109e80/file-sounds-913-served.wav",
"Solemn": "https://notificationsounds.com/soundfiles/53fde96fcc4b4ce72d7739202324cd49/file-sounds-882-solemn.wav",
"System Fault": "https://notificationsounds.com/soundfiles/ebd9629fc3ae5e9f6611e2ee05a31cef/file-sounds-990-system-fault.wav",
"You wouldn't believe": "https://notificationsounds.com/soundfiles/087408522c31eeb1f982bc0eaf81d35f/file-sounds-949-you-wouldnt-believe.wav"
},
"Discord": {}
};
for (let id in types) if (types[id].include) defaultAudios.Discord[types[id].name] = types[id].src;
return class NotificationSounds { return class NotificationSounds {
getName () {return "NotificationSounds";} getName () {return "NotificationSounds";}
@ -71,26 +90,6 @@ var NotificationSounds = (_ => {
audios = {}; audios = {};
choices = {}; choices = {};
firedEvents = {}; firedEvents = {};
/* NEVER CHANGE THE SRC LINKS IN THE PLUGIN FILE, TO ADD NEW SONGS ADD THEM IN THE SETTINGS GUI IN THE PLUGINS PAGE */
this.defaults = {
"---": {
"---": null
},
"Default": {
"Communication Channel": "https://notificationsounds.com/soundfiles/63538fe6ef330c13a05a3ed7e599d5f7/file-sounds-917-communication-channel.wav",
"Isn't it": "https://notificationsounds.com/soundfiles/ba2fd310dcaa8781a9a652a31baf3c68/file-sounds-969-isnt-it.wav",
"Job Done": "https://notificationsounds.com/soundfiles/5b69b9cb83065d403869739ae7f0995e/file-sounds-937-job-done.wav",
"Served": "https://notificationsounds.com/soundfiles/b337e84de8752b27eda3a12363109e80/file-sounds-913-served.wav",
"Solemn": "https://notificationsounds.com/soundfiles/53fde96fcc4b4ce72d7739202324cd49/file-sounds-882-solemn.wav",
"System Fault": "https://notificationsounds.com/soundfiles/ebd9629fc3ae5e9f6611e2ee05a31cef/file-sounds-990-system-fault.wav",
"You wouldn't believe": "https://notificationsounds.com/soundfiles/087408522c31eeb1f982bc0eaf81d35f/file-sounds-949-you-wouldnt-believe.wav"
},
"Discord": {}
};
for (let id in types) if (types[id].include) this.defaults.Discord[types[id].name] = types[id].src;
this.defaults.Discord = BDFDB.ObjectUtils.sort(this.defaults.Discord);
} }
getSettingsPanel (collapseStates = {}) { getSettingsPanel (collapseStates = {}) {
@ -410,6 +409,9 @@ var NotificationSounds = (_ => {
}; };
e.returnValue.stop = _ => {audio.pause();} e.returnValue.stop = _ => {audio.pause();}
}}); }});
for (let key in defaultAudios) defaultAudios[key] = BDFDB.ObjectUtils.sort(defaultAudios[key]);
this.loadAudios(); this.loadAudios();
this.loadChoices(); this.loadChoices();
@ -474,21 +476,22 @@ var NotificationSounds = (_ => {
} }
forceUpdateAll () { forceUpdateAll () {
repatchIncoming = true; repatchIncoming = true;
callAudio = BDFDB.LibraryModules.SoundUtils.createSound("call_calling"); callAudio = BDFDB.LibraryModules.SoundUtils.createSound("call_calling");
BDFDB.ModuleUtils.forceAllUpdates(this); BDFDB.ModuleUtils.forceAllUpdates(this);
} }
loadAudios () { loadAudios () {
audios = Object.assign({}, this.defaults, BDFDB.DataUtils.load(this, "audios")); audios = Object.assign({}, defaultAudios, BDFDB.DataUtils.load(this, "audios"));
BDFDB.DataUtils.save(audios, this, "audios"); BDFDB.DataUtils.save(audios, this, "audios");
} }
loadChoices () { loadChoices () {
let loadedChoices = BDFDB.DataUtils.load(this, "choices");
for (let type in types) { for (let type in types) {
let choice = BDFDB.DataUtils.load(this, "choices", type) || {}, songFound = false; let choice = loadedChoices[type] || {}, songFound = false;
for (let category in audios) if (choice.category == category) for (var song in audios[category]) if (choice.song == song) { for (let category in audios) if (choice.category == category) for (let song in audios[category]) if (choice.song == song) {
songFound = true; songFound = true;
break; break;
} }

1
Plugins/PersonalPins/PersonalPins.plugin.js
View File

@ -282,6 +282,7 @@ var PersonalPins = (_ => {
embed.timestamp = embed.timestamp && new BDFDB.DiscordObjects.Timestamp(embed.timestamp); embed.timestamp = embed.timestamp && new BDFDB.DiscordObjects.Timestamp(embed.timestamp);
} }
message.embeds = message.embeds.filter(n => !(n && n.type == "gifv")); message.embeds = message.embeds.filter(n => !(n && n.type == "gifv"));
message.reactions = [];
message = new BDFDB.DiscordObjects.Message(message); message = new BDFDB.DiscordObjects.Message(message);
let channel = notes[guild_id][channel_id][message_idPOS].channel && new BDFDB.DiscordObjects.Channel(JSON.parse(notes[guild_id][channel_id][message_idPOS].channel)); let channel = notes[guild_id][channel_id][message_idPOS].channel && new BDFDB.DiscordObjects.Channel(JSON.parse(notes[guild_id][channel_id][message_idPOS].channel));
if (!channel) { if (!channel) {

19
Plugins/ReverseImageSearch/ReverseImageSearch.plugin.js
View File

@ -46,7 +46,7 @@ var ReverseImageSearch = (_ => {
if (!window.BDFDB || typeof BDFDB != "object" || !BDFDB.loaded || !this.started) return; if (!window.BDFDB || typeof BDFDB != "object" || !BDFDB.loaded || !this.started) return;
let settings = BDFDB.DataUtils.get(this, "settings"); let settings = BDFDB.DataUtils.get(this, "settings");
let engines = BDFDB.DataUtils.get(this, "engines"); let engines = BDFDB.DataUtils.get(this, "engines");
let settingsPanel, settingsItems = [], innerItems = [], engineitems = []; let settingsPanel, settingsItems = [], innerItems = [];
for (let key in settings) (!this.defaults.settings[key].inner ? settingsItems : innerItems).push(BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsSaveItem, { for (let key in settings) (!this.defaults.settings[key].inner ? settingsItems : innerItems).push(BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsSaveItem, {
className: BDFDB.disCN.marginbottom8, className: BDFDB.disCN.marginbottom8,
@ -56,14 +56,6 @@ var ReverseImageSearch = (_ => {
label: this.defaults.settings[key].description, label: this.defaults.settings[key].description,
value: settings[key] value: settings[key]
})); }));
for (let key in engines) engineitems.push(BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsSaveItem, {
className: BDFDB.disCN.marginbottom8,
type: "Switch",
plugin: this,
keys: ["engines", key],
label: this.defaults.engines[key].name,
value: engines[key]
}));
settingsItems.push(BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsPanelInner, { settingsItems.push(BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsPanelInner, {
title: "Add extra ContextMenu Entry for:", title: "Add extra ContextMenu Entry for:",
first: settingsItems.length == 0, first: settingsItems.length == 0,
@ -74,7 +66,14 @@ var ReverseImageSearch = (_ => {
title: "Search Engines:", title: "Search Engines:",
first: settingsItems.length == 0, first: settingsItems.length == 0,
last: true, last: true,
children: engineitems children: Object.keys(engines).filter(n => n && n != "_all").map(key => BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsSaveItem, {
className: BDFDB.disCN.marginbottom8,
type: "Switch",
plugin: this,
keys: ["engines", key],
label: this.defaults.engines[key].name,
value: engines[key]
}))
})); }));
return settingsPanel = BDFDB.PluginUtils.createSettingsPanel(this, settingsItems); return settingsPanel = BDFDB.PluginUtils.createSettingsPanel(this, settingsItems);