fix: csfloat links for prices

GODrums · Jan 1, 2025 · bfe33ad · bfe33ad
1 parent 5dfb443
commit bfe33ad
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 28 deletions.
diff --git a/src/contents/skinport_script.ts b/src/contents/skinport_script.ts
@@ -296,24 +296,15 @@ async function adjustItemPage(container: Element) {
 	const market_id = getMarketID(buffItem.buff_name, buffItem.source);
 	const isDoppler = item.name.includes('Doppler') && (item.category === 'Knife' || item.category === 'Weapon');
 
-	const href = getMarketURL({ source: buffItem.source, buff_name: buffItem.buff_name, market_id, phase: isDoppler ? (item.style as DopplerPhase) : undefined });
+	const link = getMarketURL({ source: buffItem.source, buff_name: buffItem.buff_name, market_id, phase: isDoppler ? (item.style as DopplerPhase) : undefined });
 
-	container.setAttribute('data-betterfloat', JSON.stringify({ itemPrice: item.price, currency: item.currency, buff_id: market_id, ...buffItem }));
+	container.setAttribute('data-betterfloat', JSON.stringify({ itemPrice: item.price, currency: item.currency, buff_id: market_id, link, ...buffItem }));
 
 	const suggestedContainer = container.querySelector('.ItemPage-suggested');
 	if (suggestedContainer) {
 		await mountSpItemPageBuffContainer();
 	}
 
-	const buffContainer = container.querySelector('.betterfloat-buff-container');
-	if (buffContainer) {
-		(<HTMLElement>buffContainer).onclick = (e: Event) => {
-			e.stopPropagation();
-			e.preventDefault();
-			window.open(href, '_blank');
-		};
-	}
-
 	const priceFromReference = [MarketSource.Buff, MarketSource.Steam].includes(buffItem.source) && extensionSettings['sp-pricereference'] === 0 ? buffItem.priceOrder : buffItem.priceListing;
 	const difference = new Decimal(item.price).minus(priceFromReference ?? 0);
 	const priceContainer = <HTMLElement>container.querySelector('.ItemPage-price');
@@ -966,11 +957,11 @@ async function addBuffPrice(item: Skinport.Listing, container: Element) {
 	} else {
 		const buffContainer = container.querySelector('.betterfloat-buff-container');
 		if (buffContainer) {
-			(<HTMLElement>buffContainer).onclick = (e: Event) => {
+			buffContainer.addEventListener('click', (e) => {
 				e.stopPropagation();
 				e.preventDefault();
 				window.open(href, '_blank');
-			};
+			});
 		}
 	}
 

diff --git a/src/lib/handlers/mappinghandler.ts b/src/lib/handlers/mappinghandler.ts
@@ -119,6 +119,7 @@ export function getMarketID(name: string, source: MarketSource) {
 			case MarketSource.C5Game:
 				return 'c5';
 			default:
+				// csfloat can be queried via buff name
 				return null;
 		}
 	};

diff --git a/src/lib/inline/SpBuffContainer.tsx b/src/lib/inline/SpBuffContainer.tsx
@@ -15,6 +15,7 @@ type BuffItem = {
 	priceOrder: number;
 	priceAvg30: number;
 	liquidity: number;
+	link: string;
 };
 
 const Container: React.FC<{ child: HTMLDivElement }> = ({ child }) => {
@@ -33,6 +34,7 @@ const SPBuffContainer: React.FC = () => {
 		priceOrder: parseFloat(jsonData.priceOrder || 0),
 		priceAvg30: parseFloat(jsonData.priceAvg30 || 0),
 		liquidity: parseFloat(jsonData.liquidity || 0),
+		link: String(jsonData.link),
 	};
 
 	const marketIcon = AvailableMarketSources.find((s) => s.source === data.source)?.logo ?? ICON_BUFF;
@@ -78,19 +80,7 @@ const SPBuffContainer: React.FC = () => {
 	};
 
 	const openBuffPage = () => {
-		const getMarketURL = () => {
-			switch (data.source) {
-				case MarketSource.Buff:
-					return data.buff_id > 0 ? `https://buff.163.com/goods/${data.buff_id}` : `https://buff.163.com/market/csgo#tab=selling&page_num=1&search=${encodeURIComponent(data.buff_name)}`;
-				case MarketSource.Steam:
-					return `https://steamcommunity.com/market/listings/730/${encodeURIComponent(data.buff_name)}`;
-				case MarketSource.YouPin:
-					return `https://youpin898.com/search?keyword=${encodeURIComponent(data.buff_name)}`;
-				case MarketSource.C5Game:
-					return `https://www.c5game.com/csgo?marketKeyword=${encodeURIComponent(data.buff_name)}`;
-			}
-		};
-		window.open(getMarketURL(), '_blank');
+		window.open(data.link, '_blank');
 	};
 
 	return (
@@ -166,8 +156,10 @@ const SPBuffContainer: React.FC = () => {
 						</PopoverClose>
 					</PopoverContent>
 				</Popover>
-				<Button variant="ghost" size="icon" className="hover:bg-neutral-500/70" onClick={openBuffPage}>
-					<img src={ICON_ARROWUP} className="h-6 w-6" />
+				<Button variant="ghost" size="icon" className="hover:bg-neutral-500/70" asChild>
+					<a href={data.link} target="_blank" rel="noreferrer">
+						<img src={ICON_ARROWUP} className="h-6 w-6" />
+					</a>
 				</Button>
 			</div>
 		</div>

diff --git a/src/lib/util/helperfunctions.ts b/src/lib/util/helperfunctions.ts
@@ -171,6 +171,8 @@ export function getMarketURL({ source, buff_name, market_id = 0, phase }: { sour
 				return `https://www.c5game.com/en/csgo?marketKeyword=${encodeURIComponent(buff_name)}`;
 			}
 		}
+		case MarketSource.CSFloat:
+			return `https://csfloat.com/search?sort_by=lowest_price&type=buy_now&market_hash_name=${encodeURIComponent(buff_name)}`;
 	}
 	return '';
 }