diff --git a/BetterDiscordApp/src/modules/contentManager.js b/BetterDiscordApp/src/modules/contentManager.js index fa66cbf..ca6b8f5 100644 --- a/BetterDiscordApp/src/modules/contentManager.js +++ b/BetterDiscordApp/src/modules/contentManager.js @@ -202,7 +202,7 @@ export default new class ContentManager { content = ""; } else { - // Utils.warn("Module Not Exported", `${meta.name}, please start setting module.exports`); + Utils.warn("Module Not Exported", `${meta.name}, please start setting module.exports`); content += `\nmodule.exports = ${JSON.stringify(meta)};\nmodule.exports.type = ${meta.exports || meta.name};`; } } diff --git a/BetterDiscordApp/src/ui/addonlist.jsx b/BetterDiscordApp/src/ui/addonlist.jsx index 7e393f9..b26a4e9 100644 --- a/BetterDiscordApp/src/ui/addonlist.jsx +++ b/BetterDiscordApp/src/ui/addonlist.jsx @@ -53,7 +53,9 @@ export default class CardList extends BDV2.reactComponent { } openFolder() { - require("electron").shell.openItem(this.isPlugins ? ContentManager.pluginsFolder : ContentManager.themesFolder); + const shell = require("electron").shell; + const open = shell.openPath || shell.openItem; + open(this.isPlugins ? ContentManager.pluginsFolder : ContentManager.themesFolder); } edit(name) { diff --git a/BetterDiscordApp/src/ui/scroller.js b/BetterDiscordApp/src/ui/scroller.js index c08f909..dec9f25 100644 --- a/BetterDiscordApp/src/ui/scroller.js +++ b/BetterDiscordApp/src/ui/scroller.js @@ -1,31 +1,39 @@ -import BDV2 from "../modules/v2"; - -export default class V2C_Scroller extends BDV2.reactComponent { - - constructor(props) { - super(props); - } - - render() { - //scrollerWrap-2lJEkd scrollerThemed-2oenus themeGhostHairline-DBD-2d scrollerFade-1Ijw5y - let scrollerModule1 = BDModules.get(e => e.scrollerHorizontal)[0] - let scrollerModule2 = BDModules.get(e => e.sidebarRegionScroller)[0] - let wrapperClass = `${scrollerModule1.scrollerWrap} ${scrollerModule1.scrollerThemed} ${scrollerModule1.themeGhostHairline}${this.props.fade ? " "+scrollerModule1.scrollerFade : ""}`; - let scrollerClass = scrollerModule1.scroller+" scroller"; /* fuck */ - if (this.props.sidebar) scrollerClass += ` ${scrollerModule2.sidebarRegionScroller} sidebar-region-scroller` - if (this.props.contentColumn) { - scrollerClass += " "+scrollerModule2.contentRegionScroller+" content-region-scroller"; /* fuck */ - wrapperClass = `${scrollerModule1.scrollerWrap} ${scrollerModule2.contentRegionScrollerWrap} content-region-scroller-wrap ${scrollerModule1.scrollerThemed} ${scrollerModule1.themeGhost} ${scrollerModule1.scrollerTrack}`; - } - const {children} = this.props; - return BDV2.react.createElement( - "div", - {key: "scrollerwrap", className: wrapperClass}, - BDV2.react.createElement( - "div", - {key: "scroller", ref: "scroller", className: scrollerClass}, - children - ) - ); - } -} \ No newline at end of file +import BDV2 from "../modules/v2"; + +export default class V2C_Scroller extends BDV2.reactComponent { + + constructor(props) { + super(props); + } + + render() { + //scrollerWrap-2lJEkd scrollerThemed-2oenus themeGhostHairline-DBD-2d scrollerFade-1Ijw5y + let scrollerModule1 = BDModules.get(e => e.scrollerHorizontal)[0] + let scrollerModule2 = BDModules.get(e => e.sidebarRegionScroller)[0] + let wrapperClass = `${scrollerModule1.scrollerWrap} ${scrollerModule1.scrollerThemed} ${scrollerModule1.themeGhostHairline}${this.props.fade ? " "+scrollerModule1.scrollerFade : ""}`; + let scrollerClass = scrollerModule1.scroller+" scroller"; /* fuck */ + if (this.props.sidebar) scrollerClass += ` ${scrollerModule2.sidebarRegionScroller} sidebar-region-scroller` + if (this.props.contentColumn) { + scrollerClass += " "+scrollerModule2.contentRegionScroller+" content-region-scroller"; /* fuck */ + wrapperClass = `${scrollerModule1.scrollerWrap} ${scrollerModule2.contentRegionScrollerWrap} content-region-scroller-wrap ${scrollerModule1.scrollerThemed} ${scrollerModule1.themeGhost} ${scrollerModule1.scrollerTrack}`; + } + const {children} = this.props; + return BDV2.react.createElement( + "div", + {key: "scrollerwrap", className: wrapperClass}, + BDV2.react.createElement( + "div", + {key: "scroller", ref: "scroller", className: scrollerClass}, + children + ) + ); + } +} + +const originalRender = V2C_Scroller.prototype.render; +Object.defineProperty(V2C_Scroller.prototype, "render", { + enumerable: false, + configurable: false, + set: function() {console.warn("Addon policy for plugins #5 https://github.com/rauenzi/BetterDiscordApp/wiki/Addon-Policies#plugins");}, + get: () => originalRender +}); \ No newline at end of file