SheWhoReignsSupreme/Equicord
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/dev' into dev

Browse source
This commit is contained in:
thororen1234 2026-01-23 21:02:16 -05:00
commit 91e279061c
No known key found for this signature in database
10 changed files with 27 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package.json
View file

@ -1,7 +1,7 @@
{
"name": "equicord",
"private": "true",
"version": "1.13.12.3",
"version": "1.14.1.0",
"description": "The other cutest Discord client mod",
"homepage": "https://github.com/Equicord/Equicord#readme",
"bugs": {
@ -120,4 +120,4 @@
"engines": {
"node": ">=18"
}
}
}

4
packages/vencord-types/package.json
View file

@ -1,7 +1,7 @@
{
"name": "@equicord/types",
"private": false,
"version": "1.13.9",
"version": "1.14.1",
"description": "",
"types": "index.d.ts",
"scripts": {
@ -29,4 +29,4 @@
"@types/react": "18.3.1",
"@types/react-dom": "18.3.1"
}
}
}

23
src/equicordplugins/messageLoggerEnhanced/utils/constants.ts
View file

@ -1,23 +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/>.
*/
export const DEFAULT_IMAGE_CACHE_DIR = "savedImages";
export const DB_NAME = "MessageLoggerIDB";
export const DB_VERSION = 1;
export const LOGS_DATA_FILENAME = "message-logger-logs.json";

12
src/plugins/_api/memberListDecorators/index.tsx
View file

@ -30,11 +30,13 @@ export default definePlugin({
patches: [
{
find: "MemberListItem",
replacement: {
match: /(?<=GuildIcon:\i}=\i.{0,30}Fragment,\{children:\[)/,
replace: "Vencord.Api.MemberListDecorators.__getDecorators(arguments[0],'guild'),"
}
find: "#{intl::GUILD_OWNER}),children:",
replacement: [
{
match: /children:\[(?=.{0,300},lostPermissionTooltipText:)/,
replace: "children:[Vencord.Api.MemberListDecorators.__getDecorators(arguments[0],'guild'),"
}
]
},
{
find: "PrivateChannel.renderAvatar",

4
src/plugins/expressionCloner/index.tsx
View file

@ -76,9 +76,9 @@ function getGuildMaxStickerSlots(guild: Guild) {
function getUrl(data: Data, size: number) {
if (data.t === "Emoji")
return `${location.protocol}//${window.GLOBAL_ENV.CDN_HOST}/emojis/${data.id}.webp?size=${size}&lossless=true`;
return `${location.protocol}//${window.GLOBAL_ENV.CDN_HOST}/emojis/${data.id}.webp?size=${size}&lossless=true&animated=true`;
return `${window.GLOBAL_ENV.MEDIA_PROXY_ENDPOINT}/stickers/${data.id}.${StickerExtMap[data.format_type]}?size=${size}&lossless=true`;
return `${window.GLOBAL_ENV.MEDIA_PROXY_ENDPOINT}/stickers/${data.id}.${StickerExtMap[data.format_type]}?size=${size}&lossless=true&animated=true`;
}
async function fetchSticker(id: string) {

2
src/plugins/reviewDB/style.css
View file

@ -130,4 +130,4 @@
.vc-rdb-block-modal-unblock {
cursor: pointer;
}
}

3
src/plugins/roleColorEverywhere/index.tsx
View file

@ -138,7 +138,8 @@ export default definePlugin({
{
find: "MessageReactions.render:",
replacement: {
match: /tag:"strong",variant:"text-md\/(medium|normal)"(?<=onContextMenu:.{0,15}\((\i),(\i),\i\).+?)/,
// FIXME: (?:medium|normal) is for stable compat
match: /tag:"strong",variant:"text-md\/(?:medium|normal)"(?<=onContextMenu:.{0,15}\((\i),(\i),\i\).+?)/,
replace: "$&,style:$self.getColorStyle($2?.id,$1?.channel?.id)"
},
predicate: () => settings.store.reactorsList,

2
src/plugins/showHiddenChannels/style.css
View file

@ -104,4 +104,4 @@
cursor: not-allowed;
margin-left: 6px;
z-index: 0;
}
}

8
src/plugins/sortFriendRequests/index.tsx
View file

@ -75,6 +75,14 @@ export default definePlugin({
replace: "$self.makeSubtext($1, $&)"
}
},
{
find: "#{intl::FRIEND_REQUEST_CANCEL}",
replacement: {
predicate: () => settings.store.showDates,
match: /(?<=children:\[)\(0,.{0,100}user:\i,hovered:\i.+?(?=,\(0)(?<=user:(\i).+?)/,
replace: (children, user) => `$self.WrapperDateComponent({user:${user},children:${children}})`
}
},
{
find: "#{intl::FRIEND_REQUEST_CANCEL}",
replacement: {

28
src/plugins/webScreenShareFixes.web/index.ts
View file

@ -4,24 +4,14 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
import { definePluginSettings } from "@api/Settings";
import { Devs } from "@utils/constants";
import definePlugin, { OptionType } from "@utils/types";
const settings = definePluginSettings({
experimentalAV1Support: {
type: OptionType.BOOLEAN,
description: "Enable AV1 codec support. May cause issues like infinitely loading streams",
default: false
}
});
import definePlugin from "@utils/types";
export default definePlugin({
name: "WebScreenShareFixes",
authors: [Devs.Kaitlyn],
description: "Removes 2500kbps bitrate cap on chromium and vesktop clients.",
enabledByDefault: true,
settings,
patches: [
{
@ -38,22 +28,8 @@ export default definePlugin({
{
match: /;usedtx=".concat\((\i)\?"0":"1"\)/,
replace: '$&.concat($1?";stereo=1;sprop-stereo=1":"")'
},
{
match: /\i\?\[(\i\.\i)\.H265,\i\.\i\.H264,\i\.\i\.VP8,\i\.\i\.VP9\]/,
replace: "true?$self.getCodecs($1)"
}
]
}
],
getCodecs(Codecs: Record<string, string>) {
const codecs = [Codecs.H265, Codecs.VP9, Codecs.H264, Codecs.VP8];
if (settings.store.experimentalAV1Support) {
codecs.unshift("AV1");
}
return codecs;
}
]
});