+
{!!getCurrentChannel()?.guild_id && (
+ }
+ lowerBadgeWidth={20}
+ lowerBadgeHeight={20}
+ >
+
+
+
+
+ );
+ }, { noop: true }),
+
+ async checkNewSessions() {
+ const data = await RestAPI.get({
+ url: "/auth/sessions"
+ });
+
+ for (const session of data.body.user_sessions) {
+ if (savedSessionsCache.has(session.id_hash)) continue;
+
+ savedSessionsCache.set(session.id_hash, { name: "", isNew: true });
+ showNotification({
+ title: "BetterSessions",
+ body: `New session:\n${session.client_info.os} · ${session.client_info.platform} · ${session.client_info.location}`,
+ permanent: true,
+ onClick: () => UserSettingsModal.open("Sessions")
+ });
+ }
+
+ saveSessionsToDataStore();
+ },
+
+ flux: {
+ USER_SETTINGS_ACCOUNT_RESET_AND_CLOSE_FORM() {
+ const lastFetchedHashes: string[] = AuthSessionsStore.getSessions().map((session: SessionInfo["session"]) => session.id_hash);
+
+ // Add new sessions to cache
+ lastFetchedHashes.forEach(idHash => {
+ if (!savedSessionsCache.has(idHash)) savedSessionsCache.set(idHash, { name: "", isNew: false });
+ });
+
+ // Delete removed sessions from cache
+ if (lastFetchedHashes.length > 0) {
+ savedSessionsCache.forEach((_, idHash) => {
+ if (!lastFetchedHashes.includes(idHash)) savedSessionsCache.delete(idHash);
+ });
+ }
+
+ // Dismiss the "NEW" badge of all sessions.
+ // Since the only way for a session to be marked as "NEW" is going to the Devices tab,
+ // closing the settings means they've been viewed and are no longer considered new.
+ savedSessionsCache.forEach(data => {
+ data.isNew = false;
+ });
+ saveSessionsToDataStore();
+ }
+ },
+
+ async start() {
+ await fetchNamesFromDataStore();
+
+ this.checkNewSessions();
+ if (settings.store.backgroundCheck) {
+ this.checkInterval = setInterval(this.checkNewSessions, settings.store.checkInterval * 60 * 1000);
+ }
+ },
+
+ stop() {
+ clearInterval(this.checkInterval);
+ }
+});
diff --git a/src/plugins/betterSessions/types.ts b/src/plugins/betterSessions/types.ts
new file mode 100644
index 000000000..9026d5313
--- /dev/null
+++ b/src/plugins/betterSessions/types.ts
@@ -0,0 +1,32 @@
+/*
+ * 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
.
+*/
+
+export interface SessionInfo {
+ session: {
+ id_hash: string;
+ approx_last_used_time: Date;
+ client_info: {
+ os: string;
+ platform: string;
+ location: string;
+ };
+ },
+ current?: boolean;
+}
+
+export type Session = SessionInfo["session"];
diff --git a/src/plugins/betterSessions/utils.ts b/src/plugins/betterSessions/utils.ts
new file mode 100644
index 000000000..3015dc47c
--- /dev/null
+++ b/src/plugins/betterSessions/utils.ts
@@ -0,0 +1,90 @@
+/*
+ * 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
.
+*/
+
+import { DataStore } from "@api/index";
+import { UserStore } from "@webpack/common";
+
+import { ChromeIcon, DiscordIcon, EdgeIcon, FirefoxIcon, IEIcon, MobileIcon, OperaIcon, SafariIcon, UnknownIcon } from "./components/icons";
+import { SessionInfo } from "./types";
+
+const getDataKey = () => `BetterSessions_savedSessions_${UserStore.getCurrentUser().id}`;
+
+export const savedSessionsCache: Map
= new Map();
+
+export function getDefaultName(clientInfo: SessionInfo["session"]["client_info"]) {
+ return `${clientInfo.os} · ${clientInfo.platform}`;
+}
+
+export function saveSessionsToDataStore() {
+ return DataStore.set(getDataKey(), savedSessionsCache);
+}
+
+export async function fetchNamesFromDataStore() {
+ const savedSessions = await DataStore.get>(getDataKey()) || new Map();
+ savedSessions.forEach((data, idHash) => {
+ savedSessionsCache.set(idHash, data);
+ });
+}
+
+export function GetOsColor(os: string) {
+ switch (os) {
+ case "Windows Mobile":
+ case "Windows":
+ return "#55a6ef"; // Light blue
+ case "Linux":
+ return "#cdcd31"; // Yellow
+ case "Android":
+ return "#7bc958"; // Green
+ case "Mac OS X":
+ case "iOS":
+ return ""; // Default to white/black (theme-dependent)
+ default:
+ return "#f3799a"; // Pink
+ }
+}
+
+export function GetPlatformIcon(platform: string) {
+ switch (platform) {
+ case "Discord Android":
+ case "Discord iOS":
+ case "Discord Client":
+ return DiscordIcon;
+ case "Android Chrome":
+ case "Chrome iOS":
+ case "Chrome":
+ return ChromeIcon;
+ case "Edge":
+ return EdgeIcon;
+ case "Firefox":
+ return FirefoxIcon;
+ case "Internet Explorer":
+ return IEIcon;
+ case "Opera Mini":
+ case "Opera":
+ return OperaIcon;
+ case "Mobile Safari":
+ case "Safari":
+ return SafariIcon;
+ case "BlackBerry":
+ case "Facebook Mobile":
+ case "Android Mobile":
+ return MobileIcon;
+ default:
+ return UnknownIcon;
+ }
+}
From 7f0e7dd02bd241f9999da77642189868164b6e54 Mon Sep 17 00:00:00 2001
From: Vendicated
Date: Wed, 24 Apr 2024 05:23:50 +0200
Subject: [PATCH 38/41] fix FakeProfileThemes
---
src/plugins/fakeProfileThemes/index.tsx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/plugins/fakeProfileThemes/index.tsx b/src/plugins/fakeProfileThemes/index.tsx
index c61437269..a1b629d10 100644
--- a/src/plugins/fakeProfileThemes/index.tsx
+++ b/src/plugins/fakeProfileThemes/index.tsx
@@ -92,8 +92,9 @@ export default definePlugin({
match: /(?<=getUserProfile\(\i\){return )(\i\[\i\])/,
replace: "$self.colorDecodeHook($1)"
}
- }, {
- find: ".USER_SETTINGS_PROFILE_THEME_ACCENT",
+ },
+ {
+ find: ".USER_SETTINGS_RESET_PROFILE_THEME",
replacement: {
match: /RESET_PROFILE_THEME}\)(?<=color:(\i),.{0,500}?color:(\i),.{0,500}?)/,
replace: "$&,$self.addCopy3y3Button({primary:$1,accent:$2})"
From d5f70070efed3a6c2f481ffe4abce3c5ad45e57b Mon Sep 17 00:00:00 2001
From: Vendicated
Date: Wed, 24 Apr 2024 05:27:14 +0200
Subject: [PATCH 39/41] fix badges
---
src/plugins/_api/badges.tsx | 2 +-
src/plugins/betterSessions/index.tsx | 4 ++--
src/utils/constants.ts | 8 ++++++++
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/plugins/_api/badges.tsx b/src/plugins/_api/badges.tsx
index 16b244a19..6b1a79cd5 100644
--- a/src/plugins/_api/badges.tsx
+++ b/src/plugins/_api/badges.tsx
@@ -65,7 +65,7 @@ export default definePlugin({
patches: [
/* Patch the badge list component on user profiles */
{
- find: "Messages.PROFILE_USER_BADGES,role:",
+ find: 'id:"premium",',
replacement: [
{
match: /&&(\i)\.push\(\{id:"premium".+?\}\);/,
diff --git a/src/plugins/betterSessions/index.tsx b/src/plugins/betterSessions/index.tsx
index bb79870d2..539508f80 100644
--- a/src/plugins/betterSessions/index.tsx
+++ b/src/plugins/betterSessions/index.tsx
@@ -21,14 +21,14 @@ import { definePluginSettings } from "@api/Settings";
import ErrorBoundary from "@components/ErrorBoundary";
import { Devs } from "@utils/constants";
import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy, findExportedComponentLazy } from "@webpack";
+import { findByPropsLazy, findExportedComponentLazy, findStoreLazy } from "@webpack";
import { React, RestAPI, Tooltip } from "@webpack/common";
import { RenameButton } from "./components/RenameButton";
import { Session, SessionInfo } from "./types";
import { fetchNamesFromDataStore, getDefaultName, GetOsColor, GetPlatformIcon, savedSessionsCache, saveSessionsToDataStore } from "./utils";
-const AuthSessionsStore = findByPropsLazy("getSessions");
+const AuthSessionsStore = findStoreLazy("AuthSessionsStore");
const UserSettingsModal = findByPropsLazy("saveAccountChanges", "open");
const TimestampClasses = findByPropsLazy("timestampTooltip", "blockquoteContainer");
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 3098e29d0..917fabf43 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -437,6 +437,14 @@ export const Devs = /* #__PURE__*/ Object.freeze({
Byron: {
name: "byeoon",
id: 1167275288036655133n
+ },
+ Kaitlyn: {
+ name: "kaitlyn",
+ id: 306158896630988801n
+ },
+ PolisanTheEasyNick: {
+ name: "Oleh Polisan",
+ id: 242305263313485825n
}
} satisfies Record);
From 6a69701b54107cbb696615949ba0594a097bf010 Mon Sep 17 00:00:00 2001
From: My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com>
Date: Tue, 23 Apr 2024 23:30:23 -0400
Subject: [PATCH 40/41] fix ValidUser (#2381)
---
src/plugins/validUser/index.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/validUser/index.tsx b/src/plugins/validUser/index.tsx
index d3decd941..2fce693e8 100644
--- a/src/plugins/validUser/index.tsx
+++ b/src/plugins/validUser/index.tsx
@@ -120,7 +120,7 @@ export default definePlugin({
find: 'className:"mention"',
replacement: {
// mention = { react: function (data, parse, props) { if (data.userId == null) return RoleMention() else return UserMention()
- match: /react(?=\(\i,\i,\i\).{0,50}return null==.{0,70}\?\(0,\i\.jsx\)\((\i\.\i),.+?jsx\)\((\i\.\i),\{className:"mention")/,
+ match: /react(?=\(\i,\i,\i\).{0,100}return null==.{0,70}\?\(0,\i\.jsx\)\((\i\.\i),.+?jsx\)\((\i\.\i),\{className:"mention")/,
// react: (...args) => OurWrapper(RoleMention, UserMention, ...args), originalReact: theirFunc
replace: "react:(...args)=>$self.renderMention($1,$2,...args),originalReact"
}
From d55205c55ad9ffa82fa03837ebb4eae623d28705 Mon Sep 17 00:00:00 2001
From: dolfies
Date: Tue, 23 Apr 2024 23:41:53 -0400
Subject: [PATCH 41/41] feat(plugin): ImplicitRelationships (#947)
Co-authored-by: Angelos Bouklis <53124886+ArjixWasTaken@users.noreply.github.com>
Co-authored-by: V
---
src/plugins/implicitRelationships/README.md | 7 +
src/plugins/implicitRelationships/index.ts | 182 ++++++++++++++++++++
src/plugins/sortFriendRequests/index.tsx | 2 +-
3 files changed, 190 insertions(+), 1 deletion(-)
create mode 100644 src/plugins/implicitRelationships/README.md
create mode 100644 src/plugins/implicitRelationships/index.ts
diff --git a/src/plugins/implicitRelationships/README.md b/src/plugins/implicitRelationships/README.md
new file mode 100644
index 000000000..a76e298f7
--- /dev/null
+++ b/src/plugins/implicitRelationships/README.md
@@ -0,0 +1,7 @@
+# ImplicitRelationships
+
+Shows your implicit relationships in the Friends tab.
+
+Implicit relationships on Discord are people with whom you've frecently interacted and share a mutual server; even though Discord thinks you should be friends with them, you haven't added them as friends.
+
+
diff --git a/src/plugins/implicitRelationships/index.ts b/src/plugins/implicitRelationships/index.ts
new file mode 100644
index 000000000..9ae9fb512
--- /dev/null
+++ b/src/plugins/implicitRelationships/index.ts
@@ -0,0 +1,182 @@
+/*
+ * 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 .
+*/
+
+import { definePluginSettings } from "@api/Settings";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+import { findByProps, findStoreLazy } from "@webpack";
+import { ChannelStore, FluxDispatcher, GuildStore, RelationshipStore, SnowflakeUtils, UserStore } from "@webpack/common";
+import { Settings } from "Vencord";
+
+const UserAffinitiesStore = findStoreLazy("UserAffinitiesStore");
+
+interface UserAffinity {
+ user_id: string;
+ affinity: number;
+}
+
+export default definePlugin({
+ name: "ImplicitRelationships",
+ description: "Shows your implicit relationships in the Friends tab.",
+ authors: [Devs.Dolfies],
+ patches: [
+ // Counts header
+ {
+ find: ".FRIENDS_ALL_HEADER",
+ replacement: {
+ match: /toString\(\)\}\);case (\i\.\i)\.BLOCKED/,
+ replace: 'toString()});case $1.IMPLICIT:return "Implicit — "+arguments[1];case $1.BLOCKED'
+ },
+ },
+ // No friends page
+ {
+ find: "FriendsEmptyState: Invalid empty state",
+ replacement: {
+ match: /case (\i\.\i)\.ONLINE:(?=return (\i)\.SECTION_ONLINE)/,
+ replace: "case $1.ONLINE:case $1.IMPLICIT:"
+ },
+ },
+ // Sections header
+ {
+ find: ".FRIENDS_SECTION_ONLINE",
+ replacement: {
+ match: /(\(0,\i\.jsx\)\(\i\.TabBar\.Item,\{id:\i\.\i)\.BLOCKED,className:([^\s]+?)\.item,children:\i\.\i\.Messages\.BLOCKED\}\)/,
+ replace: "$1.IMPLICIT,className:$2.item,children:\"Implicit\"}),$&"
+ },
+ },
+ // Sections content
+ {
+ find: '"FriendsStore"',
+ replacement: {
+ match: /(?<=case (\i\.\i)\.BLOCKED:return (\i)\.type===\i\.\i\.BLOCKED)/,
+ replace: ";case $1.IMPLICIT:return $2.type===5"
+ },
+ },
+ // Piggyback relationship fetch
+ {
+ find: ".fetchRelationships()",
+ replacement: {
+ match: /(\i\.\i)\.fetchRelationships\(\)/,
+ // This relationship fetch is actually completely useless, but whatevs
+ replace: "$1.fetchRelationships(),$self.fetchImplicitRelationships()"
+ },
+ },
+ // Modify sort -- thanks megu for the patch (from sortFriendRequests)
+ {
+ find: "getRelationshipCounts(){",
+ replacement: {
+ predicate: () => Settings.plugins.ImplicitRelationships.sortByAffinity,
+ match: /\.sortBy\(\i=>\i\.comparator\)/,
+ replace: "$&.sortBy((row) => $self.sortList(row))"
+ }
+ },
+
+ // Add support for the nonce parameter to Discord's shitcode
+ {
+ find: ".REQUEST_GUILD_MEMBERS",
+ replacement: {
+ match: /\.send\(8,{/,
+ replace: "$&nonce:arguments[1].nonce,"
+ }
+ },
+ {
+ find: "GUILD_MEMBERS_REQUEST:",
+ replacement: {
+ match: /presences:!!(\i)\.presences/,
+ replace: "$&,nonce:$1.nonce"
+ },
+ },
+ {
+ find: ".not_found",
+ replacement: {
+ match: /notFound:(\i)\.not_found/,
+ replace: "$&,nonce:$1.nonce"
+ },
+ }
+ ],
+ settings: definePluginSettings(
+ {
+ sortByAffinity: {
+ type: OptionType.BOOLEAN,
+ default: true,
+ description: "Whether to sort implicit relationships by their affinity to you.",
+ restartNeeded: true
+ },
+ }
+ ),
+
+ sortList(row: any) {
+ return row.type === 5
+ ? -UserAffinitiesStore.getUserAffinity(row.user.id)?.affinity ?? 0
+ : row.comparator;
+ },
+
+ async fetchImplicitRelationships() {
+ // Implicit relationships are defined as users that you:
+ // 1. Have an affinity for
+ // 2. Do not have a relationship with // TODO: Check how this works with pending/blocked relationships
+ // 3. Have a mutual guild with
+ const userAffinities: Set = UserAffinitiesStore.getUserAffinitiesUserIds();
+ const nonFriendAffinities = Array.from(userAffinities).filter(
+ id => !RelationshipStore.getRelationshipType(id)
+ );
+
+ // I would love to just check user cache here (falling back to the gateway of course)
+ // However, users in user cache may just be there because they share a DM or group DM with you
+ // So there's no guarantee that a user being in user cache means they have a mutual with you
+ // To get around this, we request users we have DMs with, and ignore them below if we don't get them back
+ const dmUserIds = new Set(
+ Object.values(ChannelStore.getSortedPrivateChannels()).flatMap(c => c.recipients)
+ );
+ const toRequest = nonFriendAffinities.filter(id => !UserStore.getUser(id) || dmUserIds.has(id));
+ const allGuildIds = Object.keys(GuildStore.getGuilds());
+ const sentNonce = SnowflakeUtils.fromTimestamp(Date.now());
+ let count = allGuildIds.length * Math.ceil(toRequest.length / 100);
+
+ // OP 8 Request Guild Members allows 100 user IDs at a time
+ const ignore = new Set(toRequest);
+ const relationships = RelationshipStore.getRelationships();
+ const callback = ({ nonce, members }) => {
+ if (nonce !== sentNonce) return;
+ members.forEach(member => {
+ ignore.delete(member.user.id);
+ });
+
+ nonFriendAffinities.map(id => UserStore.getUser(id)).filter(user => user && !ignore.has(user.id)).forEach(user => relationships[user.id] = 5);
+ RelationshipStore.emitChange();
+ if (--count === 0) {
+ FluxDispatcher.unsubscribe("GUILD_MEMBERS_CHUNK", callback);
+ }
+ };
+
+ FluxDispatcher.subscribe("GUILD_MEMBERS_CHUNK", callback);
+ for (let i = 0; i < toRequest.length; i += 100) {
+ FluxDispatcher.dispatch({
+ type: "GUILD_MEMBERS_REQUEST",
+ guildIds: allGuildIds,
+ userIds: toRequest.slice(i, i + 100),
+ nonce: sentNonce,
+ });
+ }
+ },
+
+ start() {
+ const { FriendsSections } = findByProps("FriendsSections");
+ FriendsSections.IMPLICIT = "IMPLICIT";
+ }
+});
diff --git a/src/plugins/sortFriendRequests/index.tsx b/src/plugins/sortFriendRequests/index.tsx
index c40a18140..32579a803 100644
--- a/src/plugins/sortFriendRequests/index.tsx
+++ b/src/plugins/sortFriendRequests/index.tsx
@@ -42,7 +42,7 @@ export default definePlugin({
find: "getRelationshipCounts(){",
replacement: {
match: /\.sortBy\(\i=>\i\.comparator\)/,
- replace: ".sortBy((row) => $self.sortList(row))"
+ replace: "$&.sortBy((row) => $self.sortList(row))"
}
}, {
find: ".Messages.FRIEND_REQUEST_CANCEL",