mirrors/Equicord
1
1
Fork 0
mirror of https://github.com/Equicord/Equicord.git synced 2025-06-17 10:27:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

typings for defaultless settings (#512)

Browse source 
* typings for defaultless settings

* fix other silly typings

* type guard utils

---------

Co-authored-by: Ven <vendicated@riseup.net>
This commit is contained in:
Justice Almanzar 2023-02-28 00:12:35 -05:00 • committed by GitHub
parent cf56ad985b
commit 5ec517875e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/plugins/customRPC.tsx
View file

@ -19,6 +19,7 @@
import { definePluginSettings } from "@api/settings";
import { Link } from "@components/Link";
import { Devs } from "@utils/constants";
import { isTruthy } from "@utils/guards";
import { useAwaiter } from "@utils/misc";
import definePlugin, { OptionType } from "@utils/types";
import { filters, findByCodeLazy, findByPropsLazy, mapMangledModuleLazy } from "@webpack";
@ -56,11 +57,11 @@ interface ActivityAssets {
}
interface Activity {
state: string;
state?: string;
details?: string;
timestamps?: {
start?: Number;
end?: Number;
start?: number;
end?: number;
};
assets?: ActivityAssets;
buttons?: Array<string>;
@ -70,7 +71,7 @@ interface Activity {
button_urls?: Array<string>;
};
type: ActivityType;
flags: Number;
flags: number;
}
enum ActivityType {
@ -93,13 +94,13 @@ const numOpt = (description: string) => ({
onChange: setRpc
}) as const;
const choice = (label: string, value: any, _default?: Boolean) => ({
const choice = (label: string, value: any, _default?: boolean) => ({
label,
value,
default: _default
}) as const;
const choiceOpt = (description: string, options) => ({
const choiceOpt = <T,>(description: string, options: T) => ({
type: OptionType.SELECT,
description,
onChange: setRpc,
@ -173,13 +174,13 @@ async function createActivity(): Promise<Activity | undefined> {
activity.buttons = [
buttonOneText,
buttonTwoText
].filter(Boolean);
].filter(isTruthy);
activity.metadata = {
button_urls: [
buttonOneURL,
buttonTwoURL
].filter(Boolean)
].filter(isTruthy)
};
}
@ -206,12 +207,10 @@ async function createActivity(): Promise<Activity | undefined> {
delete activity[k];
}
// WHAT DO YOU WANT FROM ME
// eslint-disable-next-line consistent-return
return activity;
}
async function setRpc(disable?: Boolean) {
async function setRpc(disable?: boolean) {
const activity: Activity | undefined = await createActivity();
FluxDispatcher.dispatch({

6
src/plugins/lastfm.tsx
View file

@ -34,7 +34,7 @@ interface Activity {
state: string;
details?: string;
timestamps?: {
start?: Number;
start?: number;
};
assets?: ActivityAssets;
buttons?: Array<string>;
@ -43,8 +43,8 @@ interface Activity {
metadata?: {
button_urls?: Array<string>;
};
type: Number;
flags: Number;
type: number;
flags: number;
}
interface TrackData {