commit 7556f1502a0e753efe23957155f79216f3acab59 · notnite.com/moonlight

+14 -6

packages/core-extensions/src/moonbase/style.css

···

       11
       11
        
         resize: vertical;

     

       12
       12
        
       }

     

       13
       13
        
       

     

       14
       14
       +
       /* Update notice at the top of the client */

     

       14
       15
        
       .moonbase-updates-notice {

     

       15
       16
        
         background-color: var(--moonbase-bg);

     

       16
       17
        
         color: var(--moonbase-fg);

     
···

       31
       32
        
         gap: 2px;

     

       32
       33
        
       }

     

       33
       34
        
       

     

       35
       35
       +
       /* Help messages in Moonbase UI */

     

       36
       36
       +
       .moonbase-help-message {

     

       37
       37
       +
         display: flex;

     

       38
       38
       +
         flex-direction: row;

     

       39
       39
       +
         justify-content: space-between;

     

       40
       40
       +
       }

     

       41
       41
       +
       

     

       42
       42
       +
       .moonbase-extension-update-section {

     

       43
       43
       +
         margin-top: 15px;

     

       44
       44
       +
       }

     

       45
       45
       +
       

     

       34
       46
        
       .moonbase-update-section {

     

       35
       47
        
         background-color: var(--moonbase-bg);

     

       36
       48
        
         --info-help-foreground: var(--moonbase-fg);

     

       37
       49
        
         border: none !important;

     

       38
       50
        
         color: var(--moonbase-fg);

     

       39
       39
       -
       

     

       40
       40
       -
         display: flex;

     

       41
       41
       -
         flex-direction: row;

     

       42
       42
       -
         justify-content: space-between;

     

       43
       51
        
       }

     

       44
       52
        
       

     

       45
       53
        
       .moonbase-update-section button {

     
···

       49
       57
        
         border-color: var(--moonbase-fg);

     

       50
       58
        
       }

     

       51
       59
        
       

     

       52
       52
       -
       .moonbase-update-section-buttons {

     

       60
       60
       +
       .moonbase-help-message-buttons {

     

       53
       61
        
         display: flex;

     

       54
       62
        
         flex-direction: row;

     

       55
       63
        
         gap: 8px;

     
···

       59
       67
        
         margin: 32px 0;

     

       60
       68
        
       }

     

       61
       69
        
       

     

       62
       62
       -
       /* crash screen */

     

       70
       70
       +
       /* Crash screen */

     

       63
       71
        
       .moonbase-crash-wrapper > [class^="buttons_"] {

     

       64
       72
        
         gap: 1rem;

     

       65
       73
        
       }

+2 -1

packages/core-extensions/src/moonbase/webpackModules/settings.tsx

···

       14
       14
        
       

     

       15
       15
        
       const { open } = spacepack.findByExports("setSection", "clearSubsection")[0].exports.Z;

     

       16
       16
        
       

     

       17
       17
       +
       let SettingsNotice;

     

       17
       18
        
       const notice = {

     

       18
       19
        
         stores: [MoonbaseSettingsStore],

     

       19
       20
        
         element: () => {

     

       20
       21
        
           // Require it here because lazy loading SUX

     

       21
       21
       -
           const SettingsNotice = spacepack.findByCode("onSaveButtonColor", "FocusRingScope")[0].exports.Z;

     

       22
       22
       +
           SettingsNotice ??= spacepack.findByCode("onSaveButtonColor", "FocusRingScope")[0].exports.Z;

     

       22
       23
        
           return (

     

       23
       24
        
             <SettingsNotice

     

       24
       25
        
               submitting={MoonbaseSettingsStore.submitting}

packages/core-extensions/src/moonbase/webpackModules/stores.ts

···

       26
       26
        
         newVersion: string | null;

     

       27
       27
        
         shouldShowNotice: boolean;

     

       28
       28
        
       

     

       29
       29
       +
         #showOnlyUpdateable = false;

     

       30
       30
       +
         set showOnlyUpdateable(v: boolean) {

     

       31
       31
       +
           this.#showOnlyUpdateable = v;

     

       32
       32
       +
           this.emitChange();

     

       33
       33
       +
         }

     

       34
       34
       +
         get showOnlyUpdateable() {

     

       35
       35
       +
           return this.#showOnlyUpdateable;

     

       36
       36
       +
         }

     

       37
       37
       +
       

     

       29
       38
        
         extensions: { [id: number]: MoonbaseExtension };

     

       30
       39
        
         updates: {

     

       31
       40
        
           [id: number]: {

+47

packages/core-extensions/src/moonbase/webpackModules/ui/HelpMessage.tsx

···

       1
       1
       +
       import React from "@moonlight-mod/wp/react";

     

       2
       2
       +
       import spacepack from "@moonlight-mod/wp/spacepack_spacepack";

     

       3
       3
       +
       import Flex from "@moonlight-mod/wp/discord/uikit/Flex";

     

       4
       4
       +
       import { Text } from "@moonlight-mod/wp/discord/components/common/index";

     

       5
       5
       +
       

     

       6
       6
       +
       const Margins = spacepack.require("discord/styles/shared/Margins.css");

     

       7
       7
       +
       const HelpMessageClasses = spacepack.findByExports("positive", "iconDiv")[0].exports;

     

       8
       8
       +
       

     

       9
       9
       +
       // reimpl of HelpMessage but with a custom icon

     

       10
       10
       +
       export default function HelpMessage({

     

       11
       11
       +
         className,

     

       12
       12
       +
         text,

     

       13
       13
       +
         icon,

     

       14
       14
       +
         children

     

       15
       15
       +
       }: {

     

       16
       16
       +
         className?: string;

     

       17
       17
       +
         text: string;

     

       18
       18
       +
         icon: React.ComponentType<any>;

     

       19
       19
       +
         children?: React.ReactNode;

     

       20
       20
       +
       }) {

     

       21
       21
       +
         return (

     

       22
       22
       +
           <div

     

       23
       23
       +
             className={`${Margins.marginBottom20} ${HelpMessageClasses.info} ${HelpMessageClasses.container} moonbase-help-message ${className}`}

     

       24
       24
       +
           >

     

       25
       25
       +
             <Flex direction={Flex.Direction.HORIZONTAL}>

     

       26
       26
       +
               <div

     

       27
       27
       +
                 className={HelpMessageClasses.iconDiv}

     

       28
       28
       +
                 style={{

     

       29
       29
       +
                   alignItems: "center"

     

       30
       30
       +
                 }}

     

       31
       31
       +
               >

     

       32
       32
       +
                 {React.createElement(icon, {

     

       33
       33
       +
                   size: "sm",

     

       34
       34
       +
                   color: "currentColor",

     

       35
       35
       +
                   className: HelpMessageClasses.icon

     

       36
       36
       +
                 })}

     

       37
       37
       +
               </div>

     

       38
       38
       +
       

     

       39
       39
       +
               <Text variant="text-sm/medium" color="currentColor" className={HelpMessageClasses.text}>

     

       40
       40
       +
                 {text}

     

       41
       41
       +
               </Text>

     

       42
       42
       +
       

     

       43
       43
       +
               {children}

     

       44
       44
       +
             </Flex>

     

       45
       45
       +
           </div>

     

       46
       46
       +
         );

     

       47
       47
       +
       }

+32 -7

packages/core-extensions/src/moonbase/webpackModules/ui/extensions/index.tsx

···

       10
       10
        
       

     

       11
       11
        
       import { MoonbaseSettingsStore } from "@moonlight-mod/wp/moonbase_stores";

     

       12
       12
        
       import { ExtensionCompat } from "@moonlight-mod/core/extension/loader";

     

       13
       13
       +
       import HelpMessage from "../HelpMessage";

     

       13
       14
        
       

     

       14
       15
        
       const SearchBar: any = Object.values(spacepack.findByCode("hideSearchIcon")[0].exports)[0];

     

       16
       16
       +
       const { CircleInformationIcon, XSmallIcon } = Components;

     

       17
       17
       +
       const PanelButton = spacepack.findByCode("Masks.PANEL_BUTTON")[0].exports.Z;

     

       15
       18
        
       

     

       16
       19
        
       export default function ExtensionsPage() {

     

       17
       17
       -
         const { extensions, savedFilter } = useStateFromStoresObject([MoonbaseSettingsStore], () => {

     

       20
       20
       +
         const { extensions, savedFilter, showOnlyUpdateable } = useStateFromStoresObject([MoonbaseSettingsStore], () => {

     

       18
       21
        
           return {

     

       19
       22
        
             extensions: MoonbaseSettingsStore.extensions,

     

       20
       20
       -
             savedFilter: MoonbaseSettingsStore.getExtensionConfigRaw<number>("moonbase", "filter", defaultFilter)

     

       23
       23
       +
             savedFilter: MoonbaseSettingsStore.getExtensionConfigRaw<number>("moonbase", "filter", defaultFilter),

     

       24
       24
       +
             showOnlyUpdateable: MoonbaseSettingsStore.showOnlyUpdateable

     

       21
       25
        
           };

     

       22
       26
        
         });

     

       23
       27
        
       

     
···

       93
       97
        
             />

     

       94
       98
        
             <FilterBar filter={filter} setFilter={setFilter} selectedTags={selectedTags} setSelectedTags={setSelectedTags} />

     

       95
       99
        
       

     

       100
       100
       +
             {showOnlyUpdateable && (

     

       101
       101
       +
               <HelpMessage

     

       102
       102
       +
                 icon={CircleInformationIcon}

     

       103
       103
       +
                 text="Only displaying updates"

     

       104
       104
       +
                 className="moonbase-extension-update-section"

     

       105
       105
       +
               >

     

       106
       106
       +
                 <div className="moonbase-help-message-buttons">

     

       107
       107
       +
                   <PanelButton

     

       108
       108
       +
                     icon={XSmallIcon}

     

       109
       109
       +
                     onClick={() => {

     

       110
       110
       +
                       MoonbaseSettingsStore.showOnlyUpdateable = false;

     

       111
       111
       +
                     }}

     

       112
       112
       +
                   />

     

       113
       113
       +
                 </div>

     

       114
       114
       +
               </HelpMessage>

     

       115
       115
       +
             )}

     

       116
       116
       +
       

     

       96
       117
        
             {filteredWithUpdates.map((ext) => (

     

       97
       118
        
               <ExtensionCard uniqueId={ext.uniqueId} key={ext.uniqueId} />

     

       98
       119
        
             ))}

     

       99
       99
       -
             {filteredWithUpdates.length > 0 && filteredWithoutUpdates.length > 0 && (

     

       100
       100
       -
               <FormDivider className="moonbase-update-divider" />

     

       120
       120
       +
             {!showOnlyUpdateable && (

     

       121
       121
       +
               <>

     

       122
       122
       +
                 {filteredWithUpdates.length > 0 && filteredWithoutUpdates.length > 0 && (

     

       123
       123
       +
                   <FormDivider className="moonbase-update-divider" />

     

       124
       124
       +
                 )}

     

       125
       125
       +
                 {filteredWithoutUpdates.map((ext) => (

     

       126
       126
       +
                   <ExtensionCard uniqueId={ext.uniqueId} key={ext.uniqueId} />

     

       127
       127
       +
                 ))}

     

       128
       128
       +
               </>

     

       101
       129
        
             )}

     

       102
       102
       -
             {filteredWithoutUpdates.map((ext) => (

     

       103
       103
       -
               <ExtensionCard uniqueId={ext.uniqueId} key={ext.uniqueId} />

     

       104
       104
       -
             ))}

     

       105
       130
        
           </>

     

       106
       131
        
         );

     

       107
       132
        
       }

packages/core-extensions/src/moonbase/webpackModules/ui/index.tsx

···

       7
       7
        
       import ExtensionsPage from "./extensions";

     

       8
       8
        
       import ConfigPage from "./config";

     

       9
       9
        
       import Update from "./update";

     

       10
       10
       +
       import { MoonbaseSettingsStore } from "@moonlight-mod/wp/moonbase_stores";

     

       10
       11
        
       

     

       11
       12
        
       const { Divider } = spacepack.findByCode(".forumOrHome]:")[0].exports.Z;

     

       12
       13
        
       const TitleBarClasses = spacepack.findByCode("iconWrapper:", "children:")[0].exports;

     
···

       44
       45
        
           () => () => {

     

       45
       46
        
             // Normally there's an onSettingsClose prop you can set but we don't expose it and I don't care enough to add support for it right now

     

       46
       47
        
             clearSubsection("moonbase");

     

       48
       48
       +
             MoonbaseSettingsStore.showOnlyUpdateable = false;

     

       47
       49
        
           },

     

       48
       50
        
           []

     

       49
       51
        
         );

+5 -26

packages/core-extensions/src/moonbase/webpackModules/ui/update.tsx

···

       2
       2
        
       import { MoonbaseSettingsStore } from "@moonlight-mod/wp/moonbase_stores";

     

       3
       3
        
       import * as Components from "@moonlight-mod/wp/discord/components/common/index";

     

       4
       4
        
       import React from "@moonlight-mod/wp/react";

     

       5
       5
       -
       import spacepack from "@moonlight-mod/wp/spacepack_spacepack";

     

       6
       6
       -
       import Flex from "@moonlight-mod/wp/discord/uikit/Flex";

     

       7
       5
        
       import { UpdateState } from "../../types";

     

       6
       6
       +
       import HelpMessage from "./HelpMessage";

     

       8
       7
        
       

     

       9
       9
       -
       const { ThemeDarkIcon, Text, Button } = Components;

     

       10
       10
       -
       const Margins = spacepack.require("discord/styles/shared/Margins.css");

     

       11
       11
       -
       const HelpMessageClasses = spacepack.findByExports("positive", "iconDiv")[0].exports;

     

       8
       8
       +
       const { ThemeDarkIcon, Button } = Components;

     

       12
       9
        
       

     

       13
       10
        
       const logger = moonlight.getLogger("moonbase/ui/update");

     

       14
       11
        
       

     
···

       25
       22
        
       

     

       26
       23
        
         if (newVersion == null) return null;

     

       27
       24
        
       

     

       28
       28
       -
         // reimpl of HelpMessage but with a custom icon

     

       29
       25
        
         return (

     

       30
       30
       -
           <div

     

       31
       31
       -
             className={`${Margins.marginBottom20} ${HelpMessageClasses.info} ${HelpMessageClasses.container} moonbase-update-section`}

     

       32
       32
       -
           >

     

       33
       33
       -
             <Flex direction={Flex.Direction.HORIZONTAL}>

     

       34
       34
       -
               <div

     

       35
       35
       -
                 className={HelpMessageClasses.iconDiv}

     

       36
       36
       -
                 style={{

     

       37
       37
       -
                   alignItems: "center"

     

       38
       38
       -
                 }}

     

       39
       39
       -
               >

     

       40
       40
       -
                 <ThemeDarkIcon size="sm" color="currentColor" className={HelpMessageClasses.icon} />

     

       41
       41
       -
               </div>

     

       42
       42
       -
       

     

       43
       43
       -
               <Text variant="text-sm/medium" color="currentColor" className={HelpMessageClasses.text}>

     

       44
       44
       -
                 {strings[state]}

     

       45
       45
       -
               </Text>

     

       46
       46
       -
             </Flex>

     

       47
       47
       -
       

     

       48
       48
       -
             <div className="moonbase-update-section-buttons">

     

       26
       26
       +
           <HelpMessage text={strings[state]} className="moonbase-update-section" icon={ThemeDarkIcon}>

     

       27
       27
       +
             <div className="moonbase-help-message-buttons">

     

       49
       28
        
               {state === UpdateState.Installed && (

     

       50
       29
        
                 <Button

     

       51
       30
        
                   look={Button.Looks.OUTLINED}

     
···

       78
       57
        
                 Update

     

       79
       58
        
               </Button>

     

       80
       59
        
             </div>

     

       81
       81
       -
           </div>

     

       60
       60
       +
           </HelpMessage>

     

       82
       61
        
         );

     

       83
       62
        
       }

+6 -16

packages/core-extensions/src/moonbase/webpackModules/updates.tsx

···

       5
       5
        
       import React from "@moonlight-mod/wp/react";

     

       6
       6
        
       import * as Components from "@moonlight-mod/wp/discord/components/common/index";

     

       7
       7
        
       

     

       8
       8
       -
       // FIXME: not indexed as importable

     

       9
       9
       -
       const Constants = spacepack.require("discord/Constants");

     

       10
       10
       -
       const UserSettingsSections = spacepack.findObjectFromKey(Constants, "DEVELOPER_OPTIONS");

     

       11
       11
       -
       

     

       12
       8
        
       const { ThemeDarkIcon } = Components;

     

       13
       9
        
       

     

       14
       10
        
       function plural(str: string, num: number) {

     
···

       64
       60
        
                 name: "Open Moonbase",

     

       65
       61
        
                 onClick: () => {

     

       66
       62
        
                   const { open } = spacepack.findByExports("setSection", "clearSubsection")[0].exports.Z;

     

       67
       67
       -
       

     

       68
       68
       -
                   // settings is lazy loaded thus lazily patched

     

       69
       69
       -
                   // FIXME: figure out a way to detect if settings has been opened

     

       70
       70
       -
                   //        alreadyjust so the transition isnt as jarring

     

       71
       71
       -
                   open(UserSettingsSections.ACCOUNT);

     

       72
       72
       -
                   setTimeout(() => {

     

       73
       73
       -
                     if (MoonbaseSettingsStore.getExtensionConfigRaw<boolean>("moonbase", "sections", false)) {

     

       74
       74
       -
                       open("moonbase-extensions");

     

       75
       75
       -
                     } else {

     

       76
       76
       -
                       open("moonbase", 0);

     

       77
       77
       -
                     }

     

       78
       78
       -
                   }, 0);

     

       63
       63
       +
                   if (MoonbaseSettingsStore.getExtensionConfigRaw<boolean>("moonbase", "sections", false)) {

     

       64
       64
       +
                     open("moonbase-extensions");

     

       65
       65
       +
                   } else {

     

       66
       66
       +
                     MoonbaseSettingsStore.showOnlyUpdateable = true;

     

       67
       67
       +
                     open("moonbase", 0);

     

       68
       68
       +
                   }

     

       79
       69
        
                   return true;

     

       80
       70
        
                 }

     

       81
       71
        
               }