Bump to v1.0.7

package.json

@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.0.6",
+    "version": "1.0.7",
     "description": "The cutest Discord client mod",
     "keywords": [],
     "homepage": "https://github.com/Vendicated/Vencord#readme",

src/plugins/relationshipNotifier.ts

@@ -1,250 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 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 <https://www.gnu.org/licenses/>.
-*/
-
-import { showNotification } from "@api/Notifications";
-import { definePluginSettings } from "@api/settings";
-import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
-import { FluxDispatcher, UserUtils } from "@webpack/common";
-import { User } from "discord-types/general";
-
-enum RelationshipType {
-    NONE = 0,
-    FRIEND = 1,
-    BLOCKED = 2,
-    PENDING_INCOMING = 3,
-    PENDING_OUTGOING = 4,
-    IMPLICIT = 5
-}
-
-interface RelationshipPayload {
-    type: "RELATIONSHIP_ADD" | "RELATIONSHIP_REMOVE" | "RELATIONSHIP_UPDATE";
-    relationship: {
-        id: string;
-        type: RelationshipType;
-        since?: Date;
-        nickname?: string;
-        user?: User;
-    };
-}
-
-const settings = definePluginSettings({
-    friend: {
-        type: OptionType.SELECT,
-        description: "Show a notification when a friend is added or removed",
-        options: [{
-            label: "Friend added and removed",
-            value: "ALL",
-            default: true,
-        }, {
-            label: "Only when added",
-            value: "CREATE",
-        }, {
-            label: "Only when removed",
-            value: "REMOVE",
-        }, {
-            label: "No notifications",
-            value: "NONE",
-        }]
-    },
-    outgoingRequest: {
-        type: OptionType.SELECT,
-        description: "Show a notification when you send or cancel a friend request",
-        options: [{
-            label: "Request sent and cancelled",
-            value: "ALL",
-            default: true,
-        }, {
-            label: "Only when sent",
-            value: "CREATE",
-        }, {
-            label: "Only when cancelled",
-            value: "REMOVE",
-        }, {
-            label: "No notifications",
-            value: "NONE",
-        }]
-    },
-    incomingRequest: {
-        type: OptionType.SELECT,
-        description: "Show a notification when an incoming request is received or cancelled",
-        options: [{
-            label: "Request received and cancelled",
-            value: "ALL",
-            default: true,
-        }, {
-            label: "Only when received",
-            value: "CREATE",
-        }, {
-            label: "Only when cancelled",
-            value: "REMOVE",
-        }, {
-            label: "No notifications",
-            value: "NONE",
-        }]
-    },
-    block: {
-        type: OptionType.SELECT,
-        description: "Show a notification when you block or unblock a user",
-        options: [{
-            label: "Blocking and unblocking",
-            value: "ALL",
-            default: true,
-        }, {
-            label: "Only when blocking",
-            value: "CREATE",
-        }, {
-            label: "Only when unblocking",
-            value: "REMOVE",
-        }, {
-            label: "No notifications",
-            value: "NONE",
-        }]
-    },
-});
-
-export default definePlugin({
-    name: "RelationshipNotifier",
-    authors: [Devs.Megu],
-    description: "Receive notifications for friend requests, removals, blocks, etc.",
-    settings,
-
-    start() {
-        FluxDispatcher.subscribe("RELATIONSHIP_ADD", onRelationshipUpdate);
-        FluxDispatcher.subscribe("RELATIONSHIP_UPDATE", onRelationshipUpdate);
-        FluxDispatcher.subscribe("RELATIONSHIP_REMOVE", onRelationshipRemove);
-    },
-
-    stop() {
-        FluxDispatcher.unsubscribe("RELATIONSHIP_ADD", onRelationshipUpdate);
-        FluxDispatcher.unsubscribe("RELATIONSHIP_UPDATE", onRelationshipUpdate);
-        FluxDispatcher.unsubscribe("RELATIONSHIP_REMOVE", onRelationshipRemove);
-    }
-});
-
-async function onRelationshipUpdate({ relationship }: RelationshipPayload) {
-    if (!relationship.id) return;
-    const user = await UserUtils.fetchUser(relationship.id);
-    if (!user) return;
-
-    function onClick() {
-        FluxDispatcher.dispatch({
-            type: "USER_PROFILE_MODAL_OPEN",
-            userId: user.id
-        });
-    }
-
-    switch (relationship.type) {
-        case RelationshipType.FRIEND: {
-            if (!["ALL", "CREATE"].includes(settings.store.friend)) break;
-            showNotification({
-                title: "Friend Added",
-                body: `${user.username} is now your friend.`,
-                icon: user.getAvatarURL(),
-                onClick,
-            });
-            break;
-        }
-        case RelationshipType.PENDING_INCOMING: {
-            if (!["ALL", "CREATE"].includes(settings.store.incomingRequest)) break;
-            showNotification({
-                title: "Friend Request Received",
-                body: `${user.username} sent you a friend request.`,
-                icon: user.getAvatarURL(),
-                onClick,
-            });
-            break;
-        }
-        case RelationshipType.PENDING_OUTGOING: {
-            if (!["ALL", "CREATE"].includes(settings.store.outgoingRequest)) break;
-            showNotification({
-                title: "Friend Request Sent",
-                body: `You sent a friend request to ${user.username}`,
-                icon: user.getAvatarURL(),
-                onClick
-            });
-            break;
-        }
-        case RelationshipType.BLOCKED: {
-            if (!["ALL", "CREATE"].includes(settings.store.block)) break;
-            showNotification({
-                title: "User Blocked",
-                body: `You just blocked ${user.username}`,
-                icon: user.getAvatarURL(),
-                onClick
-            });
-            break;
-        }
-    }
-}
-
-async function onRelationshipRemove({ relationship }: RelationshipPayload) {
-    if (!relationship.id) return;
-    const user = await UserUtils.fetchUser(relationship.id);
-    if (!user) return;
-
-    function onClick() {
-        FluxDispatcher.dispatch({
-            type: "USER_PROFILE_MODAL_OPEN",
-            userId: user.id
-        });
-    }
-
-    switch (relationship.type) {
-        case RelationshipType.FRIEND: {
-            if (!["ALL", "REMOVE"].includes(settings.store.friend)) break;
-            showNotification({
-                title: "Friend Removed",
-                body: `${user.username} is no longer on your friends list.`,
-                icon: user.getAvatarURL(),
-                onClick,
-            });
-            break;
-        }
-        case RelationshipType.PENDING_INCOMING: {
-            if (!["ALL", "REMOVE"].includes(settings.store.incomingRequest)) break;
-            showNotification({
-                title: "Friend Request Cancelled",
-                body: `${user.username} cancelled their friend request.`,
-                icon: user.getAvatarURL(),
-                onClick,
-            });
-            break;
-        }
-        case RelationshipType.PENDING_OUTGOING: {
-            if (!["ALL", "REMOVE"].includes(settings.store.outgoingRequest)) break;
-            showNotification({
-                title: "Friend Request Cancelled",
-                body: `You cancelled your friend request to ${user.username}`,
-                icon: user.getAvatarURL(),
-                onClick
-            });
-            break;
-        }
-        case RelationshipType.BLOCKED: {
-            if (!["ALL", "REMOVE"].includes(settings.store.block)) break;
-            showNotification({
-                title: "User Unblocked",
-                body: `You just unblocked ${user.username}`,
-                icon: user.getAvatarURL(),
-                onClick
-            });
-            break;
-        }
-    }
-}

src/webpack/common/components.ts

@@ -32,7 +32,7 @@ export const Forms = {
     FormText: waitForComponent<t.FormText>("FormText", m => m.Types?.INPUT_PLACEHOLDER),
 };
 
-export const Card = waitForComponent<t.Card>("Card", m => m.Types?.PRIMARY === "cardPrimary");
+export const Card = waitForComponent<t.Card>("Card", m => m.Types?.PRIMARY && m.defaultProps);
 export const Button = waitForComponent<t.Button>("Button", ["Hovers", "Looks", "Sizes"]);
 export const Switch = waitForComponent<t.Switch>("Switch", filters.byCode("tooltipNote", "ringTarget"));
 export const Tooltip = waitForComponent<t.Tooltip>("Tooltip", ["Positions", "Colors"]);