{
if (!isRenaming) {
onLoad(actualIndex);
- showToast(`Profile "${preset.name}" loaded successfully`, Toasts.Type.SUCCESS);
}
}}
onKeyDown={e => {
if (!isRenaming && (e.key === "Enter" || e.key === " ")) {
e.preventDefault();
onLoad(actualIndex);
- showToast(`Profile "${preset.name}" loaded successfully`, Toasts.Type.SUCCESS);
}
}}
- className={classes(cl("row"), !isRenaming && selectedPreset === actualIndex ? "selected" : "")}
+ className={classes(cl("row"), isSelected ? "selected" : "")}
>
{preset.avatarDataUrl && (
@@ -79,18 +98,12 @@ export function PresetList({ presets, allPresets, avatarSize, selectedPreset, on
value={renameText}
onChange={setRenameText}
onBlur={() => {
- if (renameText.trim()) {
- renamePreset(actualIndex, renameText);
- onUpdate();
- }
+ commitRename();
setRenaming(-1);
}}
onKeyDown={e => {
if (e.key === "Enter") {
- if (renameText.trim()) {
- renamePreset(actualIndex, renameText);
- onUpdate();
- }
+ commitRename();
setRenaming(-1);
} else if (e.key === "Escape") {
setRenaming(-1);
@@ -135,13 +148,12 @@ export function PresetList({ presets, allPresets, avatarSize, selectedPreset, on
id="update"
label="Update"
action={async () => {
- const profile = await getCurrentProfile(guildId);
+ const profile = await getCurrentProfile(guildId, { isGuildProfile });
Object.entries(profile).forEach(([key, value]) => {
if (value !== null && value !== undefined) {
- updatePresetField(actualIndex, key as any, value);
+ updatePresetField(actualIndex, key as any, value, section, guildId);
}
});
- showToast("Profile updated successfully", Toasts.Type.SUCCESS);
onUpdate();
}}
/>
@@ -151,7 +163,7 @@ export function PresetList({ presets, allPresets, avatarSize, selectedPreset, on
id="move-up"
label="Move Up"
action={() => {
- movePreset(actualIndex, actualIndex - 1);
+ movePreset(actualIndex, actualIndex - 1, section, guildId);
onUpdate();
}}
/>
@@ -161,7 +173,7 @@ export function PresetList({ presets, allPresets, avatarSize, selectedPreset, on
id="move-down"
label="Move Down"
action={() => {
- movePreset(actualIndex, actualIndex + 1);
+ movePreset(actualIndex, actualIndex + 1, section, guildId);
onUpdate();
}}
/>
@@ -171,7 +183,7 @@ export function PresetList({ presets, allPresets, avatarSize, selectedPreset, on
id="move-to-page-1"
label="Move to Page 1"
action={() => {
- movePreset(actualIndex, 0);
+ movePreset(actualIndex, 0, section, guildId);
onPageChange(1);
onUpdate();
}}
@@ -183,7 +195,7 @@ export function PresetList({ presets, allPresets, avatarSize, selectedPreset, on
label="Delete"
color="danger"
action={async () => {
- await deletePreset(actualIndex);
+ await deletePreset(actualIndex, section, guildId);
onUpdate();
}}
/>
diff --git a/src/equicordplugins/profileSets/components/presetManager.tsx b/src/equicordplugins/profileSets/components/presetManager.tsx
index 660abc687..1f07da8f5 100644
--- a/src/equicordplugins/profileSets/components/presetManager.tsx
+++ b/src/equicordplugins/profileSets/components/presetManager.tsx
@@ -6,19 +6,25 @@
import { Heading } from "@components/Heading";
import { Button } from "@components/index";
+import { classes } from "@utils/misc";
import { openModal } from "@utils/modal";
-import { React, TextInput } from "@webpack/common";
+import { React, SelectedGuildStore, TextInput, useStateFromStores } from "@webpack/common";
import { cl, settings } from "../index";
-import { exportPresets, importPresets, savePreset } from "../utils/actions";
+import { exportPresets, ImportDecision, importPresets, savePreset } from "../utils/actions";
import { loadPresetAsPending } from "../utils/profile";
-import { presets, setCurrentPresetIndex } from "../utils/storage";
-import { ConfirmModal } from "./confirmModal";
+import { loadPresets, presets, PresetSection, setCurrentPresetIndex } from "../utils/storage";
+import { ImportProfilesModal } from "./confirmModal";
import { PresetList } from "./presetList";
const PRESETS_PER_PAGE = 5;
-export function PresetManager({ guildId }: { guildId?: string; }) {
+type PresetManagerProps = {
+ section?: PresetSection;
+ guildId?: string;
+};
+
+export function PresetManager({ section, guildId }: PresetManagerProps) {
const [presetName, setPresetName] = React.useState("");
const [, forceUpdate] = React.useReducer(x => x + 1, 0);
const [isSaving, setIsSaving] = React.useState(false);
@@ -26,10 +32,34 @@ export function PresetManager({ guildId }: { guildId?: string; }) {
const [pageInput, setPageInput] = React.useState("1");
const [selectedPreset, setSelectedPreset] = React.useState
(-1);
const [searchMode, setSearchMode] = React.useState(false);
+ const lastRandomIndexRef = React.useRef(-1);
+ const resolvedSection: PresetSection = section ?? "main";
+ const isServerSection = resolvedSection === "server";
+ const lastSelectedGuildId = useStateFromStores(
+ [SelectedGuildStore],
+ () => SelectedGuildStore.getLastSelectedGuildId() ?? SelectedGuildStore.getGuildId()
+ );
+ const resolvedGuildId = isServerSection ? (guildId ?? lastSelectedGuildId ?? undefined) : undefined;
+ const canUseGuild = !isServerSection || Boolean(resolvedGuildId);
- const filteredPresets = searchMode
- ? presets.filter(p => p.name.toLowerCase().includes(presetName.toLowerCase()))
- : presets;
+ React.useEffect(() => {
+ let isActive = true;
+ (async () => {
+ await loadPresets(resolvedSection);
+ if (!isActive) return;
+ setSelectedPreset(-1);
+ setCurrentPage(1);
+ setPageInput("1");
+ forceUpdate();
+ })();
+ return () => {
+ isActive = false;
+ };
+ }, [resolvedGuildId, resolvedSection]);
+
+ const filteredPresets = !searchMode
+ ? presets
+ : presets.filter(preset => preset.name.toLowerCase().includes(presetName.toLowerCase()));
const totalPages = Math.ceil(filteredPresets.length / PRESETS_PER_PAGE);
const startIndex = (currentPage - 1) * PRESETS_PER_PAGE;
@@ -43,9 +73,11 @@ export function PresetManager({ guildId }: { guildId?: string; }) {
};
const handleSavePreset = async () => {
- if (!presetName.trim()) return;
+ if (!canUseGuild) return;
+ const trimmedName = presetName.trim();
+ if (!trimmedName) return;
setIsSaving(true);
- await savePreset(presetName.trim(), guildId);
+ await savePreset(trimmedName, resolvedSection, resolvedGuildId);
setPresetName("");
setIsSaving(false);
const newTotalPages = Math.ceil(presets.length / PRESETS_PER_PAGE);
@@ -53,24 +85,53 @@ export function PresetManager({ guildId }: { guildId?: string; }) {
forceUpdate();
};
- const handleLoadPreset = (index: number) => {
+ const applyPreset = (index: number) => {
setSelectedPreset(index);
setCurrentPresetIndex(index);
- loadPresetAsPending(presets[index], guildId);
+ loadPresetAsPending(presets[index], resolvedGuildId, {
+ isGuildProfile: resolvedSection === "server"
+ });
forceUpdate();
};
- const showOverridePrompt = (): Promise => {
+ const handleLoadPreset = (index: number) => {
+ if (!canUseGuild) return;
+ applyPreset(index);
+ };
+
+ const selectRandomPreset = (sectionType: PresetSection) => {
+ const availablePresets = presets;
+ if (!availablePresets.length) return null;
+ const randomIndex = Math.floor(Math.random() * availablePresets.length);
+ return { preset: availablePresets[randomIndex], index: randomIndex, section: sectionType };
+ };
+
+ const handleRandomPreset = () => {
+ if (!canUseGuild) return;
+ const selection = selectRandomPreset(resolvedSection);
+ if (!selection) return;
+ let nextIndex = selection.index;
+ if (presets.length > 1 && nextIndex === lastRandomIndexRef.current) {
+ let attempts = 0;
+ while (attempts < 5 && nextIndex === lastRandomIndexRef.current) {
+ nextIndex = Math.floor(Math.random() * presets.length);
+ attempts++;
+ }
+ }
+ lastRandomIndexRef.current = nextIndex;
+ applyPreset(nextIndex);
+ };
+
+ const showImportPrompt = (existingCount: number): Promise => {
return new Promise(resolve => {
openModal(props => (
- resolve(true)}
- onCancel={() => resolve(false)}
+ title="Import Profiles"
+ message={`You have ${existingCount} existing profiles in this section. Do you want to override them or merge with imported profiles?`}
+ onOverride={() => resolve("override")}
+ onMerge={() => resolve("merge")}
+ onCancel={() => resolve("cancel")}
/>
));
});
@@ -81,7 +142,7 @@ export function PresetManager({ guildId }: { guildId?: string; }) {
const shouldShowPagination = filteredPresets.length > PRESETS_PER_PAGE;
return (
-
+
Saved Profiles
@@ -99,7 +160,7 @@ export function PresetManager({ guildId }: { guildId?: string; }) {
{!searchMode && (
)}
-
-
-
-
-
)}
+
+
+
+
+
+
+
+ {resolvedSection === "server" && (
+
+ )}