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 2021-01-20 14:30:38 +01:00
parent cab234aa2e
commit fda66804eb
2 changed files with 72 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
Plugins/ImageUtilities/ImageUtilities.plugin.js
View File

@ -69,7 +69,8 @@ module.exports = (_ => {
}
} : (([Plugin, BDFDB]) => {
const imgUrlReplaceString = "DEVILBRO_BD_REVERSEIMAGESEARCH_REPLACE_IMAGEURL";
var firedEvents = [], clickedImage;
var firedEvents = [], clickedImage, loadedImages = [], searching = false;
var settings = {}, amounts = {}, zoomSettings = {}, engines = {}, enabledEngines = {}, ownLocations = {}, downloadsFolder;
const ImageDetails = class ImageDetails extends BdApi.React.Component {
@ -358,6 +359,7 @@ module.exports = (_ => {
title: "Your own Download Locations:",
dividerTop: true,
children: Object.keys(ownLocations).map(name => {
let locationName = name;
let editable = name != "Downloads";
return BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Card, {
horizontal: true,
@ -366,39 +368,40 @@ module.exports = (_ => {
grow: 0,
basis: "180px",
children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TextInput, {
value: name,
placeholder: name,
value: locationName,
placeholder: locationName,
size: BDFDB.LibraryComponents.TextInput.Sizes.MINI,
maxLength: 100000000000000000000,
style: {marginRight: 6},
disabled: !editable,
onChange: !editable ? null : value => {
ownLocations[value] = ownLocations[name];
delete ownLocations[name];
ownLocations[value] = ownLocations[locationName];
delete ownLocations[locationName];
locationName = value;
BDFDB.DataUtils.save(ownLocations, this, "ownLocations");
}
})
}),
BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Flex.Child, {
children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TextInput, {
value: ownLocations[name].location,
placeholder: ownLocations[name].location,
value: ownLocations[locationName].location,
placeholder: ownLocations[locationName].location,
size: BDFDB.LibraryComponents.TextInput.Sizes.MINI,
maxLength: 100000000000000000000,
style: {marginRight: 10},
disabled: !editable,
onChange: !editable ? null : value => {
ownLocations[name].location = value;
ownLocations[locationName].location = value;
BDFDB.DataUtils.save(ownLocations, this, "ownLocations");
}
})
}),
BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Flex.Child, {
children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Switch, {
value: ownLocations[name].enabled,
value: ownLocations[locationName].enabled,
size: BDFDB.LibraryComponents.Switch.Sizes.MINI,
onChange: value => {
ownLocations[name].enabled = value;
ownLocations[locationName].enabled = value;
BDFDB.DataUtils.save(ownLocations, this, "ownLocations");
}
})
@ -406,7 +409,7 @@ module.exports = (_ => {
],
noRemove: !editable,
onRemove: !editable ? null : _ => {
delete ownLocations[name];
delete ownLocations[locationName];
BDFDB.DataUtils.save(ownLocations, this, "ownLocations");
BDFDB.PluginUtils.refreshSettingsPanel(this, settingsPanel);
}
@ -637,13 +640,37 @@ module.exports = (_ => {
if (clickedImage) e.instance.props.cachedImage = clickedImage;
let url = e.instance.props.cachedImage && e.instance.props.cachedImage.src ? e.instance.props.cachedImage : e.instance.props.src;
url = url.src || url;
let messages = this.getMessageGroupOfImage(url);
if (e.returnvalue) {
let message = !searching && BDFDB.ReactUtils.findValue(e.instance.props.cachedImage, "message", {up: true});
if (message) {
searching = true;
BDFDB.LibraryModules.APIUtils.get({
url: BDFDB.DiscordConstants.Endpoints.SEARCH_CHANNEL(message.channel_id),
oldFormErrors: true,
query: this.createQuery(message, true)
}).then(result => {
BDFDB.LibraryModules.APIUtils.get({
url: BDFDB.DiscordConstants.Endpoints.SEARCH_CHANNEL(message.channel_id),
oldFormErrors: true,
query: this.createQuery(message, false)
}).then(result2 => {
searching = false;
let found = [], messages = BDFDB.ArrayUtils.keySort([
message,
[].concat(result.body.messages).reverse(),
[].concat(result2.body.messages)
].flat(10).filter(m => {
if (!found.includes(m.id) && m.attachments.length || m.embeds.filter(embed => embed.type == "image").length) {
found.push(m.id);
return m;
}
}), "id");
console.log(messages);
});
});
}
let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {props: [["className", BDFDB.disCN.downloadlink]]});
if (index > -1) {
children[index].props.onClick = event => {
return event.shiftKey;
};
let openContext = event => {
BDFDB.ContextMenuUtils.open(this, event, BDFDB.ContextMenuUtils.createItem(BDFDB.LibraryComponents.MenuItems.MenuGroup, {
children: Object.keys(zoomSettings).map(type => BDFDB.ContextMenuUtils.createItem(BDFDB.LibraryComponents.MenuItems.MenuSliderItem, Object.assign({
@ -726,8 +753,8 @@ module.exports = (_ => {
});
}
let imageIndex = 0, amount = 1;
if (messages.length) {
let data = this.getSiblingsAndPosition(url, messages);
if (loadedImages.length) {
let data = this.getSiblingsAndPosition(url);
imageIndex = data.index;
amount = data.amount;
if (data.previous) {
@ -760,9 +787,9 @@ module.exports = (_ => {
if (e.node) {
let modal = BDFDB.DOMUtils.getParent(BDFDB.dotCNC.modal + BDFDB.dotCN.layermodal, e.node);
if (modal) {
modal.className = BDFDB.DOMUtils.formatClassName(modal.className, messages.length && BDFDB.disCN._imageutilitiesgallery, settings.addDetails && BDFDB.disCN._imageutilitiesdetailsadded);
modal.className = BDFDB.DOMUtils.formatClassName(modal.className, loadedImages.length && BDFDB.disCN._imageutilitiesgallery, settings.addDetails && BDFDB.disCN._imageutilitiesdetailsadded);
this.cleanupListeners("Gallery");
if (messages.length) {
if (loadedImages.length) {
document.keydownImageUtilitiesGalleryListener = event => {
if (!document.contains(e.node)) this.cleanupListeners("Gallery");
else if (!firedEvents.includes("Gallery")) {
@ -905,7 +932,7 @@ module.exports = (_ => {
}
else {
if (settings.resizeImage && e.instance.props.className && e.instance.props.className.indexOf(BDFDB.disCN.imagemodalimage) > -1 && BDFDB.ReactUtils.findOwner(BDFDB.ObjectUtils.get(e, `instance.${BDFDB.ReactUtils.instanceKey}`), {name: "ImageModal", up: true})) {
let data = settings.enableGallery ? this.getSiblingsAndPosition(e.instance.props.src, this.getMessageGroupOfImage(e.instance.props.src)) : {};
let data = settings.enableGallery ? this.getSiblingsAndPosition(e.instance.props.src) : {};
let aRects = BDFDB.DOMUtils.getRects(document.querySelector(BDFDB.dotCN.appmount));
let ratio = Math.min((aRects.width * (data.previous || data.next ? 0.8 : 1) - 20) / e.instance.props.width, (aRects.height - (settings.addDetails ? 310 : 100)) / e.instance.props.height);
let width = Math.round(ratio * e.instance.props.width);
@ -941,6 +968,16 @@ module.exports = (_ => {
return child;
}
createQuery (message, before) {
return BDFDB.LibraryModules.APIEncodeUtils.stringify(BDFDB.ObjectUtils.filter({
has: ["image", "embed"],
include_nsfw: true,
min_id: !before && message.id,
max_id: before && message.id,
sort_order: before ? "desc" : "asc"
}, n => n));
}
isValidImg (url) {
const file = url && (BDFDB.LibraryModules.URLParser.parse(url).pathname || "").toLowerCase();
return file && (url.startsWith("https://images-ext-2.discordapp.net/") || file.endsWith(".jpg") || file.endsWith(".jpeg") || file.endsWith(".png") || file.endsWith(".gif") || file.endsWith(".apng") || file.endsWith(".webp") || file.endsWith(".svg"));
@ -1013,6 +1050,9 @@ module.exports = (_ => {
else return wholePath;
}
getImages (src, instance) {
}
getMessageGroupOfImage (src) {
if (src && settings.enableGallery) for (let message of document.querySelectorAll(BDFDB.dotCN.message)) for (let img of message.querySelectorAll(BDFDB.dotCNS.imagewrapper + "img")) if (this.isSameImage(src, img)) {
let previousSiblings = [], nextSiblings = [];
@ -1034,8 +1074,8 @@ module.exports = (_ => {
return [];
}
getSiblingsAndPosition (url, messages) {
let images = messages.map(n => Array.from(n.querySelectorAll(BDFDB.dotCNS.imagewrapper + "img"))).flat().filter(img => !BDFDB.DOMUtils.getParent(BDFDB.dotCN.spoilerhidden, img));
getSiblingsAndPosition (url) {
let images = loadedImages.map(n => Array.from(n.querySelectorAll(BDFDB.dotCNS.imagewrapper + "img"))).flat().filter(img => !BDFDB.DOMUtils.getParent(BDFDB.dotCN.spoilerhidden, img));
let next, previous, index = 0, amount = images.length;
for (let i = 0; i < amount; i++) if (this.isSameImage(url, images[i])) {
index = i;

15
Plugins/ServerFolders/ServerFolders.plugin.js
View File

@ -14,8 +14,13 @@ module.exports = (_ => {
"info": {
"name": "ServerFolders",
"author": "DevilBro",
"version": "6.8.5",
"version": "6.8.6",
"description": "Patch Discords native Folders in a way to open Servers within a Folder in a new bar to the right, also adds a bunch of new features to more easily organize, customize and manage your Folders"
},
"changeLog": {
"fixed": {
"Custom Icons": "You can now add custom icons again"
}
}
};
@ -353,7 +358,7 @@ module.exports = (_ => {
BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Button, {
children: BDFDB.LanguageUtils.LanguageStrings.ADD,
onClick: (e, instance) => {
let inputIns = BDFDB.ReactUtils.findOwner(this, {name: "BDFDBInput", all: true, unlimited: true});
let inputIns = BDFDB.ReactUtils.findOwner(this, {name: "BDFDB_TextInput", all: true, unlimited: true});
if (inputIns.length == 2 && inputIns[0].props.value && inputIns[1].props.value) {
this.checkImage(inputIns[0].props.value, openIcon => {
this.checkImage(inputIns[1].props.value, closedIcon => {
@ -362,11 +367,11 @@ module.exports = (_ => {
this.props.open = null;
this.props.closed = null;
BDFDB.PatchUtils.forceAllUpdates(_this, "GuildFolderSettingsModal");
BDFDB.NotificationUtils.toast("Custom Icon was added to selection", {type: "success"});
BDFDB.NotificationUtils.toast("Custom Icon was added to Selection", {type: "success"});
});
})
}
else BDFDB.NotificationUtils.toast("Add an image for the open and the closed icon", {type: "danger"});
else BDFDB.NotificationUtils.toast("Add an Image for the open and closed Icon", {type: "danger"});
}
})
]
@ -1821,7 +1826,7 @@ module.exports = (_ => {
modal_colorpicker2: "Secondary Folder Color",
modal_colorpicker3: "Tooltip Color",
modal_colorpicker4: "Font Color",
modal_copytooltipcolor: "Use the same Color for all servers in a Folder",
modal_copytooltipcolor: "Use the same Color for all Servers in a Folder",
modal_customclosed: "Closed icon",
modal_customopen: "Open icon",
modal_custompreview: "Icon preview",