From 55ad153d2bcbbd186e315eb82d1583f9eb7ea0d9 Mon Sep 17 00:00:00 2001 From: Index Date: Thu, 25 Apr 2024 17:04:38 -0500 Subject: [PATCH] 33 files changed - update + hoarders list - Added new feature: "Collectibles' Hoarders List" [ IMPROVEMENTS ] - Reorganized resources folder to be in the root directory rather than a sub-folder of the javascript folder - Added a new feature: "Quick Library Downloads" - Basically finished the "Event Items Store Category" feature - Added more manifest.json information --- css/popup.css | 60 ---- css/specific.css | 34 ++- icon-update.png => icons/icon-update.png | Bin icon.png => icons/icon.png | Bin js/account/avatar-sandbox.js | 2 +- js/account/avatar-sandbox2.js | 2 +- js/account/home.js | 2 +- js/account/profile.js | 69 ++--- js/account/transactions.js | 4 +- js/background.js | 31 +++ js/debug.js | 2 +- js/everywhere.js | 12 +- js/forum/forum-view.js | 2 +- js/guilds.js | 2 +- js/library-download.js | 59 ++++ js/op-comments.js | 3 +- js/places/place-view.js | 81 +++--- js/places/places.js | 5 + js/store/item-view.js | 260 ++++++++++++++++-- js/store/store.js | 251 ++++++++++++----- manifest.json | 26 +- .../avatar-sandbox.html | 0 {js/resources => resources}/currencies.json | 0 resources/registerTooltips.js | 3 + {js/resources => resources}/utils.js | 21 +- settings.html | 23 +- settings.js | 6 +- 27 files changed, 693 insertions(+), 267 deletions(-) delete mode 100755 css/popup.css rename icon-update.png => icons/icon-update.png (100%) rename icon.png => icons/icon.png (100%) create mode 100644 js/library-download.js rename {js/resources => resources}/avatar-sandbox.html (100%) rename {js/resources => resources}/currencies.json (100%) create mode 100644 resources/registerTooltips.js rename {js/resources => resources}/utils.js (77%) diff --git a/css/popup.css b/css/popup.css deleted file mode 100755 index 6e5f26a..0000000 --- a/css/popup.css +++ /dev/null @@ -1,60 +0,0 @@ -@font-face { - font-family: LexendRegular; - src: url('Lexend-Regular.ttf'); -} - -@font-face { - font-family: LexendLight; - src: url('Lexend-Light.ttf'); -} - -@font-face { - font-family: LexendBold; - src: url('Lexend-Bold.ttf'); -} - -@font-face { - font-family: LexendBlack; - src: url('Lexend-Black.ttf'); -} - -body { - margin: 0; - padding: 12px; - font-family: LexendRegular; - background-color: #242424; - color: white; -} - -.button { - border-radius: 20px; - background-color: #fff; - color: #424242; - width: 95%; - padding: 10px; - border: none; - font-weight: bold; - text-decoration: none; -} - -input { - border-radius: 20px; - background-color: #fff; - color: #007bff; - width: 95%; - padding: 10px; - border: none; - font-weight: bold; -} - -h1,.h1 { - font-family: LexendBlack; -} - -h2,.h2 { - font-family: LexendBold; -} - -hr { - border-color: transparent; -} \ No newline at end of file diff --git a/css/specific.css b/css/specific.css index 04c7eca..2403149 100755 --- a/css/specific.css +++ b/css/specific.css @@ -1,3 +1,7 @@ +/* + FRONTEND FIXES / SPACING IMPROVEMENTS +*/ + body[data-URL^="/my/friends"] .col-lg-3 { margin-bottom: 20px; } @@ -14,4 +18,32 @@ body[data-URL^="/create/"] .col.d-flex.align-content-between.flex-wrap { white-space: nowrap !important; overflow: hidden !important; text-overflow: ellipsis !important; -} \ No newline at end of file +} + +/* ------------------------------------------ */ + +/* + INLINE EDITING +*/ + +body[data-polyplus-inlineEditing="true"] .polyplus-inlineEditing-visible {display: block !important;} +.polyplus-inlineEditing-visible {display: none;} + +body[data-polyplus-inlineEditing="true"] .polyplus-inlineEditing-hidden {display: none !important;} +.polyplus-inlineEditing-hidden {display: block;} + +/* ------------------------------------------ */ + +/* + MODALS +*/ + +html:has(.polyplus-modal[open]), body:has(.polyplus-modal[open]) { + overflow: hidden; +} + +.polyplus-modal::backdrop { + background: rgba(0, 0, 0, 0.73); +} + +/* ------------------------------------------ */ \ No newline at end of file diff --git a/icon-update.png b/icons/icon-update.png similarity index 100% rename from icon-update.png rename to icons/icon-update.png diff --git a/icon.png b/icons/icon.png similarity index 100% rename from icon.png rename to icons/icon.png diff --git a/js/account/avatar-sandbox.js b/js/account/avatar-sandbox.js index 9615f8b..6f6cb10 100755 --- a/js/account/avatar-sandbox.js +++ b/js/account/avatar-sandbox.js @@ -42,7 +42,7 @@ let ItemCardContents = ` if (new URLSearchParams(new URL(window.location).search).get('sandbox') === 'true') { console.log('Avatar Sandbox!') - LoadFile(chrome.runtime.getURL('js/resources/avatar-sandbox.html'), function(html){ + LoadFile(chrome.runtime.getURL('resources/avatar-sandbox.html'), function(html){ PageContainer.innerHTML = html ItemGrid = document.getElementById('inventory') Wearing = document.getElementById('wearing') diff --git a/js/account/avatar-sandbox2.js b/js/account/avatar-sandbox2.js index d248088..9a1a070 100755 --- a/js/account/avatar-sandbox2.js +++ b/js/account/avatar-sandbox2.js @@ -27,7 +27,7 @@ let Avatar = { if (new URLSearchParams(new URL(window.location).search).get('sandbox') === 'true') { console.log('Avatar Sandbox!') - LoadFile(chrome.runtime.getURL('js/resources/avatar-sandbox.html'), function(html){ + LoadFile(chrome.runtime.getURL('resources/avatar-sandbox.html'), function(html){ PageContainer.innerHTML = html ItemGrid = document.getElementById('inventory') Wearing = document.getElementById('wearing') diff --git a/js/account/home.js b/js/account/home.js index af83351..30c908b 100755 --- a/js/account/home.js +++ b/js/account/home.js @@ -172,7 +172,7 @@ SecondaryColumn.insertBefore(NewTitle, SecondaryColumn.children[0]); async function IRLPrice() { (async () => { - Utilities = await import(chrome.runtime.getURL('/js/resources/utils.js')); + Utilities = await import(chrome.runtime.getURL('resources/utils.js')); Utilities = Utilities.default const TrendingItems = document.getElementById('home-trendingItems') diff --git a/js/account/profile.js b/js/account/profile.js index e93f746..0a50e1a 100755 --- a/js/account/profile.js +++ b/js/account/profile.js @@ -10,41 +10,46 @@ let CalculateButton; let Utilities; if (UserID && !isNaN(UserID)) { - chrome.storage.sync.get(['PolyPlus_Settings'], function(result) { - Settings = result.PolyPlus_Settings || {} - - if (Settings.IRLPriceWithCurrencyOn === true) { - (async () => { - Utilities = await import(chrome.runtime.getURL('/js/resources/utils.js')); - Utilities = Utilities.default + (async () => { + Utilities = await import(chrome.runtime.getURL('resources/utils.js')); + Utilities = Utilities.default + + chrome.storage.sync.get(['PolyPlus_Settings'], function(result) { + Settings = result.PolyPlus_Settings || {} + if (Settings.IRLPriceWithCurrencyOn === true) { IRLPrice() - })(); - } - - if (Settings.BestFriendsOn === true) { - BestFriends() - } + } + + if (Settings.BestFriendsOn === true) { + BestFriends() + } - if (Settings.OutfitCostOn === true) { - CalculateButton = document.createElement('small') - CalculateButton.classList = 'fw-normal text-success' - CalculateButton.style.letterSpacing = '0px' - CalculateButton.innerHTML = ` - $ calculate - ` - AvatarHeading.appendChild(CalculateButton) - - let Calculating = false - CalculateButton.addEventListener('click', function(){ - if (Calculating === false) { - Calculating = true - CalculateButton.innerText = '$ Calculating...' - OutfitCost() - } - }); - } - }); + if (Settings.OutfitCostOn === true) { + CalculateButton = document.createElement('small') + CalculateButton.classList = 'fw-normal text-success' + CalculateButton.style.letterSpacing = '0px' + CalculateButton.setAttribute('data-bs-toggle', 'tooltip') + CalculateButton.setAttribute('data-bs-title', 'Calculate this avatar\'s cost!') + CalculateButton.setAttribute('data-bs-placement', 'right') + CalculateButton.innerHTML = ` + $ calculate + ` + AvatarHeading.appendChild(CalculateButton) + + Utilities.InjectResource('registerTooltips') + + let Calculating = false + CalculateButton.addEventListener('click', function(){ + if (Calculating === false) { + Calculating = true + CalculateButton.innerText = '$ Calculating...' + OutfitCost() + } + }); + } + }); + })(); const AvatarIFrame = document.querySelector('[src^="/ptstatic"]') const DropdownMenu = document.getElementsByClassName('dropdown-menu dropdown-menu-right')[0] diff --git a/js/account/transactions.js b/js/account/transactions.js index ce475ec..8551bc0 100755 --- a/js/account/transactions.js +++ b/js/account/transactions.js @@ -1,7 +1,7 @@ /* let Currencies; -LoadFile(chrome.runtime.getURL('js/resources/currencies.json'), function(text){ +LoadFile(chrome.runtime.getURL('resources/currencies.json'), function(text){ Currencies = JSON.parse(text) console.log(new Date(Currencies.Date).toLocaleDateString("en-US", {day:"numeric",month:"long",year:"numeric"}), Currencies) }) @@ -9,7 +9,7 @@ LoadFile(chrome.runtime.getURL('js/resources/currencies.json'), function(text){ let Utilities; (async () => { - Utilities = await import(chrome.runtime.getURL('/js/resources/utils.js')); + Utilities = await import(chrome.runtime.getURL('resources/utils.js')); Utilities = Utilities.default })(); diff --git a/js/background.js b/js/background.js index bd95f2f..2d079c7 100755 --- a/js/background.js +++ b/js/background.js @@ -1,6 +1,14 @@ const Manifest = chrome.runtime.getManifest() const SettingsURL = chrome.runtime.getURL('settings.html') +/* +ON INSTALL: + +chrome.runtime.onInstalled.addListener(() => { + chrome.tabs.create({url: 'https://polyplus.vercel.app/app/welcome.html'}) +}); +*/ + // WHEN CLICKING ON EXTENSION ICON OPEN THE SETTINGS PAGE chrome.action.onClicked.addListener((tab) => { chrome.tabs.create({ active: true, url: SettingsURL }); @@ -143,6 +151,20 @@ chrome.contextMenus.onClicked.addListener(function (info, tab){ } }); +chrome.runtime.onMessage.addListener(function (message, sender) { + console.log('hi') + message = message.message || '' + console.log(message) + if (message === 'tooltip') { + console.log('is about tooltip') + chrome.scripting + .executeScript({ + target: {tabId: sender.tab.id}, + func: UpdateTooltips + }) + } +}); + /* GREEN LOGO WHEN EXTENSION APPLIES TO CURRENT TAB PAGE, RED WHEN IT DOESN'T COMING SOON @@ -196,4 +218,13 @@ function CopyAvatarHash(hash) { .catch(() => { alert('Failure to copy avatar hash.') }); +} + +function UpdateTooltips() { + const Script = document.createElement('script') + Script.innerHTML = ` + const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]') + const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl)) + ` + document.body.appendChild(Script) } \ No newline at end of file diff --git a/js/debug.js b/js/debug.js index 1a8be14..536c121 100644 --- a/js/debug.js +++ b/js/debug.js @@ -155,7 +155,7 @@ document.getElementById('edit-setting').addEventListener('click', function(){ }); document.getElementById('reset-settings').addEventListener('click', async function(){ - let Utilities = await import(chrome.runtime.getURL('/js/resources/utils.js')) + let Utilities = await import(chrome.runtime.getURL('resources/utils.js')) Utilities = Utilities.default chrome.storage.sync.set({ 'PolyPlus_Settings': Utilities.DefaultSettings }, function() { alert('Successfully reset settings to their defaults!') diff --git a/js/everywhere.js b/js/everywhere.js index 0bf5814..7c09795 100755 --- a/js/everywhere.js +++ b/js/everywhere.js @@ -1,16 +1,8 @@ var Settings; -let Theme = ` -html:has(.polyplus-modal[open]), body:has(.polyplus-modal[open]) { - overflow: hidden; -} - -.polyplus-modal::backdrop { - background: rgba(0, 0, 0, 0.73); -} -`; +let Theme = null; (async () => { - let Utilities = await import(chrome.runtime.getURL('/js/resources/utils.js')); + let Utilities = await import(chrome.runtime.getURL('resources/utils.js')); Utilities = Utilities.default chrome.storage.sync.get(["PolyPlus_Settings"], function(result) { diff --git a/js/forum/forum-view.js b/js/forum/forum-view.js index 8a523b3..e3dd2a5 100644 --- a/js/forum/forum-view.js +++ b/js/forum/forum-view.js @@ -24,7 +24,7 @@ function ForumMentions() { let match; while ((match = Regex.exec(text.innerText)) !== null) { const Username = match[0].substring(1) - FormattedText = FormattedText.replaceAll(match[0], `${match[0]}`) + FormattedText = FormattedText.replaceAll(match[0], `${match[0]}`) } text.innerHTML = FormattedText } diff --git a/js/guilds.js b/js/guilds.js index b0e8d1e..95ba4c3 100644 --- a/js/guilds.js +++ b/js/guilds.js @@ -8,7 +8,7 @@ chrome.storage.sync.get(['PolyPlus_Settings'], function(result){ if (Settings.IRLPriceWithCurrencyOn === true) { (async () => { - Utilities = await import(chrome.runtime.getURL('/js/resources/utils.js')); + Utilities = await import(chrome.runtime.getURL('resources/utils.js')); Utilities = Utilities.default for (let item of Array.from(StoreItems.children)) { diff --git a/js/library-download.js b/js/library-download.js new file mode 100644 index 0000000..eb88866 --- /dev/null +++ b/js/library-download.js @@ -0,0 +1,59 @@ +const AssetID = window.location.pathname.split('/')[2] +const LibraryType = document.querySelectorAll('ol a')[1].innerText +const LibraryTypes = [ + "Models", + "Audio", + "Decal", + "Mesh" +] + +var Success = true; + +if (LibraryTypes.indexOf(LibraryType) !== -1) { + chrome.storage.sync.get(['PolyPlus_Settings'], function(result){ + Settings = result.PolyPlus_Settings || {}; + + if (Settings.LibraryDownloadsOn === false) { return } + + const Dropdown = document.querySelector('#app div[style] .dropdown-menu li') + + const DownloadLink = document.createElement('a') + DownloadLink.classList = 'dropdown-item text-warning' + DownloadLink.href = '#' + DownloadLink.innerHTML = ` Download` + Dropdown.insertBefore(DownloadLink, Dropdown.children[Dropdown.children.length-1]) + + switch(LibraryType) { + case 'Models': + DownloadLink.href = 'https://api.polytoria.com/v1/models/get-model?id=' + AssetID + break + case 'Audio': + const AudioBlob = new Blob([document.getElementsByTagName('audio')[0]], {type: 'octet-steam'}) + DownloadLink.href = URL.createObjectURL(AudioBlob) + DownloadLink.download = document.getElementsByTagName('h1')[0].innerText + '.mp3' + case 'Decal': + const DecalBlob = new Blob([document.getElementsByClassName('store-thumbnail')[0]], {type: 'image/png'}) + DownloadLink.href = URL.createObjectURL(DecalBlob) + DownloadLink.download = document.getElementsByTagName('h1')[0].innerText + '.png' + break + } + + if (LibraryType === 'Mesh') { + let MeshURL = null + DownloadLink.addEventListener('click', async function(){ + if (MeshURL !== null) { return } + MeshURL = await fetch('https://api.polytoria.com/v1/assets/serve-mesh/' + AssetID) + MeshURL = await MeshURL.json() + + if (MeshURL.success === true) { + DownloadLink.href = MeshURL.url + DownloadLink.download = document.getElementsByTagName('h1')[0].innerText + '.glb' + + DownloadLink.click() + } else { + alert('Failure to fetch .glb file for mesh') + } + }) + } + }); +} \ No newline at end of file diff --git a/js/op-comments.js b/js/op-comments.js index 053f93d..253fa32 100755 --- a/js/op-comments.js +++ b/js/op-comments.js @@ -48,8 +48,9 @@ function LoadCreatorTag(element) { Tag.style.marginLeft = '5px' Tag.style.verticalAlign = 'text-top' Tag.innerText = 'CREATOR' + if (Type === 'guilds') { Tag.innerText = 'LEADER' } NameElement.appendChild(Tag) - //console.log(window.bootstrap) + //new window.bootstrap.Tooltip(Tag, {toggle:"tooltip",title:"This user is the creator of this asset!"}) } } \ No newline at end of file diff --git a/js/places/place-view.js b/js/places/place-view.js index 677246e..524cad5 100644 --- a/js/places/place-view.js +++ b/js/places/place-view.js @@ -12,7 +12,9 @@ let InfoColumns = document.querySelectorAll('#main-content .col:has(#likes-data- let CalculateRevenueButton; const AchievementsTab = document.getElementById('achievements-tabpane') -const Achievements = Array.from(AchievementsTab.getElementsByClassName('card')) +const GamepassesTab = document.getElementById('gamepasses-tabpane') +const Achievements = Array.from(AchievementsTab.getElementsByClassName('card')) || [] +const Gamepasses = Array.from(GamepassesTab.getElementsByClassName('card')) || [] !(() => { if (PlaceID === undefined) { return } @@ -42,30 +44,29 @@ const Achievements = Array.from(AchievementsTab.getElementsByClassName('card')) chrome.storage.sync.get(['PolyPlus_Settings'], async function(result) { Settings = result.PolyPlus_Settings || {} + + Utilities = await import(chrome.runtime.getURL('resources/utils.js')); + Utilities = Utilities.default if (Settings.PinnedGamesOn === true) { PinnedGames() } - // Work in Progress - if (Settings.InlineEditingOn === true) { + if (Settings.InlineEditingOn === true && GameCreator === UserID) { InlineEditing() } - // Work in Progress - /* - if (Settings.GameProfilesOn === true) { - GameProfiles() + const Description = document.querySelector('.col:has(#likes-data-container) .card.mcard.mb-2 .card-body.p-3.small') + if (Settings.GameProfilesOn === true && Description !== null) { + const GameProfileRegex = /p\+gp;(#(?:[A-Fa-f0-9]{3}){1,2}\b(;#(?:[A-Fa-f0-9]{3}){1,2}\b)+)/gm + if (GameProfileRegex.test(Description.innerText)) { + const Info = GameProfileRegex.exec(Description.innerText)[1].split(';') + GameProfile(Info) + } } - */ if (Settings.IRLPriceWithCurrencyOn === true) { - (async () => { - Utilities = await import(chrome.runtime.getURL('/js/resources/utils.js')); - Utilities = Utilities.default - - IRLPrice() - })(); + IRLPrice() } if (Settings.ShowPlaceRevenueOn === true) { @@ -108,22 +109,7 @@ const Achievements = Array.from(AchievementsTab.getElementsByClassName('card')) async function PinnedGames() { chrome.storage.sync.get(['PolyPlus_PinnedGames'], function(result){ PinnedGamesData = result.PolyPlus_PinnedGames || []; - /* - const PinBtn = document.createElement('button'); - PinBtn.classList = 'btn btn-warning btn-sm'; - PinBtn.style = 'position: absolute; right: 0; margin-right: 7px;' - - if (PinnedGamesData[PlaceID]) { - PinBtn.innerHTML = ' Un-pin'; - } else { - if (PinnedGames.length !== 5) { - PinBtn.innerHTML = ' Pin' - } else { - PinBtn.setAttribute('disabled', true) - PinBtn.innerHTML = ' Pin (max 5/5)' - } - } - */ + const PinBtn = document.createElement('button'); PinBtn.classList = 'btn btn-warning btn-sm'; PinBtn.style = 'position: absolute; right: 0; margin-right: 7px;' @@ -131,11 +117,11 @@ async function PinnedGames() { if (PinnedGamesData.includes(parseInt(PlaceID))) { PinBtn.innerHTML = ' Un-pin'; } else { - if (PinnedGamesData.length !== 5) { + if (PinnedGamesData.length !== Utilities.Limits.PinnedGames) { PinBtn.innerHTML = ' Pin' } else { PinBtn.setAttribute('disabled', true) - PinBtn.innerHTML = ' Pin (max 5/5)' + PinBtn.innerHTML = ` Pin (max ${Utilities.Limits.PinnedGames}/${Utilities.Limits.PinnedGames})` } } @@ -197,12 +183,12 @@ async function PinnedGames() { if (PinnedGamesData.includes(parseInt(PlaceID))) { PinBtn.innerHTML = ' Un-pin' } else { - if (PinnedGamesData.length !== 5) { + if (PinnedGamesData.length !== Utilities.Limits.PinnedGames) { PinBtn.removeAttribute('disabled') PinBtn.innerHTML = ' Pin' } else { PinBtn.setAttribute('disabled', true) - PinBtn.innerHTML = ' Pin (max 5/5)' + PinBtn.innerHTML = ` Pin (max ${Utilities.Limits.PinnedGames}/${Utilities.Limits.PinnedGames})` } } }); @@ -212,14 +198,11 @@ async function PinnedGames() { } async function InlineEditing() { - // Fix description editing - // Make it possible to edit description even if the game doesn't initially have a description - // Add the ability to edit the game's genre - // Improve editing visuals overall - - if (GameCreator !== UserID) { - return - } + /* + INLINE EDITING TO-DO: + - Make it possible to edit the description even if there is no description initially + - Make it possible to edit the place's genre + */ let Editing = false @@ -344,9 +327,7 @@ async function InlineEditing() { }); } -async function GameProfiles(data) { - return - data = Data +async function GameProfile(data) { document.querySelector('h1.my-0') .setAttribute('game-key', 'true'); document.querySelector('div[style="min-height: 60vh;"]') @@ -356,16 +337,16 @@ async function GameProfiles(data) { Style.innerHTML = ` div#app { - background: ${Data.bg} !important; + background: ${data[0]} !important; } #gameprofile { - /*font-family: ${Data.font} !important;*/ - color: ${Data.text} !important; + /*font-family: no !important;*/ + color: ${data[4]} !important; } #gameprofile .card { - --bs-card-bg: ${Data.cardBg}; + --bs-card-bg: ${data[3]}; } /* @@ -376,7 +357,7 @@ async function GameProfiles(data) { */ #gameprofile .card.mcard [game-key] { - background: linear-gradient(to bottom, ${Data.accent}, ${Data.secondary}); + background: linear-gradient(to bottom, ${data[1]}, ${data[2]}); background-clip: text; -webkit-background-clip: text; -webkit-text-fill-color: transparent; diff --git a/js/places/places.js b/js/places/places.js index 01717ec..b6ac1f5 100644 --- a/js/places/places.js +++ b/js/places/places.js @@ -1,3 +1,8 @@ +/* + THIS FILE DOES NOT RUN + IT WAS ADDED WHILE I CONSIDER WHETHER OR NOT TO ADD PINNED GAMES TO THE MAIN PLACES PAGE +*/ + let Settings; let PinnedGamesData; diff --git a/js/store/item-view.js b/js/store/item-view.js index 34fbe21..1476081 100755 --- a/js/store/item-view.js +++ b/js/store/item-view.js @@ -23,7 +23,7 @@ var ItemOwned; (async () => { if (!(window.location.href.split('/')[4]) || ItemType === "achievement") {return} - Utilities = await import(chrome.runtime.getURL('/js/resources/utils.js')); + Utilities = await import(chrome.runtime.getURL('resources/utils.js')); Utilities = Utilities.default chrome.storage.sync.get(['PolyPlus_Settings'], async function(result){ @@ -56,6 +56,10 @@ var ItemOwned; Sales.children[1].innerText = Owners.toLocaleString() } } + + if (Settings.HoardersListOn === true && document.getElementById('resellers') !== null) { + HoardersList() + } }) })(); @@ -179,12 +183,6 @@ function TryOnItems() { } let AssetType = document.querySelector('.px-4.px-lg-0.text-muted.text-uppercase.mb-3 .badge').innerHTML - console.log(AssetType, MeshTypes[AssetType], MeshTypes[AssetType.toLowerCase()]) - /* - if (HatTypes[AssetType.toLowerCase()] !== undefined) { - AssetType = "hat" - } - */ const ItemThumbnail = document.getElementsByClassName('store-thumbnail')[0] const IFrame = document.getElementsByClassName('store-thumbnail-3d')[0] @@ -194,6 +192,8 @@ function TryOnItems() { const TryOnBtn = document.createElement('button') TryOnBtn.classList = 'btn btn-outline-warning' TryOnBtn.style = 'position: absolute; bottom: 60px; right: 10px;' + TryOnBtn.setAttribute('data-bs-toggle', 'tooltip') + TryOnBtn.setAttribute('data-bs-title', 'Try this item on your avatar') TryOnBtn.innerHTML = '' TryOnBtn.addEventListener('click', function (){ TryOnModal.showModal() @@ -205,7 +205,7 @@ function TryOnItems() { TryOnModal.innerHTML = `
Preview
- Try on this item! + Try this avatar on your avatar before purchasing it!
@@ -215,6 +215,8 @@ function TryOnItems() { document.body.prepend(TryOnModal) ItemThumbnail.parentElement.appendChild(TryOnBtn) TryOnModal.children[1].prepend(TryIFrame) + + Utilities.InjectResource('registerTooltips') fetch("https://api.polytoria.com/v1/users/:id/avatar".replace(':id', JSON.parse(window.localStorage.getItem('account_info')).ID)) .then(response => { @@ -282,15 +284,15 @@ function TryOnItems() { }) .then(data => { switch (AssetType) { - case 'shirt': - Avatar.shirt = data.url - break - case 'pants': - Avatar.pants = data.url - break - case 'face': - Avatar.face = data.url - break + case 'shirt': + Avatar.shirt = data.url + break + case 'pants': + Avatar.pants = data.url + break + case 'face': + Avatar.face = data.url + break } TryIFrame.src = 'https://polytoria.com/ptstatic/itemview/#' + btoa(encodeURIComponent(JSON.stringify(Avatar))) @@ -298,9 +300,229 @@ function TryOnItems() { .catch(error => { console.error('Fetch error:', error); }); - } + } }) .catch(error => { - console.error('Fetch error:', error); + console.error('Fetch error:', error); }); +} + +async function HoardersList() { + let Page = 0 + const Tabs = document.getElementById('store-tabs') + const Owners = (await (await fetch('https://api.polytoria.com/v1/store/' + ItemID + '/owners?limit=100')).json()).inventories + const Formatted = {} + + for (let owner of Owners) { + if (Formatted[owner.user.id] !== undefined) { + Formatted[owner.user.id].copies++ + Formatted[owner.user.id].serials.push(owner.serial) + } else { + Formatted[owner.user.id] = { + user: owner.user, + copies: 1, + serials: [owner.serial] + } + } + } + + const Hoarders = new Promise(async (resolve, reject) => { + const Sorted = Object.values(Formatted).filter((x, index) => x.copies >= 2).sort((a, b) => b.copies - a.copies) + for (let hoarder of Sorted) { + const Avatar = (await (await fetch('https://api.polytoria.com/v1/users/' + hoarder.user.id)).json()).thumbnail.icon; + hoarder.user.avatar = Avatar; + if (Sorted.indexOf(hoarder) === Sorted.length-1) { resolve(Sorted) } + } + }) + Hoarders.then(async (hoarders) => { + const AmountOfHoarders = hoarders.length + const Groups = [] + + while (hoarders.length > 0) { + Groups.push(hoarders.splice(0, 4)) + } + + const Tab = document.createElement('li') + Tab.classList = 'nav-item' + Tab.innerHTML = ` + + + Hoarders (${AmountOfHoarders}) + + ` + Tabs.appendChild(Tab) + + const TabContent = document.createElement('div') + TabContent.classList = 'd-none' + TabContent.innerHTML = ` +
+ ${ Groups[Page].map((x) => ` +
+
+
+
+ ${x.user.username} +
+
+
+
+ ${x.user.username} +
+ ${x.copies} Copies +
+
+
+ + + Trade + +
+
+
+
+ `).join('') + } +
+ + ` + document.getElementById('owners').parentElement.appendChild(TabContent) + + Utilities.InjectResource('registerTooltips') + + Array.from(Tabs.children).forEach(tab => { + tab.addEventListener('click', function() { + if (tab === Tab) { + Array.from(Tabs.children).forEach(tab => {tab.children[0].classList.remove('active')}) + Array.from(document.getElementById('owners').parentElement.children).forEach(tab => {tab.classList.add('d-none')}) + tab.children[0].classList.add('active') + TabContent.classList.remove('d-none') + } + }) + }) + + const Container = document.getElementById('hoarders-container') + + const Prev = document.getElementById('hoarders-prev-pg') + const Current = document.getElementById('hoarders-current-pg') + const Next = document.getElementById('hoarders-next-pg') + + if (Page > 0) { + Prev.parentElement.classList.remove('disabled') + } else { + Prev.parentElement.classList.add('disabled') + } + if (Page < Groups.length-1) { + Next.parentElement.classList.remove('disabled') + } else { + Next.parentElement.classList.add('disabled') + } + + Prev.addEventListener('click', function() { + if (Page > 0) { + Page-- + Current.innerText = Page+1 + Container.innerHTML = Groups[Page].map((x) => ` +
+
+
+
+ ${x.user.username} +
+
+
+
+ ${x.user.username} +
+ ${x.copies} Copies +
+
+
+ + + Trade + +
+
+
+
+ `).join('') + + Utilities.InjectResource('registerTooltips') + + if (Page > 0) { + Prev.parentElement.classList.remove('disabled') + } else { + Prev.parentElement.classList.add('disabled') + } + if (Page < Groups.length-1) { + Next.parentElement.classList.remove('disabled') + } else { + Next.parentElement.classList.add('disabled') + } + } + }) + + Next.addEventListener('click', function() { + if (Page < Groups.length-1) { + Page++ + Current.innerText = Page+1 + Container.innerHTML = Groups[Page].map((x) => ` +
+
+
+
+ ${x.user.username} +
+
+
+
+ ${x.user.username} +
+ ${x.copies} Copies +
+
+
+ + + Trade + +
+
+
+
+ `).join('') + + Utilities.InjectResource('registerTooltips') + + if (Page > 0) { + Prev.parentElement.classList.remove('disabled') + } else { + Prev.parentElement.classList.add('disabled') + } + if (Page < Groups.length-1) { + Next.parentElement.classList.remove('disabled') + } else { + Next.parentElement.classList.add('disabled') + } + } + }) + }) } \ No newline at end of file diff --git a/js/store/store.js b/js/store/store.js index c26fff6..955d1ce 100755 --- a/js/store/store.js +++ b/js/store/store.js @@ -1,19 +1,22 @@ const ItemID = window.location.pathname.split('/')[2] const UserID = JSON.parse(window.localStorage.getItem('account_info')).ID const ItemGrid = document.getElementById('assets') +const Categories = document.getElementById('store-categories').children[0] var Settings; var Inventory = null; var Utilities; -(async () => { - Utilities = await import(chrome.runtime.getURL('/js/resources/utils.js')); + +let EventItemsShown = false + +chrome.storage.sync.get(['PolyPlus_Settings'], async function(result){ + Settings = result.PolyPlus_Settings || {}; + + Utilities = await import(chrome.runtime.getURL('resources/utils.js')); Utilities = Utilities.default Update() -})(); - - -chrome.storage.sync.get(['PolyPlus_Settings'], function(result){ Settings = result.PolyPlus_Settings || Utilities.DefaultSettings; }); +}); async function Update() { if (Settings.IRLPriceWithCurrencyOn === true) { @@ -30,16 +33,35 @@ async function Update() { } if (Settings.EventItemsCatOn === true) { + console.log('is event yay!!') EventItems() } } +let UpdateCount = 0 const observer = new MutationObserver(async function (list){ + UpdateCount++ + console.log(Settings.EventItemsCatOn, document.getElementById('event-items-pagination'), EventItemsShown, UpdateCount) + if (Settings.EventItemsCatOn === true) { + if (document.getElementById('event-items-pagination') === null) { + ItemGrid.classList.add('itemgrid') + document.getElementById('pagination').style.display = 'block' + document.getElementById('storecat-eventitems').checked = false + } else { + ItemGrid.classList.remove('itemgrid') + document.getElementById('pagination').style.display = 'none' + } + } for (const record of list) { for (const element of record.addedNodes) { if (element.tagName === "DIV" && element.classList.value === 'mb-3 itemCardCont') { - if (Settings.IRLPriceWithCurrencyOn === true) { LoadIRLPrices(element) } - if (Settings.StoreOwnTagOn === true) { LoadOwnedTags(element) } + if (Settings.IRLPriceWithCurrencyOn === true) { + LoadIRLPrices(element) + } + + if (Settings.StoreOwnTagOn === true && Inventory !== null) { + LoadOwnedTags(element) + } } } observer.observe(ItemGrid, {attributes: false,childList: true,subtree: false}); @@ -49,32 +71,33 @@ const observer = new MutationObserver(async function (list){ observer.observe(ItemGrid, {attributes: false,childList: true,subtree: false}); async function LoadIRLPrices(element) { - //if (element.tagName !=) - //if (element.tagName != "DIV") {return} - if (element.querySelector('small.text-primary')) {return} + if (element.tagName != "DIV" || element.querySelector('small.text-primary')) {return} const Parent = element.getElementsByTagName('small')[1] - if (Parent.innerText === "") { return } - const Span = document.createElement('span') - Span.classList = 'text-muted polyplus-price-tag' - Span.style.fontSize = '0.7rem' - const Price = Parent.innerText.split(' ')[1] - const IRLResult = await Utilities.CalculateIRL(Price, Settings.IRLPriceWithCurrencyCurrency) - Span.innerText = "($" + IRLResult.result + " " + IRLResult.display + ")" - Parent.appendChild(Span) + if (Parent.innerText !== "") { + const Span = document.createElement('span') + Span.classList = 'text-muted polyplus-price-tag' + Span.style = 'font-size: 0.7rem; font-weight: lighter;' + const Price = Parent.innerText.split(' ')[1] + const IRLResult = await Utilities.CalculateIRL(Price, Settings.IRLPriceWithCurrencyCurrency) + Span.innerText = "($" + IRLResult.result + " " + IRLResult.display + ")" + Parent.appendChild(Span) + } } function LoadOwnedTags(element) { let Item = CheckInventory(parseInt(element.querySelector('[href^="/store/"]').getAttribute('href').split('/')[2])) if (Item !== null) { const Tag = document.createElement('span') - Tag.classList = 'badge bg-primary polyplus-own-tag' - Tag.style = 'position: absolute;font-size: 0.7rem;top: 0px;left: 0px;padding: 5.5px;border-top-left-radius: var(--bs-border-radius-lg)!important;border-top-right-radius: 0px;border-bottom-left-radius: 0px;font-size: 0.65rem;' - if (Item.asset.isLimited === false) { - Tag.innerText = "owned" - } else { - Tag.innerHTML = 'owned
#' + Item.serial - } + Tag.classList = `badge ${ (Item.asset.isLimited === false) ? 'bg-primary' : 'bg-warning' } polyplus-own-tag` + Tag.style = 'position: absolute;font-size: 0.9rem;top: 0px;left: 0px;padding: 5.5px;border-top-left-radius: var(--bs-border-radius-lg)!important;border-top-right-radius: 0px;border-bottom-left-radius: 0px;font-size: 0.65rem;' + Tag.innerHTML = "" element.getElementsByTagName('img')[0].parentElement.appendChild(Tag) + if (Item.asset.isLimited === true) { + Tag.setAttribute('data-bs-toggle', 'tooltip') + Tag.setAttribute('data-bs-title', '#' + Item.serial) + + Utilities.InjectResource('registerTooltips') + } } } @@ -89,8 +112,6 @@ function CheckInventory(id) { } function EventItems() { - const Categories = document.getElementById('store-categories').children[0] - const Selector = document.createElement('div') Selector.classList = 'form-check store-category-check fw-bold' Selector.style.borderColor = '#B008B0' @@ -100,26 +121,15 @@ function EventItems() { Event Items ` - Categories.appendChild(Selector) - const CategoryDiv = document.createElement('div') - ItemGrid.parentElement.insertBefore(CategoryDiv, ItemGrid) + Categories.appendChild(Selector) let EventData = null let Events = [] let Groups = [] - - Array.from(Categories.children).forEach(selector => { - if (selector !== Selector) { - selector.children[0].addEventListener('click', function() { - ItemGrid.innerHTML = `` - ItemGrid.classList.add('itemgrid') - }) - } - }) + let Page = 0 Selector.children[0].addEventListener('click', async function() { - EventItemsEnabled = true Array.from(Categories.children).forEach(selector => { selector.classList.remove('active') }) @@ -127,44 +137,137 @@ function EventItems() { if (EventData === null) { EventData = await (await fetch('https://polyplus.vercel.app/data/eventItems.json')).json() - Object.values(EventData.eventDetails).forEach((x, index) => {Groups.push({ + Object.values(EventData.eventDetails).forEach((x, index) => {Events.push({ ...x, items: EventData.items.filter((x) => x.event === Object.keys(EventData.eventDetails)[index]) })}) while (Events.length > 0) { - Groups.push(Events.splice(0, 3)) + Groups.push(Events.splice(0, 5)) } } - console.log(Groups) - ItemGrid.classList.remove('itemgrid') ItemGrid.innerHTML = ` - ${ - Groups.map((x, index) => ` -
-
-
${x.date}
-
${x.name}
-
-
-
-
-
- ${ +
+ ${ + Groups[Page].map((x, index) => ` +
+
+
${x.date}
+
${x.name}
+
+
+
+
+
+ ${ x.items.map((x) => ` -
-
- -
-
- ${x.name} -
-
-
-
- +
+
+ +
+
+ ${x.name} +
+
+
+
+ + `).join('') + } +
+
+
+ `).join('') + } +
+ +
+ +
+ ` + + const Container = document.getElementById('p+ei') + const Pagination = document.getElementById('event-items-pagination') + //const First = document.getElementById('p+ei-pagination-first') + const Prev = document.getElementById('p+ei-pagination-prev') + const Current = document.getElementById('p+ei-pagination-current') + const Next = document.getElementById('p+ei-pagination-next') + //const Last = document.getElementById('p+ei-pagination-last') + + if (Page > 0) { + Prev.parentElement.classList.remove('disabled') + } else { + Prev.parentElement.classList.add('disabled') + } + if (Page < Groups.length-1) { + Next.parentElement.classList.remove('disabled') + } else { + Next.parentElement.classList.add('disabled') + } + + Prev.addEventListener('click', function() { + if (Page > 0) { + Page-- + UpdateEventItems() + } + }) + + Next.addEventListener('click', function() { + if (Page < Groups.length-1) { + Page++ + UpdateEventItems() + } + }) + + const UpdateEventItems = function() { + Current.innerText = Page+1 + Container.innerHTML = Groups[Page].map((x, index) => ` +
+
+
${x.date}
+
${x.name}
+
+
+
+
+
+ ${ + x.items.map((x) => ` + +
+
+ +
+
+ ${x.name} +
+
+
+
+ `).join('') }
@@ -172,7 +275,17 @@ function EventItems() {
`).join('') + + if (Page > 0) { + Prev.parentElement.classList.remove('disabled') + } else { + Prev.parentElement.classList.add('disabled') + } + if (Page < Groups.length-1) { + Next.parentElement.classList.remove('disabled') + } else { + Next.parentElement.classList.add('disabled') + } } - ` }) } \ No newline at end of file diff --git a/manifest.json b/manifest.json index 65ea5bf..8aba014 100755 --- a/manifest.json +++ b/manifest.json @@ -1,9 +1,12 @@ { "manifest_version": 3, + "author": "Index", "name": "Poly+", "version": "1.11", "version_name": "Pre-Release Build (stable: v1.1.1)", "description": "Power-up your Polytoria experience with Poly+! Created by Index.", + "homepage_url": "https://polyplus.vercel.app/", + "download_url": "https://github.com/indexxing/PolyPlus/releases", "permissions": ["storage", "contextMenus", "tabs", "scripting", "alarms", "notifications"], "content_scripts": [ { @@ -114,6 +117,11 @@ { "matches": ["https://polytoria.com/guilds/**"], "js": ["/js/guilds.js"] + }, + + { + "matches": ["https://polytoria.com/store/**", "https://polytoria.com/models/**"], + "js": ["/js/library-download.js"] } ], "background": { @@ -125,7 +133,7 @@ ], "web_accessible_resources": [ { - "resources": ["js/resources/*"], + "resources": ["resources/*"], "matches": ["https://polytoria.com/*"] }, @@ -138,16 +146,16 @@ "action": { "default_title": "Poly+", "default_icon": { - "16": "/icon.png", - "32": "/icon.png", - "48": "/icon.png", - "128": "/icon.png" + "16": "/icons/icon.png", + "32": "/icons/icon.png", + "48": "/icons/icon.png", + "128": "/icons/icon.png" } }, "icons": { - "16": "/icon.png", - "32": "/icon.png", - "48": "/icon.png", - "128": "/icon.png" + "16": "/icons/icon.png", + "32": "/icons/icon.png", + "48": "/icons/icon.png", + "128": "/icons/icon.png" } } \ No newline at end of file diff --git a/js/resources/avatar-sandbox.html b/resources/avatar-sandbox.html similarity index 100% rename from js/resources/avatar-sandbox.html rename to resources/avatar-sandbox.html diff --git a/js/resources/currencies.json b/resources/currencies.json similarity index 100% rename from js/resources/currencies.json rename to resources/currencies.json diff --git a/resources/registerTooltips.js b/resources/registerTooltips.js new file mode 100644 index 0000000..4208c5d --- /dev/null +++ b/resources/registerTooltips.js @@ -0,0 +1,3 @@ +var tooltips = document.querySelectorAll('[data-bs-toggle="tooltip"]') +var list = [...tooltips].map(tool => new bootstrap.Tooltip(tool)) +console.log(document.currentScript) \ No newline at end of file diff --git a/js/resources/utils.js b/resources/utils.js similarity index 77% rename from js/resources/utils.js rename to resources/utils.js index f68971f..9867284 100644 --- a/js/resources/utils.js +++ b/resources/utils.js @@ -2,7 +2,7 @@ HOW TO USE IN CONTENT SCRIPTS: (async () => { - let Utilities = await import(chrome.runtime.getURL('/js/resources/utils.js')); + let Utilities = await import(chrome.runtime.getURL('resources/utils.js')); Utilities = Utilities.default })(); */ @@ -69,11 +69,14 @@ export default { ShowPlaceRevenueOn: true, ReplaceItemSalesOn: false }, + Limits: { + PinnedGames: 10 + }, CalculateIRL: async function(bricks, to, brickPackage) { /* Disabled for now: currency retrieval from currencies.json - const response = await fetch(chrome.runtime.getURL('/js/resources/currencies.json')) + const response = await fetch(chrome.runtime.getURL('resources/currencies.json')) if (!response.ok) { throw new Error('Getting currency data failure') } @@ -141,5 +144,19 @@ export default { result: Result, display: Display } + }, + InjectResource: function(path, element) { + // Function by devjin0617 on GitHub + // Gist: https://gist.github.com/devjin0617/3e8d72d94c1b9e69690717a219644c7a + // Slightly modified to use constants and fit the rest of the code style more + // Function only used for registering bootstrap tooltips currently + + if (element === undefined) { element = 'body' } + const Node = document.getElementsByTagName(element)[0]; + const Script = document.createElement('script'); + Script.setAttribute('type', 'text/javascript'); + Script.setAttribute('src', chrome.runtime.getURL('resources/' + path + '.js')); + Script.addEventListener('load', function(){Script.remove()}) + Node.appendChild(Script); } } diff --git a/settings.html b/settings.html index b190e31..21c6b33 100755 --- a/settings.html +++ b/settings.html @@ -50,6 +50,7 @@ p span.title { font-size: 1.4rem; + font-weight: lighter; } span.desc { @@ -319,7 +320,7 @@
-

Poly+ Settings

+

Poly+ Settings

  @@ -530,12 +531,29 @@
Replace the "Sales" statistic with the "Owners" statistic if the item has 0 sales (most likely meaning it is an item awarded by staff).

+

+   + + Collectibles' Hoarders List + + +
+ List all the users that have more than 1 copy of a collectible! +

+

+   + + Quick Library Downloads + + +
+ Quickly download a model (as a .ptmd file), mesh, decal, or sound right from the page showing you details about the asset! +

EXPERIMENTAL SETTINGS

These features are a work in progress.

-

  diff --git a/settings.js b/settings.js index f46b4a5..4b6adef 100755 --- a/settings.js +++ b/settings.js @@ -6,7 +6,7 @@ var ExpectedSettings; var Utilities; (async () => { - Utilities = await import(chrome.runtime.getURL('/js/resources/utils.js')); + Utilities = await import(chrome.runtime.getURL('resources/utils.js')); Utilities = Utilities.default ExpectedSettings = Utilities.DefaultSettings @@ -237,7 +237,7 @@ let CopyThemeJSONBtn = document.getElementById('CopyThemeJSONBtn') LoadThemeFromJSONBtn.addEventListener('click', function(){ LoadThemeJSON(LoadThemeFromJSONBtn.previousElementSibling.value) }); -document.getElementById('ThemeCreator').getElementsByTagName('button')[1].addEventListener('click', function(){ +document.getElementById('theme-creator').getElementsByTagName('button')[1].addEventListener('click', function(){ SaveThemeToJSONInput.value = JSON.stringify(Settings.ThemeCreator) }); CopyThemeJSONBtn.addEventListener('click', function(){ @@ -333,7 +333,7 @@ function CheckForUpdates() { } CheckForUpdatesButton.addEventListener('click', CheckForUpdates) -fetch(chrome.runtime.getURL('/js/resources/currencies.json')) +fetch(chrome.runtime.getURL('resources/currencies.json')) .then(response => { if (!response.ok) { throw new Error('Network not ok')