lightcordwarez
/
BetterDiscordApp-v2
mirror of https://github.com/JsSucks/BetterDiscordApp
1
0
Fork 0
Code Issues 3 Releases Wiki Activity

Package installer UploadArea patch

This commit is contained in:
Samuel Elliott 2019-03-10 20:29:55 +00:00
parent fd0032b24c
commit 5a3821ad3e
No known key found for this signature in database
GPG Key ID: 8420C7CDE43DC4D6
2 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
client/src/modules/packageinstaller.js
View File

@ -13,6 +13,7 @@ import Security from './security';
import Reflection from './reflection'; import Reflection from './reflection';
import DiscordApi from './discordapi'; import DiscordApi from './discordapi';
import ThemeManager from './thememanager'; import ThemeManager from './thememanager';
import { MonkeyPatch } from './patcher';
import { DOM } from 'ui'; import { DOM } from 'ui';
export default class PackageInstaller { export default class PackageInstaller {
@ -132,39 +133,51 @@ export default class PackageInstaller {
} }
} }
static async handleDrop(stateNode, e, original) {
if (!e.dataTransfer.files.length || !e.dataTransfer.files[0].name.endsWith('.bd')) return original && original.call(stateNode, e);
e.preventDefault();
e.stopPropagation();
e.stopImmediatePropagation();
if (stateNode) stateNode.clearDragging();
const currentChannel = DiscordApi.currentChannel;
const canUpload = currentChannel ?
currentChannel.checkPermissions(Reflection.modules.DiscordConstants.Permissions.SEND_MESSAGES) &&
currentChannel.checkPermissions(Reflection.modules.DiscordConstants.Permissions.ATTACH_FILES) : false;
const files = Array.from(e.dataTransfer.files).slice(0);
const actionCode = await this.dragAndDropHandler(e.dataTransfer.files[0].path, canUpload);
if (actionCode === 0 && stateNode) stateNode.promptToUpload(files, currentChannel.id, true, !e.shiftKey);
}
/** /**
* Patches Discord upload area for .bd files * Patches Discord upload area for .bd files
*/ */
static async uploadAreaPatch(UploadArea) { static async uploadAreaPatch(UploadArea) {
const reflect = Reflection.DOM(UploadArea.important.selector);
const stateNode = reflect.getComponentStateNode(UploadArea);
const callback = async function (e) {
if (!e.dataTransfer.files.length || !e.dataTransfer.files[0].name.endsWith('.bd')) return;
e.preventDefault();
e.stopPropagation();
e.stopImmediatePropagation();
stateNode.clearDragging();
const currentChannel = DiscordApi.currentChannel;
const canUpload = currentChannel ? currentChannel.checkPermissions(Reflection.modules.DiscordConstants.Permissions.ATTACH_FILES) : false;
const files = Array.from(e.dataTransfer.files).slice(0);
const actionCode = await PackageInstaller.dragAndDropHandler(e.dataTransfer.files[0].path, canUpload);
if (actionCode === 0) stateNode.promptToUpload(files, currentChannel.id, true, !e.shiftKey);
};
// Add a listener to root for when not in a channel // Add a listener to root for when not in a channel
const root = DOM.getElement('#app-mount'); const root = DOM.getElement('#app-mount');
root.addEventListener('drop', callback); const rootHandleDrop = this.handleDrop.bind(this, undefined);
root.addEventListener('drop', rootHandleDrop);
// Remove their handler, add ours, then read theirs to give ours priority to stop theirs when we get a .bd file. const unpatchUploadAreaHandleDrop = MonkeyPatch('BD:ReactComponents', UploadArea.component.prototype).instead('handleDrop', (component, [e], original) => this.handleDrop(component, e, original));
reflect.element.removeEventListener('drop', stateNode.handleDrop);
reflect.element.addEventListener('drop', callback);
reflect.element.addEventListener('drop', stateNode.handleDrop);
this.unpatchUploadArea = function () { this.unpatchUploadArea = () => {
reflect.element.removeEventListener('drop', callback); unpatchUploadAreaHandleDrop();
root.removeEventListener('drop', callback); root.removeEventListener('drop', rootHandleDrop);
this.unpatchUploadArea = undefined;
}; };
for (const element of document.querySelectorAll(UploadArea.important.selector)) {
const stateNode = Reflection.DOM(element).getComponentStateNode(UploadArea);
element.removeEventListener('drop', stateNode.handleDrop);
stateNode.handleDrop = UploadArea.component.prototype.handleDrop.bind(stateNode);
element.addEventListener('drop', stateNode.handleDrop);
stateNode.forceUpdate();
}
} }
} }

12
tests/ext/themes/Example/index.scss
View File

@ -10,16 +10,18 @@ span {
opacity: $spanOpacity2 !important; opacity: $spanOpacity2 !important;
} }
.chat .messages-wrapper, .da-chat .da-messagesWrapper,
#friends .friends-table { .da-friendsTable {
background-image: url(map-get($relative-file-test, url)); background-image: url(map-get($relative-file-test, url));
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.avatar-large { @if map-has-key($avatar, url) {
background-image: url(map-get($avatar, url)) !important; .da-avatar > .da-image {
border-radius: $avatarRadius !important; background-image: url(map-get($avatar, url)) !important;
border-radius: $avatarRadius !important;
}
} }
// Can't use a for loop as then we don't get the index // Can't use a for loop as then we don't get the index