revenge-mod/Revenge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[UI > QuickInstall] Add pop-up when clicking on links (#67)

Browse source
This commit is contained in:
redstonekasi 2023-04-23 01:09:04 +02:00 committed by GitHub
parent 3448a3b2cb
commit ea775736a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 88 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/def.d.ts vendored
View file

@ -76,11 +76,14 @@ export enum ButtonColors {
interface ConfirmationAlertOptions {
title?: string;
content: string | JSX.Element | JSX.Element[];
content: string | JSX.Element | (string | JSX.Element)[];
confirmText?: string;
confirmColor?: ButtonColors;
onConfirm: () => void;
secondaryConfirmText?: string;
onConfirmSecondary?: () => void;
cancelText?: string;
isDismissable?: boolean;
}
interface InputAlertProps {

15
src/ui/alerts.ts
View file

@ -5,21 +5,18 @@ import InputAlert from "@ui/components/InputAlert";
const Alerts = findByProps("openLazy", "close");
interface InternalConfirmationAlertOptions extends Omit<ConfirmationAlertOptions, "content"> {
content: string | JSX.Element | JSX.Element[] | undefined;
body: string | undefined;
children: JSX.Element | JSX.Element[];
content?: ConfirmationAlertOptions["content"];
body?: ConfirmationAlertOptions["content"];
};
export function showConfirmationAlert(options: ConfirmationAlertOptions) {
const internalOptions = options as InternalConfirmationAlertOptions;
if (typeof options.content === "string") {
internalOptions.body = options.content;
} else {
internalOptions.children = options.content;
};
internalOptions.body = options.content;
delete internalOptions.content;
internalOptions.isDismissable ??= true;
return Alerts.show(internalOptions);
};

4
src/ui/quickInstall/forumPost.tsx
View file

@ -1,5 +1,5 @@
import { findByName, findByProps } from "@metro/filters";
import { DISCORD_SERVER_ID, PLUGINS_CHANNEL_ID, THEMES_CHANNEL_ID, HTTP_REGEX_MULTI, PROXY_PREFIX } from "@lib/constants";
import { findByName, findByProps } from "@metro/filters";
import { after } from "@lib/patcher";
import { installPlugin } from "@lib/plugins";
import { installTheme } from "@lib/themes";
@ -20,7 +20,7 @@ export default () => after("default", ForumPostLongPressActionSheet, ([{ thread
if (thread.guild_id !== DISCORD_SERVER_ID) return;
// Determine what type of addon this is.
let postType: string;
let postType: "Plugin" | "Theme";
if (thread.parent_id === PLUGINS_CHANNEL_ID) {
postType = "Plugin";
} else if (thread.parent_id === THEMES_CHANNEL_ID && window.__vendetta_loader?.features.themes) {

31
src/ui/quickInstall/url.ts
View file

@ -1,31 +0,0 @@
import { findByProps } from "@metro/filters";
import { PROXY_PREFIX } from "@lib/constants";
import { after } from "@lib/patcher";
import { installPlugin } from "@lib/plugins";
import { installTheme } from "@lib/themes";
import { getAssetIDByName } from "@ui/assets";
import { showToast } from "@ui/toasts";
const showSimpleActionSheet = findByProps("showSimpleActionSheet");
export default () => after("showSimpleActionSheet", showSimpleActionSheet, (args) => {
if (args[0].key !== "LongPressUrl") return;
const { header: { title: url }, options } = args[0];
let urlType: string;
if (url.startsWith(PROXY_PREFIX)) {
urlType = "Plugin";
} else if (url.endsWith(".json") && window.__vendetta_loader?.features.themes) {
urlType = "Theme";
} else return;
options.push({
label: `Install ${urlType}`, onPress: () =>
(urlType === "Plugin" ? installPlugin : installTheme)(url).then(() => {
showToast("Successfully installed", getAssetIDByName("Check"));
}).catch((e: Error) => {
showToast(e.message, getAssetIDByName("Small"));
}),
});
});

73
src/ui/quickInstall/url.tsx Normal file
View file

@ -0,0 +1,73 @@
import { PROXY_PREFIX, THEMES_CHANNEL_ID } from "@lib/constants";
import { findByProps } from "@metro/filters";
import { ReactNative as RN, channels, url } from "@metro/common";
import { after, instead } from "@lib/patcher";
import { installPlugin } from "@lib/plugins";
import { installTheme } from "@lib/themes";
import { getAssetIDByName } from "@ui/assets";
import { showToast } from "@ui/toasts";
import { showConfirmationAlert } from "../alerts";
const showSimpleActionSheet = findByProps("showSimpleActionSheet");
const handleClick = findByProps("handleClick");
const { openURL } = url;
const { getChannelId } = channels;
const { getChannel } = findByProps("getChannel");
const { TextStyleSheet } = findByProps("TextStyleSheet");
function typeFromUrl(url: string) {
if (url.startsWith(PROXY_PREFIX)) {
return "Plugin";
} else if (url.endsWith(".json") && window.__vendetta_loader?.features.themes) {
return "Theme";
} else return;
}
function installWithToast(type: "Plugin" | "Theme", url: string) {
(type === "Plugin" ? installPlugin : installTheme)(url).then(() => {
showToast("Successfully installed", getAssetIDByName("Check"));
}).catch((e: Error) => {
showToast(e.message, getAssetIDByName("Small"));
});
}
export default () => {
const patches = new Array<Function>;
patches.push(after("showSimpleActionSheet", showSimpleActionSheet, (args) => {
if (args[0].key !== "LongPressUrl") return;
const { header: { title: url }, options } = args[0];
const urlType = typeFromUrl(url);
if (!urlType) return;
options.push({
label: `Install ${urlType}`,
onPress: () => installWithToast(urlType, url),
});
}));
patches.push(instead("handleClick", handleClick, async function (this: any, args, orig) {
const { href: url } = args[0];
const urlType = typeFromUrl(url);
if (!urlType) return orig.apply(this, args);
// Make clicking on theme links only work in #themes, should there be a theme proxy in the future, this can be removed.
if (urlType === "Theme" && getChannel(getChannelId())?.parent_id !== THEMES_CHANNEL_ID)
return orig.apply(this, args);
showConfirmationAlert({
title: "Hold Up",
content: [`This link is a `, <RN.Text style={TextStyleSheet["text-md/semibold"]}>{urlType}</RN.Text>, `, would you like to install it?`],
onConfirm: () => installWithToast(urlType, url),
confirmText: "Install",
cancelText: "Cancel",
secondaryConfirmText: "Open in Browser",
onConfirmSecondary: () => openURL(url),
});
}));
return () => patches.forEach((p) => p());
};