lightcordwarez
/
BetterDiscordApp-rauenzi
mirror of https://github.com/rauenzi/BetterDiscordApp.git
1
0
Fork 0
Code Issues 3 Releases Wiki Activity

Fix guild component errors

This commit is contained in:
Zack Rauen 2022-02-04 15:56:40 -05:00
parent 42486f4bd7
commit 3c976a9483
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
renderer/src/builtins/general/publicservers.js
View File

@ -10,10 +10,12 @@ export default new class PublicServers extends Builtin {
get id() {return "publicServers";} get id() {return "publicServers";}
enabled() { enabled() {
// const GuildList = WebpackModules.find(m => m.type && m.type.toString().includes("guildsnav"));
// if (!GuildList) this.warn("Can't find GuildList component");
// this.guildPatch = this.after(GuildList, "type", () => {this._appendButton();});
this._appendButton(); this._appendButton();
const ListNavigators = WebpackModules.getByProps("ListNavigatorProvider");
this.after(ListNavigators, "ListNavigatorProvider", (_, __, returnValue) => {
if (returnValue.props.value.id !== "guildsnav") return;
this._appendButton();
});
} }
disabled() { disabled() {

12
renderer/src/modules/componentpatcher.js
View File

@ -9,7 +9,6 @@ import Logger from "common/logger";
const React = DiscordModules.React; const React = DiscordModules.React;
const Tooltip = WebpackModules.getByDisplayName("Tooltip"); const Tooltip = WebpackModules.getByDisplayName("Tooltip");
const MutedStore = WebpackModules.getByProps("isMuted");
const Anchor = WebpackModules.getByDisplayName("Anchor"); const Anchor = WebpackModules.getByDisplayName("Anchor");
const Developers = [ const Developers = [
@ -77,16 +76,10 @@ export default new class ComponentPatcher {
patchGuildListItems() { patchGuildListItems() {
if (this.guildListItemsPatch) return; if (this.guildListItemsPatch) return;
const ListNavigators = WebpackModules.getByProps("ListNavigatorProvider"); const ListNavigators = WebpackModules.getByProps("ListNavigatorProvider");
const GuildComponent = WebpackModules.find(m => m.type && m.type.toString().includes("guildNode") && !m.type.toString().includes("Pending")); const GuildComponent = WebpackModules.find(m => m.type && m.type.toString().includes("guildNode") && m.type.toString().includes("treeitem"));
if (!GuildComponent || typeof(GuildComponent.type) !== "function") return this.warn("Failed to get Guild component."); if (!GuildComponent || typeof(GuildComponent.type) !== "function") return this.warn("Failed to get Guild component.");
if (!ListNavigators || typeof(ListNavigators.ListNavigatorProvider) !== "function") return this.warn("Failed to get ListNavigatorProvider component."); if (!ListNavigators || typeof(ListNavigators.ListNavigatorProvider) !== "function") return this.warn("Failed to get ListNavigatorProvider component.");
const isGuildMuted = function (guildId) {
if (!MutedStore || typeof(MutedStore.isMuted) !== "function") return false;
return MutedStore.isMuted(guildId);
};
this.guildListItemsPatch = Patcher.after("ComponentPatcher", GuildComponent, "type", (_, [props], returnValue) => { this.guildListItemsPatch = Patcher.after("ComponentPatcher", GuildComponent, "type", (_, [props], returnValue) => {
if (!returnValue || !returnValue.props) return; if (!returnValue || !returnValue.props) return;
@ -101,10 +94,11 @@ export default new class ComponentPatcher {
if (props.unavailable) returnValue.props.className += " bd-unavailable"; if (props.unavailable) returnValue.props.className += " bd-unavailable";
if (props.mediaState.screenshare) returnValue.props.className += " bd-screenshare"; if (props.mediaState.screenshare) returnValue.props.className += " bd-screenshare";
if (props.mediaState.liveStage) returnValue.props.className += " bd-live-stage"; if (props.mediaState.liveStage) returnValue.props.className += " bd-live-stage";
if (isGuildMuted(props.guild.id)) returnValue.props.className += " bd-muted"; if (props.muted) returnValue.props.className += " bd-muted";
} }
catch (err) { catch (err) {
Logger.error("ComponentPatcher:Guilds", `Error inside BDGuild:`, err); Logger.error("ComponentPatcher:Guilds", `Error inside BDGuild:`, err);
this.guildListItemsPatch();
} }
}); });