From 0baa56c703a342c985ec4032b5cc33e4daf70085 Mon Sep 17 00:00:00 2001
From: bignutty <3515180-bignutty@users.noreply.gitlab.com>
Date: Fri, 17 Jan 2025 23:32:13 +0100
Subject: [PATCH] add daily high/low to weds card

---
 commands/interaction/slash/utils/weather.js | 5 ++---
 commands/message/utils/weather.js           | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/commands/interaction/slash/utils/weather.js b/commands/interaction/slash/utils/weather.js
index e64ef81..cfae67c 100644
--- a/commands/interaction/slash/utils/weather.js
+++ b/commands/interaction/slash/utils/weather.js
@@ -36,7 +36,7 @@ function getUvIndex(i){
 }
 
 function renderWeatherCard(context, data, units){
-  let description = `### ${weatherIcon(data.result.current.icon.id)} ​ ​  ​ ​ ${temperature(data.result.current.temperature.current, units)}   •   ${data.result.current.condition.label}\n\n${pill("Feels like")} ${smallPill(temperature(data.result.current.temperature.feels_like, units))} ​ ​ ​ ​ ${pill("Wind")} `
+  let description = `### ${weatherIcon(data.result.current.icon.id)} ​ ​  ​ ​ ${temperature(data.result.current.temperature.current, units)}   •   ${data.result.current.condition.label}\n-# Feels like ${temperature(data.result.current.temperature.feels_like, units)}  •   High ${temperature(data.result.current.temperature.max, units)} • Low ${temperature(data.result.current.temperature.min, units)}\n\n${pill("Wind")} `
 
   if(units == "°F") description += smallPill((data.result.current.wind.speed / 1.609).toFixed(2) + " mph")
   else description += smallPill((data.result.current.wind.speed).toFixed(2) + " km/h")
@@ -45,8 +45,7 @@ function renderWeatherCard(context, data, units){
   if(data.result.current.humidity > 0) secondaryPills.push(`${pill("Humidity")} ${smallPill(Math.floor(data.result.current.humidity * 100) + "%")}`)
   if(data.result.current.uvindex > 0) secondaryPills.push(`${iconPill(getUvIndex(data.result.current.uvindex), "UV Index")} ${smallPill(data.result.current.uvindex)}`)
 
-  if(secondaryPills.length >= 1) description += '\n' + secondaryPills.join(` ​ ​ ​ ​ `)
-  
+  description += secondaryPills.join(`\n`)
   if(data.result.air_quality){
     description += `\n${iconPill("air_quality_" + data.result.air_quality.type, "Air Quality")} ${smallPill(`${data.result.air_quality.label} (${data.result.air_quality.value})`)}`
   }
diff --git a/commands/message/utils/weather.js b/commands/message/utils/weather.js
index 80e8eea..4bf6864 100644
--- a/commands/message/utils/weather.js
+++ b/commands/message/utils/weather.js
@@ -34,7 +34,7 @@ function getUvIndex(i){
 }
 
 function renderWeatherCard(context, data, units){
-  let description = `### ${weatherIcon(data.result.current.icon.id)} ​ ​  ​ ​ ${temperature(data.result.current.temperature.current, units)}   •   ${data.result.current.condition.label}\n\n${pill("Feels like")} ${smallPill(temperature(data.result.current.temperature.feels_like, units))} ​ ​ ​ ​ ${pill("Wind")} `
+  let description = `### ${weatherIcon(data.result.current.icon.id)} ​ ​  ​ ​ ${temperature(data.result.current.temperature.current, units)}   •   ${data.result.current.condition.label}\n-# Feels like ${temperature(data.result.current.temperature.feels_like, units)}  •   High ${temperature(data.result.current.temperature.max, units)} • Low ${temperature(data.result.current.temperature.min, units)}\n\n${pill("Wind")} `
 
   if(units == "°F") description += smallPill((data.result.current.wind.speed / 1.609).toFixed(2) + " mph")
   else description += smallPill((data.result.current.wind.speed).toFixed(2) + " km/h")
@@ -43,7 +43,7 @@ function renderWeatherCard(context, data, units){
   if(data.result.current.humidity > 0) secondaryPills.push(`${pill("Humidity")} ${smallPill(Math.floor(data.result.current.humidity * 100) + "%")}`)
   if(data.result.current.uvindex > 0) secondaryPills.push(`${iconPill(getUvIndex(data.result.current.uvindex), "UV Index")} ${smallPill(data.result.current.uvindex)}`)
 
-  if(secondaryPills.length >= 1) description += '\n' + secondaryPills.join(` ​ ​ ​ ​ `)
+  description += secondaryPills.join(`\n`)
   
   if(data.result.air_quality){
     description += `\n${iconPill("air_quality_" + data.result.air_quality.type, "Air Quality")} ${smallPill(`${data.result.air_quality.label} (${data.result.air_quality.value})`)}`