feat(PlatformIndicators): Colored mobile indicator option (#536)
Co-authored-by: Ven <vendicated@riseup.net>
This commit is contained in:
parent
6b493bc7d9
commit
0b79387800
@ -23,11 +23,11 @@ import { Settings } from "@api/settings";
|
|||||||
import ErrorBoundary from "@components/ErrorBoundary";
|
import ErrorBoundary from "@components/ErrorBoundary";
|
||||||
import { Devs } from "@utils/constants";
|
import { Devs } from "@utils/constants";
|
||||||
import definePlugin, { OptionType } from "@utils/types";
|
import definePlugin, { OptionType } from "@utils/types";
|
||||||
import { findByCodeLazy, findByPropsLazy } from "@webpack";
|
import { findByCodeLazy, findStoreLazy } from "@webpack";
|
||||||
import { PresenceStore, Tooltip, UserStore } from "@webpack/common";
|
import { PresenceStore, Tooltip, UserStore } from "@webpack/common";
|
||||||
import { User } from "discord-types/general";
|
import { User } from "discord-types/general";
|
||||||
|
|
||||||
const SessionStore = findByPropsLazy("getActiveSession");
|
const SessionsStore = findStoreLazy("SessionsStore");
|
||||||
|
|
||||||
function Icon(path: string, viewBox = "0 0 24 24") {
|
function Icon(path: string, viewBox = "0 0 24 24") {
|
||||||
return ({ color, tooltip }: { color: string; tooltip: string; }) => (
|
return ({ color, tooltip }: { color: string; tooltip: string; }) => (
|
||||||
@ -70,7 +70,7 @@ const PlatformIndicator = ({ user, inline = false, marginLeft = "4px" }: { user:
|
|||||||
if (!user || user.bot) return null;
|
if (!user || user.bot) return null;
|
||||||
|
|
||||||
if (user.id === UserStore.getCurrentUser().id) {
|
if (user.id === UserStore.getCurrentUser().id) {
|
||||||
const sessions = SessionStore.getSessions();
|
const sessions = SessionsStore.getSessions();
|
||||||
if (typeof sessions !== "object") return null;
|
if (typeof sessions !== "object") return null;
|
||||||
const sortedSessions = Object.values(sessions).sort(({ status: a }: any, { status: b }: any) => {
|
const sortedSessions = Object.values(sessions).sort(({ status: a }: any, { status: b }: any) => {
|
||||||
if (a === b) return 0;
|
if (a === b) return 0;
|
||||||
@ -156,7 +156,7 @@ const indicatorLocations = {
|
|||||||
export default definePlugin({
|
export default definePlugin({
|
||||||
name: "PlatformIndicators",
|
name: "PlatformIndicators",
|
||||||
description: "Adds platform indicators (Desktop, Mobile, Web...) to users",
|
description: "Adds platform indicators (Desktop, Mobile, Web...) to users",
|
||||||
authors: [Devs.kemo, Devs.TheSun],
|
authors: [Devs.kemo, Devs.TheSun, Devs.Nuckyz],
|
||||||
dependencies: ["MessageDecorationsAPI", "MemberListDecoratorsAPI"],
|
dependencies: ["MessageDecorationsAPI", "MemberListDecoratorsAPI"],
|
||||||
|
|
||||||
start() {
|
start() {
|
||||||
@ -185,6 +185,55 @@ export default definePlugin({
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
patches: [
|
||||||
|
{
|
||||||
|
find: ".Masks.STATUS_ONLINE_MOBILE",
|
||||||
|
predicate: () => Settings.plugins.PlatformIndicators.colorMobileIndicator,
|
||||||
|
replacement: [
|
||||||
|
{
|
||||||
|
// Return the STATUS_ONLINE_MOBILE mask if the user is on mobile, no matter the status
|
||||||
|
match: /(?<=return \i\.\i\.Masks\.STATUS_TYPING;)(.+?)(\i)\?(\i\.\i\.Masks\.STATUS_ONLINE_MOBILE):/,
|
||||||
|
replace: (_, rest, isMobile, mobileMask) => `if(${isMobile})return ${mobileMask};${rest}`
|
||||||
|
},
|
||||||
|
{
|
||||||
|
// Return the STATUS_ONLINE_MOBILE mask if the user is on mobile, no matter the status
|
||||||
|
match: /(switch\(\i\){case \i\.\i\.ONLINE:return )(\i)\?({.+?}):/,
|
||||||
|
replace: (_, rest, isMobile, component) => `if(${isMobile})return${component};${rest}`
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
find: ".AVATAR_STATUS_MOBILE_16;",
|
||||||
|
predicate: () => Settings.plugins.PlatformIndicators.colorMobileIndicator,
|
||||||
|
replacement: [
|
||||||
|
{
|
||||||
|
// Return the AVATAR_STATUS_MOBILE size mask if the user is on mobile, no matter the status
|
||||||
|
match: /\i===\i\.\i\.ONLINE&&(?=.{0,70}\.AVATAR_STATUS_MOBILE_16;)/,
|
||||||
|
replace: ""
|
||||||
|
},
|
||||||
|
{
|
||||||
|
// Fix sizes for mobile indicators which aren't online
|
||||||
|
match: /(?<=\(\i\.status,)(\i)(?=,(\i),\i\))/,
|
||||||
|
replace: (_, userStatus, isMobile) => `${isMobile}?"online":${userStatus}`
|
||||||
|
},
|
||||||
|
{
|
||||||
|
// Make isMobile true no matter the status
|
||||||
|
match: /(?<=\i&&!\i)&&\i===\i\.\i\.ONLINE/,
|
||||||
|
replace: ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
find: "isMobileOnline=function",
|
||||||
|
predicate: () => Settings.plugins.PlatformIndicators.colorMobileIndicator,
|
||||||
|
replacement: {
|
||||||
|
// Make isMobileOnline return true no matter what is the user status
|
||||||
|
match: /(?<=\i\[\i\.\i\.MOBILE\])===\i\.\i\.ONLINE/,
|
||||||
|
replace: "!= null"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
|
||||||
options: {
|
options: {
|
||||||
...Object.fromEntries(
|
...Object.fromEntries(
|
||||||
Object.entries(indicatorLocations).map(([key, value]) => {
|
Object.entries(indicatorLocations).map(([key, value]) => {
|
||||||
@ -196,6 +245,12 @@ export default definePlugin({
|
|||||||
default: true
|
default: true
|
||||||
}];
|
}];
|
||||||
})
|
})
|
||||||
)
|
),
|
||||||
|
colorMobileIndicator: {
|
||||||
|
type: OptionType.BOOLEAN,
|
||||||
|
description: "Whether to make the mobile indicator match the color of the user status.",
|
||||||
|
default: true,
|
||||||
|
restartNeeded: true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user