Update 1.6.54 Source Code

acquitelol · web-flow · commit 3bf9231dd7f5 · 2022-07-24T16:55:43.000+01:00
diff --git a/index.html b/index.html
@@ -64,6 +64,35 @@
             ipcRenderer.send('disableRpcCallback')
         }
 
+        function UploadBanner() {
+            let str = document.getElementById('bannerBtn').value
+            let banner = document.getElementById('bg')
+
+            console.log(str, banner)
+            if (!str.startsWith('https://')) {
+                let userID = localStorage.getItem('userID')
+                
+                try {
+                    let splitted = str.split('.', 1);
+                } catch {
+                    return console.log("Invalid ID")
+                }
+                if (!userID) {
+                    return console.log('Either set the RPC first, or use a full URL format.')
+                }
+
+                let final = `https://cdn.discordapp.com/banners/${userID}/${splitted}.${str.startsWith('a_')?"gif":'png'}?size=64`
+                banner.style.backgroundImage = `url(${final})`
+                localStorage.setItem('bannerURL', final)
+            } else {
+                let final = str
+                banner.style.backgroundImage = `url(${final})`
+                localStorage.setItem('bannerURL', final)
+            }
+           
+                
+        }
+
         function RPCfunc() {
             // main initalization of rich presence information set as an object
             const obj = {
@@ -159,6 +188,8 @@
                     userID,
                     userDisc
                 } = arg;
+
+                localStorage.setItem('userID', userID)
                 let largeImgIcn = document.getElementById('paimon');
                 let smallImgIcn = document.getElementById('small');
                 if (iterations < 1) {
@@ -167,10 +198,17 @@
                 }
                 // checks if the old avatar is the same as the new one; if it isnt, it sets the banner again.
                 profilePic.src = avatarIcon;
+                localStorage.setItem('pfpURL', avatarIcon)
                 profilePic.onload = () => {
                     ColorThief.getColor(avatarIcon)
                         .then(color => {
-                            bgImg.style.backgroundColor = "rgb(" + color + ")";
+                            let banner = localStorage.getItem('bannerURL')
+
+                            if (!banner) { 
+                                let bannerURL = "rgb(" + color + ")"; 
+                                bgImg.style.backgroundColor = bannerURL
+                                localStorage.setItem('bannerURL', bannerURL)
+                            }
                         })
                         .catch(err => {
                             console.log(err)
@@ -291,6 +329,17 @@
 
                     }
                     document.getElementById('badgeTooltipText').innerText = `v${version} @ 26.06.22`
+                    let banner = localStorage.getItem('bannerURL')
+                    let pfp = localStorage.getItem('pfpURL')
+
+                    if (banner) {
+                        let bg = document.getElementById('bg')
+                        bg.style.backgroundImage = banner.startsWith('https://')?`url(${banner})`:banner;
+                    }
+                    if (pfp) {
+                        let pfpIcon = document.getElementById('pfp')
+                        pfpIcon.src = pfp
+                    }
                     loadTxt.innerText = "Loading... (100%)"
                     loadBar.style.width = '80vw'
                     setTimeout(() => {
@@ -382,7 +431,13 @@
                 url1div.style.filter = "opacity(1)";
                 url1div.style.zIndex = "1"
             })
-
+            ipcRenderer.on('setCustomBanner', (arg, event) => {
+                let url1div = document.getElementById('bannerMenu');
+                url1div.style.transition = "all 500ms ease";
+                url1div.style.filter = "opacity(1)";
+                url1div.style.zIndex = "1"
+            })
+            
         ipcRenderer.on('clearCacheResponse', (event, arg) => {
             const clearObj = {
                 'clientVar': "",
@@ -492,6 +547,10 @@
                     let closeBtn = document.getElementById('closeBtn5');
                     closeBtn.parentElement.style.filter = "opacity(0)";
                     closeBtn.parentElement.style.zIndex = "-1";
+                } case 6: {
+                    let closeBtn = document.getElementById('closeBtn6');
+                    closeBtn.parentElement.style.filter = "opacity(0)";
+                    closeBtn.parentElement.style.zIndex = "-1";
                 }
             }
 
@@ -511,9 +570,9 @@ <h3 class='nickname' id='nickname'> Testing Only</h3>
     <h4 class='username' id='username'> Test Account#0001</h4>
     <div class='images things' id='play'>Playing a game</div>
     <input type="text" class='genshin things' id='name' value='Genshin Impact' placeholder="Game Name" onclick="this.select()" onchange="RPCfunc()"></input>
-    <img src='https://cdn.discordapp.com/app-assets/929391097824821318/929483644731551754.png' alt='paimon' width="60" height="60" class='paimon things' id='paimon' onclick="paimonClick()">
+    <img src='https://cdn.discordapp.com/app-assets/929391097824821318/929483644731551754.png' alt='paimon' width="56" height="56" class='paimon things' id='paimon' onclick="paimonClick()">
     <img src='assets/yae.png' alt='small' width="20" height="20" class='yae things' id='small' onclick='smallClick()'>
-    <img src="./assets/circle.png" alt="circle" width="10" height="10", class='circle'>
+    <img src="./assets/circle.png" alt="circle" width="11" height="11", class='circle'>
     <img src="./assets/devportal.png" alt="discord-dev-portal" width="10" height="10", class='devportal' onclick="devPortalFunc()">
 
     <img src="./assets/badge-dev.png" alt="developer-badge" width="10" height="10", class='badge' id='badge'>
@@ -539,6 +598,11 @@ <h4 class='username' id='username'> Test Account#0001</h4>
         <input class='btnUrl2 stuff items btnUrls' placeholder="Button Url 2" id='btnUrl2' value="" onclick="this.select()" onchange="RPCfunc()"></input>
         <button type="button" class="closeBtn" onclick="closeFunc(2)" id="closeBtn2" data-type="closeBtn">Close Menu</button>
     </div>
+    <div id='bannerMenu'>
+        <div class='bannerTxt'>Input a Custom Banner URL:</div>
+        <input class='btnUrl2 stuff items btnUrls' placeholder="Banner URL" id='bannerBtn' value="" onclick="this.select()" onchange="UploadBanner()"></input>
+        <button type="button" class="closeBtn" onclick="closeFunc(6)" id="closeBtn6" data-type="closeBtn">Close Menu</button>
+    </div>
     <div id='paimonMenu'>
         <div class='paimonTxt URL'>Edit Large Image:</div>
         <input class='largeImgTxt stuff items btnUrls' placeholder="Large Image Text" id='largeImgTxt' value="" onclick="this.select()" onchange="RPCfunc()"></input>
diff --git a/main.js b/main.js
@@ -69,6 +69,12 @@ const createWindow = () => {
             }
         }
 
+        const banner = () => {
+            let response = "Successfully opened banner GUI";
+            mainWindow.webContents.send('setCustomBanner', response);
+            console.log(response)
+        }
+
         const openSavesMenu = () => {
             mainWindow.webContents.send('enableSaves')
         }
@@ -81,6 +87,8 @@ const createWindow = () => {
                 { label: '╸Profiles╺', click: openSavesMenu},
             ]},
             { label: 'Separator',       type: 'separator'},
+            { label: '╸Upload Banner╺', click: banner },
+            { label: 'Separator',       type: 'separator'},
             { label: '╸Quit Gluta╺', role: 'quit' },
         ];
         tray.popUpContextMenu(Menu.buildFromTemplate(menu))
@@ -169,12 +177,12 @@ ipcMain.on('asynchronous-message', (event, arg) => {
         if (!btnUrl1Var.startsWith('https://')) {
             let errMsg = "Button 1 Url is not a real URL. It needs to start with 'https://'";
             console.log(errMsg);
-            event.sender.send('errMsgDtt', errMsg );
+            event.sender.send('errMsgDttAlert', errMsg );
             return;
         } else if (!btnUrl2Var.startsWith('https://')) {
             let errMsg = "Button 2 Url is not a real URL. It needs to start with 'https://'";
             console.log(errMsg);
-            event.sender.send('errMsgDtt', errMsg );
+            event.sender.send('errMsgDttAlert', errMsg );
             return;
         }
 
@@ -227,21 +235,22 @@ ipcMain.on('asynchronous-message', (event, arg) => {
         }
                     
         // sets the rich presence based on the "activity" object
-        client.on("ready", () => {
+        client.on("ready", (person) => {
             client.request("SET_ACTIVITY", {pid: process.pid, activity: activity});
             
             console.log("Successfully set Rich Presence!");
             // collects client information for setting avatar and username in preview
             if (!client.user) return
             let { id, username, discriminator, avatar } = client.user;
+
             const userData = {
                 avatarIcon: `https://cdn.discordapp.com/avatars/${id}/${avatar}.${avatar.startsWith('a_') ? 'gif' : 'png'}?size=160`,
                 userID: username,
                 userDisc: discriminator,
             }
             // send message to index.html
             event.sender.send('asynchronous-reply', userData );
-            console.log(userData);
+            console.log(client.user);
             
         
         });
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gluta",
   "productName": "Gluta",
-  "version": "1.6.53",
+  "version": "1.6.54",
   "description": "A discord Rich Presence script built for Genshin Impact made to be as easy as possible to use.",
   "main": "main.js",
   "scripts": {
@@ -41,19 +41,15 @@
   "config": {},
   "dependencies": {
     "@electron/remote": "^2.0.1",
-    "axios": "^0.25.0",
     "colorthief": "^2.3.2",
     "discord": "^0.8.2",
+    "discord-banner": "^1.6.7",
     "discord-rpc": "^4.0.1",
-    "discord.js": "^13.6.0",
-    "dominant-color": "^0.0.1",
     "electron-packager": "^15.4.0",
     "electron-squirrel-startup": "^1.0.0",
     "electron-util": "^0.17.2",
     "jshint": "^2.13.4",
-    "node-fetch": "^2.6.7",
-    "node-vibrant": "^3.2.1-alpha.1",
-    "vibrant": "^0.0.1"
+    "node-fetch": "^2.6.7"
   },
   "devDependencies": {
     "@electron-forge/cli": "^6.0.0-beta.63",
@@ -62,18 +58,13 @@
     "@electron-forge/maker-squirrel": "^6.0.0-beta.63",
     "@electron-forge/maker-zip": "^6.0.0-beta.63",
     "@electron/remote": "^2.0.1",
-    "axios": "^0.25.0",
     "colorthief": "^2.3.2",
     "discord": "^0.8.2",
     "discord-rpc": "^4.0.1",
-    "discord.js": "^13.6.0",
-    "dominant-color": "^0.0.1",
     "electron": "^19.0.6",
     "electron-builder": "^23.1.0",
     "electron-packager": "^15.4.0",
     "electron-squirrel-startup": "^1.0.0",
-    "electron-util": "^0.17.2",
-    "node-vibrant": "^3.2.1-alpha.1",
-    "vibrant": "^0.0.1"
+    "electron-util": "^0.17.2"
   }
 }
diff --git a/style.css b/style.css
