feat: Changed Weather API

Author: Andcool-Systems

README.md

@@ -20,8 +20,9 @@ WAKATIME_URL="https://wakatime.com/share"
 WAKATIME_GLOBAL="/@AndcoolSystems/c20041f4-a965-47c3-ac36-7234e622a980.json" // WakaTime Global stats
 WAKATIME_LANGS="/@AndcoolSystems/eaa20c39-4e68-49d3-8760-93e93fbf1ff5.json" // WakaTime Langs stats
 
-WEATHER_API="https://weather.andcool.ru/api" // Path for weather API
-WEATHER_QUERY="/?place=andcool&language=en&json=true"  // Query for weather API
+WEATHER_TOKEN="61d202e168925f843260a7f646f65118"  // OpenWeatherMap Token
+WEATHER_LAT="xxx"  // Location Latitude
+WEATHER_LON="xxx"  // Location Longitude
 
 ACTIVITY_API="https://activity.andcool.ru/" // Path for activity API
 ACTIVITY_ID="t9mdtk" // ID of activity
@@ -34,7 +35,6 @@ DATETIME_TIMEZONE="Etc/GMT-3" // Yours timezone
 - `DESCRIPTION` – Описание виджета. Будет добавлено ключу `description` в json.  
 - `WAKATIME_GLOBAL`, `WAKATIME_LANGS` – Статистика WakaTime. Можно получить [тут](https://wakatime.com/share/embed). Сгенерируйте типы чартов `Coding Activity` и `Languages` соответственно в формате JSON и вставьте их в соответствующие ключи в конфиге (исключая `https://wakatime.com/share`).
 
-- `WEATHER_API`, `WEATHER_QUERY` – URL и запрос для API погоды. Используется проект [weather.andcool.ru](https://weather.andcool.ru)  
 - `ACTIVITY_API`, `ACTIVITY_ID` – URL и ID для API активности. Используется проект [activity.andcool.ru](https://github.com/Andcool-Systems/Andcool-Activity)
 
 - `DATETIME_TIMEZONE` – Часовой пояс в формате JavaScript Date.

src/apis/apis.service.ts

@@ -229,10 +229,7 @@ export class APIService {
         }
     }
 
-    async getWeather(
-        api: string,
-        query: string
-    ): Promise<WeatherResponse | null> {
+    async getWeather(query: string): Promise<WeatherResponse | null> {
         try {
             const cache = await this.cacheManager.get<string>(
                 `weather:${query}`
@@ -242,20 +239,30 @@ export class APIService {
                 return JSON.parse(cache);
             }
 
-            const response = await instance.get(`${api}${query}`, {
-                validateStatus: () => true
-            });
+            const capitalize = (str: string) =>
+                String(str).charAt(0).toUpperCase() + String(str).slice(1);
 
-            if (response.status !== 200) {
-                return null;
-            }
+            const response = await axios.get(
+                `https://api.openweathermap.org/data/2.5/weather` +
+                    `?lat=${process.env.WEATHER_LAT}` +
+                    `&lon=${process.env.WEATHER_LON}` +
+                    `&appid=${process.env.WEATHER_TOKEN}` +
+                    `&units=metric`
+            );
+
+            if (response.status !== 200) return null;
+
+            const data = {
+                temp: response.data.main.temp,
+                condition: capitalize(response.data.weather[0].description)
+            };
 
             await this.cacheManager.set(
                 `weather:${query}`,
-                JSON.stringify(response.data),
+                JSON.stringify(data),
                 1000 * 60 * 30
             );
-            return response.data;
+            return data;
         } catch (e) {
             console.error(e);
             return null;

src/apis/types.d.ts

@@ -82,16 +82,7 @@ interface WakatimeLanguages {
 
 interface WeatherResponse {
     temp: number;
-    feels_like: number;
-    pressure: number;
-    visibility: number;
-    humidity: number;
-    wind: {
-        speed: number;
-        deg: number;
-    };
     condition: string;
-    icon: string;
 }
 
 interface ActivityResponse {

src/widget/widget.service.ts

@@ -58,10 +58,7 @@ export class WidgetService {
                 this.apiService.getWakatimeLanguages(
                     process.env.WAKATIME_LANGS
                 ),
-                this.apiService.getWeather(
-                    process.env.WEATHER_API,
-                    process.env.WEATHER_QUERY
-                ),
+                this.apiService.getWeather(process.env.WEATHER_QUERY),
                 this.apiService.getActivity(
                     process.env.ACTIVITY_API,
                     process.env.ACTIVITY_ID