Mirrors
/
vizality
mirror of https://github.com/vizality/vizality
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #110 from doggybootsy/stable

Browse Source
stable
dperolio 2 years ago committed by GitHub
parent 70e8d1f634 c8f5b7cb03
commit 1100629517
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 99 additions and 132 deletions
Show Stats Download Patch File Download Diff File

2
renderer/src/api/I18n.js
Unescape View File

@ -52,7 +52,7 @@ export default class I18n extends API {
async start () { async start () {
locale = getModule('locale', 'theme')?.locale; locale = getModule('locale', 'theme')?.locale;
FluxDispatcher.subscribe($discord.constants.ActionTypes.I18N_LOAD_SUCCESS, this._handleLocaleChange); FluxDispatcher.subscribe('I18N_LOAD_SUCCESS', this._handleLocaleChange);
this.injectAllStrings(__coreMessages); this.injectAllStrings(__coreMessages);
} }

8
renderer/src/api/settings/store/Actions.js
Unescape View File

@ -3,7 +3,7 @@ import { ActionTypes } from '@vizality/constants';
export default { export default {
toggleSetting (category, setting, defaultValue) { toggleSetting (category, setting, defaultValue) {
FluxDispatcher.dirtyDispatch({ FluxDispatcher.dispatch({
type: ActionTypes.VIZALITY_TOGGLE_SETTING, type: ActionTypes.VIZALITY_TOGGLE_SETTING,
category, category,
setting, setting,
@ -12,7 +12,7 @@ export default {
}, },
updateSettings (category, settings) { updateSettings (category, settings) {
FluxDispatcher.dirtyDispatch({ FluxDispatcher.dispatch({
type: ActionTypes.VIZALITY_UPDATE_SETTINGS, type: ActionTypes.VIZALITY_UPDATE_SETTINGS,
category, category,
settings settings
@ -20,7 +20,7 @@ export default {
}, },
updateSetting (category, setting, value) { updateSetting (category, setting, value) {
FluxDispatcher.dirtyDispatch({ FluxDispatcher.dispatch({
type: ActionTypes.VIZALITY_UPDATE_SETTING, type: ActionTypes.VIZALITY_UPDATE_SETTING,
category, category,
setting, setting,
@ -29,7 +29,7 @@ export default {
}, },
deleteSetting (category, setting) { deleteSetting (category, setting) {
FluxDispatcher.dirtyDispatch({ FluxDispatcher.dispatch({
type: ActionTypes.VIZALITY_DELETE_SETTING, type: ActionTypes.VIZALITY_DELETE_SETTING,
category, category,
setting setting

4
renderer/src/builtins/attributes/modules/components/Anchor.js
Unescape View File

@ -109,8 +109,8 @@ export default builtin => {
icon: 'PersonRemove' icon: 'PersonRemove'
}); });
} }
return FluxDispatcher.dirtyDispatch({ return FluxDispatcher.dispatch({
type: $discord.constants.ActionTypes.USER_PROFILE_MODAL_OPEN, type: 'USER_PROFILE_MODAL_OPEN',
userId userId
}); });
} catch (err) { } catch (err) {

29
renderer/src/builtins/attributes/modules/members/Member.js
Unescape View File

@ -4,24 +4,31 @@
* @memberof Builtin.Attributes.Misc * @memberof Builtin.Attributes.Misc
*/ */
import { getModuleByDisplayName } from '@vizality/webpack'; import { getModule } from '@vizality/webpack';
import { patch, unpatch } from '@vizality/patcher'; import { patch, unpatch } from '@vizality/patcher';
export const labels = [ 'Members', 'Member' ]; export const labels = [ 'Members', 'Member' ];
export default builtin => { export default builtin => {
const MemberListItem = getModuleByDisplayName('MemberListItem'); const MemberListItem = getModule([ 'AVATAR_DECORATION_PADDING' ])
patch('vz-attributes-members-member', MemberListItem?.prototype, 'render', function (_, res) { patch('vz-attributes-members-member', MemberListItem?.default, 'type', (_, res) => {
try { try {
if (!res || !this?.props?.user) return; if (!res || !res?.props?.user) return;
const { activities } = res.props?.subText?.props; const { user, isOwner, activities } = res.props;
const { user, isOwner } = this.props;
if (!user) return; if (!user) return;
res.props['vz-user-id'] = user.id;
res.props['vz-activity'] = Boolean(activities?.some(activity => activity.type !== 4)) && ''; const old = res.type.prototype.render
res.props['vz-self'] = Boolean(user.email) && ''; res.type.prototype.render = function() {
res.props['vz-bot'] = Boolean(user.bot) && ''; const res = old.apply(this, arguments)
res.props['vz-owner'] = Boolean(isOwner) && '';
res.props['vz-user-id'] = user.id;
res.props['vz-activity'] = Boolean(activities?.some(activity => activity.type !== 4)) && '';
res.props['vz-self'] = Boolean(user.email) && '';
res.props['vz-bot'] = Boolean(user.bot) && '';
res.props['vz-owner'] = Boolean(isOwner) && '';
return res
}
} catch (err) { } catch (err) {
return builtin.error(builtin._labels.concat(labels), err); return builtin.error(builtin._labels.concat(labels), err);
} }

4
renderer/src/builtins/attributes/modules/misc/Settings.js
Unescape View File

@ -40,7 +40,7 @@ export default () => {
/** /**
* Subscribe to Discord's user settings uppdate flux store. * Subscribe to Discord's user settings uppdate flux store.
*/ */
FluxDispatcher?.subscribe($discord.constants.ActionTypes.USER_SETTINGS_UPDATE, handleSettingsChange); FluxDispatcher?.subscribe('USER_SETTINGS_UPDATE', handleSettingsChange);
/** /**
* Remove attributes and unsubscribe from Flux on unload. * Remove attributes and unsubscribe from Flux on unload.
@ -48,6 +48,6 @@ export default () => {
return () => { return () => {
root?.removeAttribute('vz-theme'); root?.removeAttribute('vz-theme');
root?.removeAttribute('vz-mode'); root?.removeAttribute('vz-mode');
FluxDispatcher?.unsubscribe($discord.constants.ActionTypes.USER_SETTINGS_UPDATE, handleSettingsChange); FluxDispatcher?.unsubscribe('USER_SETTINGS_UPDATE', handleSettingsChange);
}; };
}; };

147
renderer/src/builtins/settings/index.js
Unescape View File

@ -1,92 +1,18 @@
import { openModal, closeModal } from '@vizality/modal'; import { openModal, closeModal } from '@vizality/modal';
import { getModuleByDisplayName, getModule, instance } from '@vizality/webpack'; import { getModule, contextMenu } from '@vizality/webpack';
import { SettingsContextMenu } from '@vizality/components/vizality'; import { SettingsContextMenu } from '@vizality/components/vizality';
import { Content, Layout } from '@vizality/components/dashboard'; import { Content, Layout } from '@vizality/components/dashboard';
import { toPlural, toTitleCase } from '@vizality/util/string'; import { toPlural } from '@vizality/util/string';
import { Confirm, ContextMenu, Modal } from '@vizality/components'; import { Confirm, ContextMenu, Modal } from '@vizality/components';
import { joinClassNames } from '@vizality/util/dom'; import { joinClassNames, waitForElement } from '@vizality/util/dom';
import { patch, unpatch } from '@vizality/patcher'; import { patch, unpatch } from '@vizality/patcher';
import { Builtin } from '@vizality/entities'; import { Builtin } from '@vizality/entities';
import { Messages } from '@vizality/i18n'; import { Messages } from '@vizality/i18n';
import React from 'react'; import React from 'react';
import { webFrame } from 'electron'
import SettingsPage from './components/Settings'; import SettingsPage from './components/Settings';
/**
* Contributed by DoggyBootsy, originally written by Strencher.
*/
{
const modules = Object.values(instance.m).filter(e => e.toString().search(/openContextMenuLazy[)(]/) > -1);
const regex = [
{
regex: /return Promise\.all\(\[(.*?)\]\)\.then\(\D+(.+?)\)\)/,
parse (match) {
return {
imports: matchAll(/\(([\de]+)\)/g, match[0]).map(e => Number(e)),
main: match[1]
};
}
},
{
regex: /return Promise\.resolve\(\)\.then\(\D+(.+?)\)/,
parse (match) {
return {
imports: [],
main: match[0]
};
}
},
{
regex: /return [rn]\.e\((\d+)\)\.then\(\D+(\d+)\)\)/,
parse (match) {
return {
imports: [ match[0] ],
main: match[0]
};
}
}
];
function matchAll (regex, input, parent = false) {
const output = [];
let matches,
lastIndex = 0;
while (matches = regex.exec(input.slice(lastIndex))) {
if (!regex.global) lastIndex += matches.index + matches[0].length;
if (parent) output.push(matches);
else {
const [ , ...match ] = matches;
output.push(match);
}
}
return output;
}
const found = [];
for (let i = 0; i < modules.length; i++) {
const str = modules[i].toString();
for (let i2 = 0; i2 < regex.length; i2++) {
const { regex: reg, parse } = regex[i2];
if (!reg.test(str)) continue;
const result = matchAll(reg, str).map(res => ({ ...parse(res), module: modules[i], reg }));
found.push(...result);
break;
}
}
Promise.all(found.map(item => {
try {
const imports = item.imports.map(i => instance.e(i));
return Promise.all(imports).then(instance.bind(instance, item.main)).catch(() => void 0);
} catch (error) {
return Promise.resolve();
}
}));
}
/** /**
* The settings page categories. * The settings page categories.
*/ */
@ -183,22 +109,59 @@ export default class Settings extends Builtin {
)); ));
} }
async waitFor(filter) {
const exists = await getModule(filter, true, true)
if (exists) return exists
return await this.waitFor(filter)
}
async patchSettingsContextMenu () { async patchSettingsContextMenu () {
const DiscordSettingsContextMenu = await getModule(m => m.default?.displayName === 'UserSettingsCogContextMenu', true); const { panels } = await getModule('panels', 'downloadProgressCircle', 'hasNotice', true)
const { container } = await getModule('container', 'usernameContainer', 'godlike', true)
const { button } = await getModule('button', 'disabled', 'enabled', true)
await waitForElement(`.${panels} > .${container} .${button}:last-child`);
const settingsNode = webFrame.top.context.document.querySelector(`.${panels} > .${container} .${button}:last-child`);
settingsNode.__reactProps$.onContextMenu({
stopPropagation() {},
currentTarget: { contains: () => true },
preventDefault() {}
});
contextMenu.closeContextMenu();
const DiscordSettingsContextMenu = await this.waitFor(m => {
if (!m.default) return;
const string = String(m.default);
return string.includes('.AnalyticsLocationProvider,') && string.includes('.createElement(') && !string.includes('return function') && !m.
default.displayName;
});
patch('vz-settings-context-menu', DiscordSettingsContextMenu, 'default', (_, res) => { patch('vz-settings-context-menu', DiscordSettingsContextMenu, 'default', (_, res) => {
const items = res.props.children.find(child => Array.isArray(child)); const { children } = res.props;
items.push( const old = children.type;
<>
<ContextMenu.Separator /> children.type = () => {
<ContextMenu.Item const result = old(children.props);
id='vizality-dashboard'
label='Vizality' const items = result.props.children.props.children.find(child => Array.isArray(child));
action={() => vizality.api.routes.navigateTo('dashboard')}
> items.push(
{SettingsContextMenu.type().props.children} <>
</ContextMenu.Item> <ContextMenu.Separator />
</> <ContextMenu.Item
); id='vizality-dashboard'
label='Vizality'
action={() => vizality.api.routes.navigateTo('dashboard')}
>
{SettingsContextMenu.type().props.children}
</ContextMenu.Item>
</>
);
return result;
};
}); });
} }

4
renderer/src/index.js
Unescape View File

@ -6,7 +6,7 @@
import { log as _log, warn as _warn, error as _error, deprecate as _deprecate } from '@vizality/util/logger'; import { log as _log, warn as _warn, error as _error, deprecate as _deprecate } from '@vizality/util/logger';
import { initialize as initializeWebpackModules, getModule, FluxDispatcher, getAllModules } from '@vizality/webpack'; import { initialize as initializeWebpackModules, getModule, FluxDispatcher, getAllModules } from '@vizality/webpack';
import { Directories, Events, Protocols, Developers } from '@vizality/constants'; import { Directories, Events, Protocols } from '@vizality/constants';
import { resolveCompiler } from '@vizality/compilers'; import { resolveCompiler } from '@vizality/compilers';
import { createElement } from '@vizality/util/dom'; import { createElement } from '@vizality/util/dom';
import { toPlural } from '@vizality/util/string'; import { toPlural } from '@vizality/util/string';
@ -60,7 +60,6 @@ export default class Vizality extends Updatable {
async handleConnectionOpen () { async handleConnectionOpen () {
return new Promise(resolve => { return new Promise(resolve => {
console.log(getAllModules()?.length);
if (getAllModules()?.length > 7000) { if (getAllModules()?.length > 7000) {
return resolve(); return resolve();
} }
@ -93,6 +92,7 @@ export default class Vizality extends Updatable {
* @note This has to be after webpack modules have been initialized. * @note This has to be after webpack modules have been initialized.
*/ */
const Flux = await getModule('Store', 'PersistedStore', true); const Flux = await getModule('Store', 'PersistedStore', true);
Flux.connectStoresAsync = (stores, fn) => Component => Flux.connectStoresAsync = (stores, fn) => Component =>
import('./components').AsyncComponent.from((async () => { import('./components').AsyncComponent.from((async () => {
const awaitedStores = await Promise.all(stores); const awaitedStores = await Promise.all(stores);

4
renderer/src/modules/components/Anchor.jsx
Unescape View File

@ -76,8 +76,8 @@ export default memo(({ onClick, href, className, userId, children, type, addonId
icon: 'PersonRemove' icon: 'PersonRemove'
}); });
} }
return FluxDispatcher.dirtyDispatch({ return FluxDispatcher.dispatch({
type: $discord.constants.ActionTypes.USER_PROFILE_MODAL_OPEN, type: 'USER_PROFILE_MODAL_OPEN',
userId userId
}); });
} }

6
renderer/src/modules/components/index.js
Unescape View File

@ -25,7 +25,7 @@ export const ShinyButton = AsyncComponent.fromDisplayName('ShinyButton');
export const WebhookCard = AsyncComponent.fromDisplayName('WebhookCard'); export const WebhookCard = AsyncComponent.fromDisplayName('WebhookCard');
export const Tooltip = AsyncComponent.fetchFromProps('TooltipContainer'); export const Tooltip = AsyncComponent.fetchFromProps('TooltipContainer');
export const HelpMessage = AsyncComponent.fromDisplayName('HelpMessage'); export const HelpMessage = AsyncComponent.fromDisplayName('HelpMessage');
export const Button = AsyncComponent.fromProps(m => m.Link && m.Hovers); export const Button = AsyncComponent.from(getModule('Link', 'Hovers', 'Sizes', true));
export const FormNotice = AsyncComponent.fromDisplayName('FormNotice'); export const FormNotice = AsyncComponent.fromDisplayName('FormNotice');
// "count", "color", "shape", "disableColor", "className" // "count", "color", "shape", "disableColor", "className"
export const NumberBadge = AsyncComponent.fetchFromProps('NumberBadge'); export const NumberBadge = AsyncComponent.fetchFromProps('NumberBadge');
@ -65,7 +65,7 @@ export const Table = AsyncComponent.fromDisplayName('Table');
export const Image = AsyncComponent.fromDisplayName('Image'); export const Image = AsyncComponent.fromDisplayName('Image');
export const Video = AsyncComponent.fromDisplayName('Video'); export const Video = AsyncComponent.fromDisplayName('Video');
export const Card = AsyncComponent.fromDisplayName('Card'); export const Card = AsyncComponent.fromDisplayName('Card');
export const Text = AsyncComponent.fromDisplayName('Text'); export const Text = AsyncComponent.fromDisplayName('LegacyText');
export const Flex = AsyncComponent.fromDisplayName('Flex'); export const Flex = AsyncComponent.fromDisplayName('Flex');
export { default as ProgressBar } from './ProgressBar'; export { default as ProgressBar } from './ProgressBar';
@ -197,7 +197,7 @@ getModuleByDisplayName('TextInput', true, true).then(TextInput => {
this.TextInput.Sizes = TextInput.Sizes; this.TextInput.Sizes = TextInput.Sizes;
}); });
getModuleByDisplayName('Text', true, true).then(Text => { getModuleByDisplayName('LegacyText', true, true).then(Text => {
this.Text.Colors = Text.Colors; this.Text.Colors = Text.Colors;
this.Text.Sizes = Text.Sizes; this.Text.Sizes = Text.Sizes;
}); });

2
renderer/src/modules/discord/constants.js
Unescape View File

@ -24,4 +24,4 @@ export default {
} }
}; };
export const { ActionTypes, Permissions, Routes } = this.default; export const { Permissions, Routes } = this.default;

4
renderer/src/modules/discord/modal/userProfile/action/open.js
Unescape View File

@ -1,8 +1,8 @@
// if (!userId) return; // if (!userId) return;
// // @todo Use Discord module for this after it's set up. // // @todo Use Discord module for this after it's set up.
// getModule('getUser').getUser(userId) // getModule('getUser').getUser(userId)
// .then(() => getModule('dirtyDispatch').wait( // .then(() => getModule('dispatch').wait(
// () => getModule('dirtyDispatch').dispatch({ type: constants.ActionTypes.USER_PROFILE_MODAL_OPEN, userId }))) // () => getModule('dispatch').dispatch({ type: 'USER_PROFILE_MODAL_OPEN', userId })))
// .catch(() => vizality.api.notifications.sendToast({ // .catch(() => vizality.api.notifications.sendToast({
// header: 'User Not Found', // header: 'User Not Found',
// type: 'User Not Found', // type: 'User Not Found',

17
renderer/src/modules/webpack/index.js
Unescape View File

@ -80,19 +80,16 @@ const _getModule = (filter, retry = false, forever = false) => {
*/ */
export const initialize = async () => { export const initialize = async () => {
/** /**
* Wait until webpack is ready. * If 'window.webpackChunkdiscord_app' doesn't exist create it
* (Discord loads modules that existed window object exists)
*/ */
while (!window.webpackChunkdiscord_app) { if (!window.webpackChunkdiscord_app) window.webpackChunkdiscord_app = []
await sleep(100);
}
let instance;
window.webpackChunkdiscord_app.push([ window.webpackChunkdiscord_app.push([
[ '_vizality' ], [ Symbol('vizality') ],
{}, exports => instance = exports {},
]); (exports) => this.instance = exports
])
this.instance = instance;
for (const mdl in moduleFilters) { for (const mdl in moduleFilters) {
this[mdl] = await _getModule(moduleFilters[mdl], true); this[mdl] = await _getModule(moduleFilters[mdl], true);

Write Preview
Loading…
Cancel
Save