Merge branch 'develop' of https://github.com/Coflnet/hypixel-react in…

…to develop
Coflnet · May 6, 2024 · 205f53e · 205f53e
2 parents 720f89a + 69bd56f
commit 205f53e
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/api/WebsocketHelper.tsx b/api/WebsocketHelper.tsx
@@ -100,7 +100,6 @@ function initWebsocket(): void {
     }
 
     let getNewWebsocket = (isReconnecting: boolean): WebSocket => {
-        console.log('getNewWebsocket is called')
         websocket = new WebSocket(getProperty('websocketEndpoint'))
         websocket.onclose = onWebsocketClose
         websocket.onerror = onWebsocketError

diff --git a/components/Flipper/FlipCustomize/FlipCustomize.module.css b/components/Flipper/FlipCustomize/FlipCustomize.module.css
@@ -66,4 +66,4 @@
 #flip-finder-tooltip .tooltip-inner {
     max-width: max-content !important;
     text-align: left;
-}
+}
diff --git a/components/Flipper/FlipCustomize/FlipCustomize.tsx b/components/Flipper/FlipCustomize/FlipCustomize.tsx
@@ -30,10 +30,13 @@ const customSelectStyle = {
 
 function FlipCustomize() {
     let [flipCustomizeSettings, setFlipCustomizeSettings] = useState<FlipCustomizeSettings>({})
+    let [isExportDisabled, setIsExportDisabled] = useState(false)
     let { trackEvent } = useMatomo()
 
     useEffect(() => {
-        setFlipCustomizeSettings(getFlipCustomizeSettings())
+        let settings = getFlipCustomizeSettings()
+        setIsExportDisabled(settings.blockExport === true)
+        setFlipCustomizeSettings({ ...settings })
     }, [])
 
     function setFlipCustomizeSetting(key: string, value: any) {
@@ -552,9 +555,19 @@ function FlipCustomize() {
                         >
                             Import
                         </Button>
-                        <Button onClick={exportFilter} style={{ width: '40%' }}>
-                            Export
-                        </Button>
+                        <Tooltip
+                            type="hover"
+                            content={
+                                <div style={{ width: '40%', marginRight: 0 }}>
+                                    <Button onClick={exportFilter} disabled={isExportDisabled} style={{ width: '100%' }}>
+                                        Export
+                                    </Button>
+                                </div>
+                            }
+                            tooltipContent={
+                                isExportDisabled ? <p>Your settings can't be exported, likely because they are based on a config you bought</p> : undefined
+                            }
+                        />
                         {/* This is the "true" upload field. It is called by the "Import"-Button */}
                         <input onChange={readImportFile} style={{ display: 'none' }} type="file" id="fileUpload" />
                     </div>

diff --git a/global.d.ts b/global.d.ts
@@ -342,6 +342,7 @@ interface FlipCustomizeSettings {
     hideLore?: boolean
     modFormat?: string
     modCountdown?: boolean
+    blockExport?: boolean
 }
 
 interface FlipRestriction {

diff --git a/utils/SettingsUtils.tsx b/utils/SettingsUtils.tsx
@@ -89,7 +89,8 @@ export function setSettingsFromServerSide(
             hideCopySuccessMessage: !settings.visibility.copySuccessMessage,
             finders: FLIP_FINDERS.filter(finder => {
                 return hasFlag(parseInt(settings.finders), parseInt(finder.value))
-            }).map(finder => parseInt(finder.value))
+            }).map(finder => parseInt(finder.value)),
+            blockExport: settings.blockExport
         } as FlipCustomizeSettings
 
         let filter = {
@@ -441,6 +442,7 @@ export function mapSettingsToApiFormat(filter: FlipperFilter, flipSettings: Flip
             copySuccessMessage: !flipSettings.hideCopySuccessMessage,
             links: !flipSettings.disableLinks
         },
+        blockExport: flipSettings.blockExport,
         finders: flipSettings.finders?.reduce((a, b) => +a + +b, 0),
         changer: window.sessionStorage.getItem('sessionId')
     }