Simp-O-Matic

commit 54713e5095c39c83c3d51e38034f295974cd7467
parent 77adfd61b9b4c8fe94850be9850f8b55134b920a
Author: Demonstrandum <moi@knutsen.co>
Date:   Mon, 23 Mar 2020 16:48:21 +0000

Add yandex translate api to secrets.

Diffstat:
M
generate_secrets.sh
 | 
3
+++
M
lib/commands/weather.ts
 | 
5
-----

2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/generate_secrets.sh b/generate_secrets.sh
@@ -38,6 +38,9 @@ cat <<- JSON
     "yandex": {
         "geocoder": {
             "key": "$YANDEX_GEOCODER_KEY"
+        },
+        "translate": {
+            "key": "$YANDEX_TRANSLATE_KEY"
         }
     },
     "openweather": {
diff --git a/lib/commands/weather.ts b/lib/commands/weather.ts
@@ -49,13 +49,8 @@ export default (home_scope: HomeScope) => {
 					.addFields(
 						{ name: 'daytime',   value: d.main.temp_max + '°C', inline: true },
 						{ name: 'nighttime', value: d.main.temp_min + '°C', inline: true },
-<<<<<<< HEAD
-						{ name: 'humidity',   value: d.main.humidity +  '%', inline: true },
-						{ name: 'wind', value: `${directions[Math.round(d.wind.deg / 45) % directions.length]}, ${d.wind.speed} ㎧`, inline: true })
-=======
 						{ name: 'humidity',   value: d.main.humidity +  '%' },
 						{ name: 'wind', value: `${directions[Math.round(d.wind.deg / 45)]} ${d.wind.speed} ㎧`, inline: true })
->>>>>>> 718b951691d49b76925537e413e56c746b9f08bb
 				: new MessageEmbed()
 					.setTitle(`Cannot get weather information from ${location}.`);