mirror of
https://github.com/Equicord/Equicord.git
synced 2025-06-08 06:03:03 -04:00
Merge
This commit is contained in:
parent
aca48cb9e5
commit
5f8c0c0f0e
3 changed files with 5 additions and 5 deletions
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
|
@ -59,7 +59,7 @@ jobs:
|
||||||
cp desktop/* release
|
cp desktop/* release
|
||||||
for file in equibop/*; do
|
for file in equibop/*; do
|
||||||
filename=$(basename "$file")
|
filename=$(basename "$file")
|
||||||
cp "$file" "release/equicordDesktop${filename^}"
|
cp "$file" "release/equibop${filename^}"
|
||||||
done
|
done
|
||||||
|
|
||||||
find release -size 0 -delete
|
find release -size 0 -delete
|
||||||
|
|
|
@ -45,7 +45,7 @@ interface PluginData {
|
||||||
commands: Command[];
|
commands: Command[];
|
||||||
required: boolean;
|
required: boolean;
|
||||||
enabledByDefault: boolean;
|
enabledByDefault: boolean;
|
||||||
target: "discordDesktop" | "vencordDesktop" | "equicordDesktop" | "desktop" | "web" | "dev";
|
target: "discordDesktop" | "vencordDesktop" | "equibop" | "desktop" | "web" | "dev";
|
||||||
filePath: string;
|
filePath: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -215,7 +215,7 @@ async function parseFile(fileName: string) {
|
||||||
|
|
||||||
const target = getPluginTarget(fileName);
|
const target = getPluginTarget(fileName);
|
||||||
if (target) {
|
if (target) {
|
||||||
if (!["web", "discordDesktop", "vencordDesktop", "equicordDesktop", "desktop", "dev"].includes(target)) throw fail(`invalid target ${target}`);
|
if (!["web", "discordDesktop", "vencordDesktop", "equibop", "desktop", "dev"].includes(target)) throw fail(`invalid target ${target}`);
|
||||||
data.target = target as any;
|
data.target = target as any;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -83,8 +83,8 @@ export default definePlugin({
|
||||||
// this also affects name headers in chats outside of servers
|
// this also affects name headers in chats outside of servers
|
||||||
find: '="SYSTEM_TAG"',
|
find: '="SYSTEM_TAG"',
|
||||||
replacement: {
|
replacement: {
|
||||||
match: /(?<=\i.gradientClassName]\),style:.{0,80}:void 0\}\)\(\),)/,
|
match: /\i.gradientClassName]\),style:/,
|
||||||
replace: "style:{color:$self.colorIfServer(arguments[0])},"
|
replace: "$&{color:$self.colorIfServer(arguments[0])},_style:"
|
||||||
},
|
},
|
||||||
predicate: () => !Settings.plugins.IrcColors.enabled
|
predicate: () => !Settings.plugins.IrcColors.enabled
|
||||||
},
|
},
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue