diff --git a/src/plugins/experiments/index.tsx b/src/plugins/experiments/index.tsx
index 50b9521f..626e06a9 100644
--- a/src/plugins/experiments/index.tsx
+++ b/src/plugins/experiments/index.tsx
@@ -16,31 +16,19 @@
* along with this program. If not, see .
*/
-import { definePluginSettings } from "@api/Settings";
import ErrorBoundary from "@components/ErrorBoundary";
import { ErrorCard } from "@components/ErrorCard";
import { Devs } from "@utils/constants";
-import { Logger } from "@utils/Logger";
import { Margins } from "@utils/margins";
-import definePlugin, { OptionType } from "@utils/types";
+import definePlugin from "@utils/types";
import { findByPropsLazy } from "@webpack";
-import { Forms, React, UserStore } from "@webpack/common";
-import { User } from "discord-types/general";
+import { Forms, React } from "@webpack/common";
const KbdStyles = findByPropsLazy("key", "removeBuildOverride");
-const settings = definePluginSettings({
- enableIsStaff: {
- description: "Enable isStaff",
- type: OptionType.BOOLEAN,
- default: false,
- restartNeeded: true
- }
-});
-
export default definePlugin({
name: "Experiments",
- description: "Enable Access to Experiments in Discord!",
+ description: "Enable Access to Experiments & other dev-only features in Discord!",
authors: [
Devs.Megu,
Devs.Ven,
@@ -48,7 +36,6 @@ export default definePlugin({
Devs.BanTheNons,
Devs.Nuckyz
],
- settings,
patches: [
{
@@ -65,20 +52,6 @@ export default definePlugin({
replace: "$1=!0;"
}
},
- {
- find: '"isStaff",',
- predicate: () => settings.store.enableIsStaff,
- replacement: [
- {
- match: /(?<=>)(\i)\.hasFlag\((\i\.\i)\.STAFF\)(?=})/,
- replace: (_, user, flags) => `$self.isStaff(${user},${flags})`
- },
- {
- match: /hasFreePremium\(\){return this.isStaff\(\)\s*?\|\|/,
- replace: "hasFreePremium(){return ",
- }
- ]
- },
{
find: 'H1,title:"Experiments"',
replacement: {
@@ -88,15 +61,6 @@ export default definePlugin({
}
],
- isStaff(user: User, flags: any) {
- try {
- return UserStore.getCurrentUser()?.id === user.id || user.hasFlag(flags.STAFF);
- } catch (err) {
- new Logger("Experiments").error(err);
- return user.hasFlag(flags.STAFF);
- }
- },
-
settingsAboutComponent: () => {
const isMacOS = navigator.platform.includes("Mac");
const modKey = isMacOS ? "cmd" : "ctrl";
@@ -105,14 +69,10 @@ export default definePlugin({
More Information
- You can enable client DevTools{" "}
+ You can open Discord's DevTools via {" "}
{modKey} +{" "}
{altKey} +{" "}
O{" "}
- after enabling isStaff below
-
-
- and then toggling Enable DevTools in the Developer Options tab in settings.
);
@@ -128,6 +88,12 @@ export default definePlugin({
Only use experiments if you know what you're doing. Vencord is not responsible for any damage caused by enabling experiments.
+
+ If you don't know what an experiment does, ignore it. Do not ask us what experiments do either, we probably don't know.
+
+
+
+ No, you cannot use server-side features like checking the "Send to Client" box.
), { noop: true })
diff --git a/src/plugins/serverProfile/GuildProfileModal.tsx b/src/plugins/serverInfo/GuildInfoModal.tsx
similarity index 98%
rename from src/plugins/serverProfile/GuildProfileModal.tsx
rename to src/plugins/serverInfo/GuildInfoModal.tsx
index 8e6f6051..bed520b6 100644
--- a/src/plugins/serverProfile/GuildProfileModal.tsx
+++ b/src/plugins/serverInfo/GuildInfoModal.tsx
@@ -20,10 +20,10 @@ const FriendRow = findExportedComponentLazy("FriendRow");
const cl = classNameFactory("vc-gp-");
-export function openGuildProfileModal(guild: Guild) {
+export function openGuildInfoModal(guild: Guild) {
openModal(props =>
-
+
);
}
@@ -53,7 +53,7 @@ function renderTimestamp(timestamp: number) {
);
}
-function GuildProfileModal({ guild }: GuildProps) {
+function GuildInfoModal({ guild }: GuildProps) {
const [friendCount, setFriendCount] = useState();
const [blockedCount, setBlockedCount] = useState();
diff --git a/src/plugins/serverInfo/README.md b/src/plugins/serverInfo/README.md
new file mode 100644
index 00000000..98c9013e
--- /dev/null
+++ b/src/plugins/serverInfo/README.md
@@ -0,0 +1,7 @@
+# ServerInfo
+
+Allows you to view info about servers and see friends and blocked users
+
+
+
+
diff --git a/src/plugins/serverProfile/index.tsx b/src/plugins/serverInfo/index.tsx
similarity index 65%
rename from src/plugins/serverProfile/index.tsx
rename to src/plugins/serverInfo/index.tsx
index 9d495c9d..be3172f0 100644
--- a/src/plugins/serverProfile/index.tsx
+++ b/src/plugins/serverInfo/index.tsx
@@ -5,30 +5,32 @@
*/
import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu";
+import { migratePluginSettings } from "@api/Settings";
import { Devs } from "@utils/constants";
import definePlugin from "@utils/types";
import { Menu } from "@webpack/common";
import { Guild } from "discord-types/general";
-import { openGuildProfileModal } from "./GuildProfileModal";
+import { openGuildInfoModal } from "./GuildInfoModal";
const Patch: NavContextMenuPatchCallback = (children, { guild }: { guild: Guild; }) => {
const group = findGroupChildrenByChildId("privacy", children);
group?.push(
openGuildProfileModal(guild)}
+ action={() => openGuildInfoModal(guild)}
/>
);
};
+migratePluginSettings("ServerInfo", "ServerProfile"); // what was I thinking with this name lmao
export default definePlugin({
- name: "ServerProfile",
- description: "Allows you to view info about a server by right clicking it in the server list",
+ name: "ServerInfo",
+ description: "Allows you to view info about a server",
authors: [Devs.Ven, Devs.Nuckyz],
- tags: ["guild", "info"],
+ tags: ["guild", "info", "ServerProfile"],
contextMenus: {
"guild-context": Patch,
"guild-header-popout": Patch
diff --git a/src/plugins/serverProfile/styles.css b/src/plugins/serverInfo/styles.css
similarity index 100%
rename from src/plugins/serverProfile/styles.css
rename to src/plugins/serverInfo/styles.css
diff --git a/src/plugins/serverProfile/README.md b/src/plugins/serverProfile/README.md
deleted file mode 100644
index 9da70e74..00000000
--- a/src/plugins/serverProfile/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# ServerProfile
-
-Allows you to view info about servers and see friends and blocked users
-
-
-
-