ContextMenuApi.openContextMenu(e, () => (null);
const [nextLyric, setNextLyric] = useState(null);
@@ -57,7 +57,7 @@ export function useLyrics({ scroll = true }: { scroll?: boolean; } = {}) {
useEffect(() => {
if (currentLyrics && position) {
- const [currentIndex, nextLyric] = calculateIndexes(currentLyrics, position, LyricDelay);
+ const [currentIndex, nextLyric] = calculateIndexes(currentLyrics, position, lyricDelay);
setCurrLrcIndex(currentIndex);
setNextLyric(nextLyric);
}
diff --git a/src/equicordplugins/musicControls/tidal/lyrics/providers/store.ts b/src/equicordplugins/musicControls/tidal/lyrics/providers/store.ts
index 81bb2bb12..a51293445 100644
--- a/src/equicordplugins/musicControls/tidal/lyrics/providers/store.ts
+++ b/src/equicordplugins/musicControls/tidal/lyrics/providers/store.ts
@@ -13,7 +13,7 @@ import { proxyLazyWebpack } from "@webpack";
import { Flux, FluxDispatcher } from "@webpack/common";
function showNotif(title: string, body: string) {
- if (settings.store.ShowFailedToasts) {
+ if (settings.store.showFailedToasts) {
showNotification({
color: "#ee2902",
title,
diff --git a/src/equicordplugins/musicControls/youtubeMusic/PlayerComponent.tsx b/src/equicordplugins/musicControls/youtubeMusic/PlayerComponent.tsx
deleted file mode 100644
index e0a71e61f..000000000
--- a/src/equicordplugins/musicControls/youtubeMusic/PlayerComponent.tsx
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see ) {
- return (
-
- );
-}
-
-function CopyContextMenu({ name, path }: { name: string; path: string; }) {
- const copyId = `ytm-copy-${name}`;
- const openId = `ytm-open-${name}`;
-
- return (
- FluxDispatcher.dispatch({ type: "CONTEXT_MENU_CLOSE" })}
- aria-label={`YouTube Music ${name} Menu`}
- >
- copyWithToast(`https://music.youtube.com${path}`)}
- icon={LinkIcon}
- />
- YoutubeMusicStore.openExternal(path)}
- icon={OpenExternalIcon}
- />
-
- );
-}
-
-function makeContextMenu(name: string, path: string) {
- return (e: React.MouseEvent) =>
- ContextMenuApi.openContextMenu(e, () =>
-
-
-
-
-
-
- );
-}
-
-const seek = debounce((v: number) => {
- YoutubeMusicStore.seek(v);
-});
-
-function YtmSeekBar() {
- const { songDuration } = YoutubeMusicStore.song!;
-
- const [storePosition, isSettingPosition, isPlaying] = useStateFromStores(
- [YoutubeMusicStore],
- () => [YoutubeMusicStore.mPosition, YoutubeMusicStore.isSettingPosition, YoutubeMusicStore.isPlaying]
- );
-
- const [position, setPosition] = useState(storePosition);
-
- useEffect(() => {
- setPosition(YoutubeMusicStore.position);
- }, [storePosition]);
-
- const onChange = (v: number) => {
- if (isSettingPosition) return;
- setPosition(v);
- seek(v);
- };
-
- return (
- FluxDispatcher.dispatch({ type: "CONTEXT_MENU_CLOSE" })}
- aria-label="YouTube Music Album Menu"
- >
- {/* YoutubeMusicStore.openExternal(`/album/${track?.album}`)}
- icon={OpenExternalIcon}
- /> */}
- track?.imageSrc && openImageModal({ url: track.imageSrc })}
- icon={ImageIcon}
- />
- (
- YoutubeMusicStore.setVolume(v))}
- />
- )}
- />
- YoutubeMusicStore.toggleMute()}
- />
-
- );
-}
-
-function makeLinkProps(name: string, condition: unknown, path: string) {
- if (!condition) return {};
-
- return {
- role: "link",
- onClick: () => YoutubeMusicStore.openExternal(path),
- onContextMenu: makeContextMenu(name, path)
- } satisfies React.HTMLAttributes;
-}
-
-function Info({ track }: { track: NonNullable; }) {
- const img = track?.imageSrc;
-
- const [coverExpanded, setCoverExpanded] = useState(false);
-
- const i = (
- <>
- {img && (
- 
setCoverExpanded(!coverExpanded)}
- onContextMenu={e => {
- ContextMenuApi.openContextMenu(e, () => >;
-
-class YoutubeMusicSocket {
- public onChange: (e: PlayerState) => void;
- private ready = false;
- private connecting = false;
-
- private socket: WebSocket | undefined;
-
- constructor(onChange: typeof this.onChange) {
- this.reconnect();
- this.onChange = onChange;
- }
-
- public scheduleReconnect(ms: number) {
- setTimeout(() => this.reconnect(), ms);
- }
-
- public reconnect() {
- if (this.ready || this.connecting) return;
- this.connecting = true;
- this.initWs();
- }
-
- private async initWs() {
- const url = Settings.plugins.MusicControls.YoutubeMusicApiUrl;
- if (!url) {
- this.connecting = false;
- return;
- }
-
- try {
- this.socket = new WebSocket(new URL("/api/v1/ws", url));
- } catch (e) {
- logger.error("Connection failed");
- return;
- }
-
- this.socket.addEventListener("open", () => {
- this.ready = true;
- this.connecting = false;
- });
-
- this.socket.addEventListener("error", e => {
- this.ready = false;
- this.connecting = false;
- if (!this.ready) this.scheduleReconnect(5_000);
- this.onChange({ position: 0, isPlaying: false, song: undefined });
-
- });
-
- this.socket.addEventListener("close", e => {
- this.ready = false;
- this.connecting = false;
- if (!this.ready) this.scheduleReconnect(10_000);
- this.onChange({ position: 0, isPlaying: false, song: undefined });
- });
-
- this.socket.addEventListener("message", e => {
- let message: Message;
- try {
- message = JSON.parse(e.data) as Message;
- this.onChange(message);
- } catch (err) {
- logger.error("Invalid JSON:", err, `\n${e.data}`);
- return;
- }
- });
- }
-}
-
-export const YoutubeMusicStore = proxyLazyWebpack(() => {
- const { Store } = Flux;
-
- class YoutubeMusicStore extends Store {
- public mPosition = 0;
- public start = 0;
-
- public song: Song | null = null;
- public isPlaying = false;
- public isShuffled = false;
- public repeat: Repeat = "NONE";
- public volume = 0;
- public muted = false;
-
- public isSettingPosition = false;
-
- public socket = new YoutubeMusicSocket((message: PlayerState) => {
- if (message.song) {
- store.song = message.song;
- store.isPlaying = !(message.song?.isPaused ?? false);
- }
- if (message.isPlaying != null && !message.song) store.isPlaying = message.isPlaying;
- if (message.shuffle != null) store.isShuffled = message.shuffle;
- if (message.position && message.position !== store.position) store.position = message.position ?? 0;
- if (message.volume) store.volume = message.volume ?? 0;
- if (message.repeat) store.repeat = message.repeat;
- if (message.muted != null) store.muted = message.muted;
-
- store.isSettingPosition = false;
- store.emitChange();
- });
-
- public openExternal(path: string) {
- const videoId = path.match(/watch\?v=([\w-]+)/);
-
- const url = isPluginEnabled("OpenInApp") && videoId
- ? encodeURI("youtubemusic://openVideo " + videoId[1])
- : "https://music.youtube.com" + path;
-
- logger.info("Open", url);
-
- // https://music.youtube.com/watch?v=BSHYPb15W-Y
- VencordNative.native.openExternal(url);
- }
-
- set position(p: number) {
- this.mPosition = p * 1000;
- this.start = Date.now();
- }
-
- get position(): number {
- let pos = this.mPosition;
- if (this.isPlaying) {
- pos += Date.now() - this.start;
- }
- return pos;
- }
-
- prev() {
- this.req("post", "/api/v1/previous");
- }
- next() {
- this.req("post", "/api/v1/next");
- }
- setVolume(percent: number) {
- this.req("post", "/api/v1/volume", {
- body: {
- volume: Math.floor(percent)
- },
- });
- }
- setPlaying(playing: boolean) {
- if (playing) {
- this.req("post", "/api/v1/play");
- } else {
- this.req("post", "/api/v1/pause");
- }
- }
- switchRepeat() {
- this.req("post", "/api/v1/switch-repeat", {
- body: {
- iteration: 1
- }
- });
- }
- shuffle() {
- this.req("post", "/api/v1/shuffle");
- }
- seek(ms: number) {
- this.req("post", "/api/v1/seek-to", {
- body: {
- seconds: Math.floor(ms / 1000)
- }
- });
- }
- toggleMute() {
- this.req("post", "/api/v1/toggle-mute");
- }
-
- public req(method: "post" | "get" | "put", route: string, data: any = {}) {
- const apiServerUrl = Settings.plugins.MusicControls.YoutubeMusicApiUrl;
- if (apiServerUrl === "") return;
- const url = apiServerUrl + route;
-
- fetch(url, {
- method,
- ...data,
- ...(data.body && { body: JSON.stringify(data.body), headers: { "Content-Type": "application/json" } })
- });
- }
- }
-
- const store = new YoutubeMusicStore(FluxDispatcher);
-
- return store;
-});
diff --git a/src/equicordplugins/musicControls/youtubeMusic/ytmStyles.css b/src/equicordplugins/musicControls/youtubeMusic/ytmStyles.css
deleted file mode 100644
index 793225120..000000000
--- a/src/equicordplugins/musicControls/youtubeMusic/ytmStyles.css
+++ /dev/null
@@ -1,208 +0,0 @@
-#vc-ytm-player {
- padding: 12px;
- background: var(--background-base-low);
- margin: 0;
- border-top-left-radius: 10px;
- border-top-right-radius: 10px;
-
- --vc-ytm-slider-gradient: linear-gradient(to right, #f03 80%, #ff2791 100%);
- --vc-ytm-slider-grabber: #f03;
-
- /* so custom themes can easily change it */
- --vc-ytm-red-90: color-mix(in hsl, var(--vc-ytm-slider-grabber), transparent 90%);
- --vc-ytm-red-80: color-mix(in hsl, var(--vc-ytm-slider-grabber), transparent 80%);
-}
-
-.vc-ytm-song-info-prefix {
- display: none;
-}
-
-.vc-ytm-artist,
-.vc-ytm-album {
- color: var(--text-strong);
-}
-
-.vc-ytm-secondary-song-info {
- font-size: 12px;
-}
-
-#vc-ytm-progress-bar {
- position: relative;
- color: var(--text-default);
- width: 100%;
- margin: 0.5em 0;
- margin-bottom: 5px;
-}
-
-#vc-ytm-progress-bar > [class*="slider"] {
- flex-grow: 1;
- width: 100%;
- padding: 0 !important;
-}
-
-#vc-ytm-progress-bar > [class*="slider"] [class*="bar"] {
- height: 3px !important;
- top: calc(12px - 4px / 2 + var(--bar-offset));
-}
-
-#vc-ytm-progress-bar > [class*="slider"] [class*="barFill"] {
- background-image: var(--vc-ytm-slider-gradient);
-}
-
-#vc-ytm-progress-bar > [class*="slider"]:hover [class*="barFill"] {
- background-image: var(--vc-ytm-slider-gradient);
-}
-
-#vc-ytm-progress-bar > [class*="slider"] [class*="grabber"] {
- background-color: var(--vc-ytm-slider-grabber);
- width: 12px !important;
- height: 12px !important;
- margin-top: calc(13px/-2 + var(--bar-offset)/2);
- margin-left: -0.5px;
- border: unset;
- color: var(--interactive-icon-default);
- opacity: 0;
- transition: opacity 0.1s;
-}
-
-#vc-ytm-progress-bar:hover > [class*="slider"] [class*="grabber"] {
- opacity: 1;
-}
-
-.vc-ytm-progress-time {
- margin-top: 8px;
- font-family: var(--font-code);
- font-size: 12px;
- top: 10px;
- position: absolute;
-}
-
-.vc-ytm-button-row {
- justify-content: center;
- margin-top: 14px;
-}
-
-.vc-ytm-button {
- margin: 0 2px;
- border-radius: var(--radius-sm);
- background: none;
- color: var(--interactive-icon-default);
- padding: 0;
- width: 32px;
- height: 32px;
- display: flex;
- justify-content: center;
- align-items: center;
- position: relative;
-}
-
-.vc-ytm-button:hover {
- color: var(--interactive-icon-hover);
- background-color: var(--background-mod-strong);
-}
-
-.vc-ytm-button svg {
- height: 24px;
- width: 24px;
-}
-
-[class*="shuffle"] > svg,
-[class*="repeat"] > svg {
- width: 22px;
- height: 22px;
-}
-
-.vc-ytm-button svg path {
- width: 100%;
- height: 100%;
-}
-
-
-.vc-ytm-repeat-context,
-.vc-ytm-repeat-track,
-.vc-ytm-shuffle-on {
- background-color: var(--vc-ytm-red-90);
-}
-
-.vc-ytm-repeat-context:hover,
-.vc-ytm-repeat-track:hover,
-.vc-ytm-shuffle-on:hover {
- background-color: var(--vc-ytm-red-80);
-}
-
-.vc-ytm-repeat-1 {
- font-size: 70%;
- position: absolute;
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
-}
-
-#vc-ytm-info-wrapper {
- display: flex;
- flex-direction: row;
- align-items: center;
- height: 3em;
- gap: 0.5em;
-}
-
-#vc-ytm-info-wrapper img {
- height: 90%;
- object-fit: contain;
-}
-
-#vc-ytm-album-expanded-wrapper img {
- width: 100%;
- object-fit: contain;
-}
-
-#vc-ytm-titles {
- display: flex;
- flex-direction: column;
- padding: 0.2rem;
- align-items: flex-start;
- place-content: flex-start center;
- overflow: hidden;
-}
-
-#vc-ytm-song-title {
- color: var(--text-strong);
- font-size: 14px;
- font-weight: 600;
-}
-
-.vc-ytm-ellipoverflow {
- white-space: nowrap;
- overflow: hidden;
- width: 100%;
- text-overflow: ellipsis;
-}
-
-.vc-ytm-artist[role="link"]:hover,
-#vc-ytm-album-title[role="link"]:hover,
-#vc-ytm-song-title[role="link"]:hover {
- text-decoration: underline;
- cursor: pointer;
-}
-
-#vc-ytm-album-image {
- border-radius: 3px;
- transition: filter 0.2s;
-}
-
-#vc-ytm-album-image:hover {
- filter: brightness(1.2);
- cursor: pointer;
-}
-
-#vc-ytm-progress-text {
- margin: 0;
-}
-
-.vc-ytm-time-left {
- left: 0;
-}
-
-.vc-ytm-time-right {
- right: 0;
-}
\ No newline at end of file
diff --git a/src/equicordplugins/splitLargeMessages/index.ts b/src/equicordplugins/splitLargeMessages/index.ts
index 58609b569..5fef6839e 100644
--- a/src/equicordplugins/splitLargeMessages/index.ts
+++ b/src/equicordplugins/splitLargeMessages/index.ts
@@ -19,7 +19,7 @@ const canSplit: () => boolean = () => {
};
const autoMaxLength = () => {
- const hasNitro = UserStore.getCurrentUser().premiumType === 2;
+ const hasNitro = UserStore.getCurrentUser()?.premiumType === 2;
return hasNitro ? 4000 : 2000;
};
-
- {msToHuman(position)}
-
-
- {msToHuman(songDuration * 1000)}
-
-
- );
-}
-
-function AlbumContextMenu({ track }: { track: Song; }) {
- const [volume, muted] = useStateFromStores([YoutubeMusicStore], () => [YoutubeMusicStore.volume, YoutubeMusicStore.muted]);
-
- return (
-
- {i}
-
- );
-
- return (
-
- {i}
-
- );
-}
-
-export function YtmPlayer() {
- const track = useStateFromStores(
- [YoutubeMusicStore],
- () => YoutubeMusicStore.song,
- null,
- (prev, next) => prev?.videoId ? (prev.videoId === next?.videoId) : prev?.title === next?.title
- );
-
- const isPlaying = useStateFromStores([YoutubeMusicStore], () => YoutubeMusicStore.isPlaying);
- const [shouldHide, setShouldHide] = useState(false);
-
- React.useEffect(() => {
- setShouldHide(false);
- if (!isPlaying) {
- const timeout = setTimeout(() => setShouldHide(true), 1000 * 60 * 5);
- return () => clearTimeout(timeout);
- }
- }, [isPlaying]);
-
- if (!track || shouldHide) return;
-
- const exportTrackImageStyle = {
- "--vc-ytm-track-image": `url(${track?.imageSrc || ""})`,
- } as React.CSSProperties;
-
- return (
-
-
- {track?.title}
-
- {track.artist && (
-
- by
-
- {track.artist}
-
-
- )}
- {track.album && (
-
- on
-
- {track.album}
-
-
- )}
-
-
-
- );
-}
diff --git a/src/equicordplugins/musicControls/youtubeMusic/YtmStore.ts b/src/equicordplugins/musicControls/youtubeMusic/YtmStore.ts
deleted file mode 100644
index 22256b63c..000000000
--- a/src/equicordplugins/musicControls/youtubeMusic/YtmStore.ts
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { isPluginEnabled } from "@api/PluginManager";
-import { Logger } from "@utils/Logger";
-import { proxyLazyWebpack } from "@webpack";
-import { Flux, FluxDispatcher } from "@webpack/common";
-import { Settings } from "Vencord";
-
-enum MediaType {
- /**
- * Audio uploaded by the original artist
- */
- Audio = "AUDIO",
- /**
- * Official music video uploaded by the original artist
- */
- OriginalMusicVideo = "ORIGINAL_MUSIC_VIDEO",
- /**
- * Normal YouTube video uploaded by a user
- */
- UserGeneratedContent = "USER_GENERATED_CONTENT",
- /**
- * Podcast episode
- */
- PodcastEpisode = "PODCAST_EPISODE",
- OtherVideo = "OTHER_VIDEO",
-}
-
-export type RepeatMode = "NONE" | "ONE" | "ALL";
-
-export interface Song {
- title: string;
- artist: string;
- views: number;
- uploadDate?: string;
- imageSrc?: string | null;
- isPaused?: boolean;
- songDuration: number;
- elapsedSeconds?: number;
- url?: string;
- album?: string | null;
- videoId: string;
- playlistId?: string;
- mediaType: MediaType;
-}
-
-enum DataTypes {
- PlayerInfo = "PLAYER_INFO",
- VideoChanged = "VIDEO_CHANGED",
- PlayerStateChanged = "PLAYER_STATE_CHANGED",
- PositionChanged = "POSITION_CHANGED",
- VolumeChanged = "VOLUME_CHANGED",
- RepeatChanged = "REPEAT_CHANGED",
- ShuffleChanged = "SHUFFLE_CHANGED",
-}
-
-type PlayerInfo = {
- type: DataTypes.PlayerInfo;
- song: Song | undefined;
- volume: number,
- muted: boolean;
- repeat: RepeatMode;
- position: number;
- isPlaying: boolean;
- shuffle: boolean;
-};
-
-type VideoChanged = {
- type: DataTypes.VideoChanged;
- song: Song;
- position: number;
-};
-
-type PlayerStateChanged = {
- type: DataTypes.PlayerStateChanged;
- isPlaying: boolean,
- position: number;
-};
-
-type PositionChanged = {
- type: DataTypes.PositionChanged,
- position: number;
-};
-
-type VolumeChanged = {
- type: DataTypes.VolumeChanged;
- volume: number;
- muted: boolean;
-};
-
-type RepeatChanged = {
- type: DataTypes.RepeatChanged;
- repeat: RepeatMode;
-};
-
-type ShuffleChanged = {
- type: DataTypes.ShuffleChanged;
- shuffle: boolean;
-};
-
-export type Repeat = "NONE" | "ONE" | "ALL";
-
-export const logger = new Logger("MusicControls-Ytm");
-
-type Message = PlayerInfo | VideoChanged | PlayerStateChanged | PositionChanged | VolumeChanged | RepeatChanged | ShuffleChanged;
-
-type PlayerState = Partial