Skinport Charm support

GODrums · Oct 18, 2024 · 77551c8 · 77551c8
1 parent f860c4a
commit 77551c8
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "betterfloat",
 	"displayName": "BetterFloat",
-	"version": "2.8.1",
+	"version": "2.8.2",
 	"description": "Enhance your experience on CSFloat.com, Skinport.com & Skinbid.com!",
 	"author": "Rums",
 	"license": "CC BY NC SA 4.0",

diff --git a/src/background/messages/refreshPrices.ts b/src/background/messages/refreshPrices.ts
@@ -44,7 +44,7 @@ const handler: PlasmoMessaging.MessageHandler<PriceBody, PriceResponse> = async
 		if (responseJson?.data) {
 			chrome.storage.local.set({
 				[`${pricesURL}`]: JSON.stringify(responseJson.data),
-				[`${source}-update`]: responseJson.time,
+				[`${source}-update`]: Date.now(), // responseJson.time,
 			});
 		}
 	}

diff --git a/src/contents/skinport_script.ts b/src/contents/skinport_script.ts
@@ -481,12 +481,12 @@ export async function patternDetections(container: Element, item: Skinport.Item)
 	if (item.name.includes('Case Hardened')) {
 		await caseHardenedDetection(container, item);
 	} else if ((item.name.includes('Crimson Web') || item.name.includes('Emerald Web')) && item.name.startsWith('★')) {
-		await webDetection(container, item);
+		webDetection(container, item);
 	}
 }
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-export async function webDetection(container: Element, item: Skinport.Item) {
+export function webDetection(container: Element, item: Skinport.Item) {
 	const itemHeader = container.querySelector('.TradeLock-lock');
 	if (!itemHeader) return;
 }
@@ -625,6 +625,12 @@ async function caseHardenedDetection(container: Element, item: Skinport.Item) {
 // true: remove item, false: display item
 function applyFilter(item: Skinport.Listing, container: Element) {
 	const spFilter: SPFilter = localStorage.getItem('spFilter') ? JSON.parse(localStorage.getItem('spFilter') ?? '') : DEFAULT_FILTER;
+	// since it's a new setting, we need to check if it exists
+	if (spFilter.types.charm === undefined) {
+		spFilter.types.charm = true;
+		// and store it back
+		localStorage.setItem('spFilter', JSON.stringify(spFilter));
+	}
 	const targetName = spFilter.name.toLowerCase();
 	// if true, item should be filtered
 	const nameCheck = targetName !== '' && !item.full_name.toLowerCase().includes(targetName);

diff --git a/src/lib/helpers/skinport_helpers.ts b/src/lib/helpers/skinport_helpers.ts
@@ -3,7 +3,7 @@ import { getBuffItem } from '~contents/skinport_script';
 import type { ItemStyle } from '~lib/@typings/FloatTypes';
 import type { Skinport } from '~lib/@typings/SkinportTypes';
 import { ICON_BUFF, ICON_C5GAME, ICON_STEAM, ICON_YOUPIN, MarketSource } from '~lib/util/globals';
-import { waitForElement } from '~lib/util/helperfunctions';
+import { getCharmColoring, waitForElement } from '~lib/util/helperfunctions';
 import { getSetting } from '~lib/util/storage';
 
 export function addPattern(container: Element, item: Skinport.Item) {
@@ -17,9 +17,17 @@ export function addPattern(container: Element, item: Skinport.Item) {
 		if (parts.length > 2) {
 			parts = parts.slice(0, parts[0].indexOf('-') > -1 ? 1 : 2);
 		}
-		return `${parts.join(' ')} <br> Pattern: <span style="color: mediumpurple; font-weight: 600; font-size: 13px;">${item.pattern}</span>`;
+		return parts.join(' ');
 	};
-	itemText.innerHTML = santizeText(itemText.textContent);
+
+	const getPatternStyle = () => {
+		if (item.category === 'Charm') {
+			const badgeProps = getCharmColoring(item.pattern, item.name);
+			return `color: ${badgeProps[0]}; font-weight: 600; font-size: 13px;border-radius: 7px; padding: 2px 5px; margin-top: 4px`;
+		}
+		return 'color: mediumpurple; font-weight: 600; font-size: 13px;';
+	};
+	itemText.innerHTML = `${santizeText(itemText.textContent)} <br> Pattern: <span style="${getPatternStyle()}">${item.pattern}</span>`;
 }
 
 export async function addTotalInventoryPrice(data: Skinport.InventoryListed | Skinport.InventoryAccount) {

diff --git a/src/lib/helpers/websockethandler.ts b/src/lib/helpers/websockethandler.ts
@@ -17,7 +17,7 @@ export async function handleListed(data: Skinport.Item[]) {
 				if (item.marketHashName.includes('Case Hardened') && item.category === 'Knife' && (await getSetting('sp-csbluegem'))) {
 					await addBlueBadge(element, item);
 				} else if ((item.marketHashName.includes('Crimson Web') || item.marketHashName.includes('Emerald Web')) && item.category === 'Gloves') {
-					await webDetection(element, item);
+					webDetection(element, item);
 				}
 			}
 		}

diff --git a/src/lib/inline/LiveFilter.tsx b/src/lib/inline/LiveFilter.tsx
@@ -66,7 +66,7 @@ const LiveFilter: React.FC = () => {
 		localStorage.setItem('spFilter', JSON.stringify(DEFAULT_FILTER));
 	};
 
-	const filterLabels = ['Knife', 'Gloves', 'Agent', 'Weapon', 'Collectible', 'Container', 'Sticker', 'Equipment', 'Pass'];
+	const filterLabels = ['Knife', 'Gloves', 'Agent', 'Weapon', 'Collectible', 'Container', 'Sticker', 'Charm', 'Equipment', 'Pass'];
 
 	useEffect(() => {
 		let count = 0;

diff --git a/src/lib/util/storage.ts b/src/lib/util/storage.ts
@@ -121,6 +121,7 @@ export const DEFAULT_FILTER = {
 		sticker: true,
 		equipment: true,
 		pass: true,
+		charm: true,
 	},
 	new: false,
 };