diff --git a/abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/java/dev/sheldan/abstracto/webservices/openeweathermap/command/OpenWeatherMap.java b/abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/java/dev/sheldan/abstracto/webservices/openeweathermap/command/OpenWeatherMap.java index 376ba1bc0..d9a6d0e6d 100644 --- a/abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/java/dev/sheldan/abstracto/webservices/openeweathermap/command/OpenWeatherMap.java +++ b/abstracto-application/abstracto-modules/webservices/webservices-impl/src/main/java/dev/sheldan/abstracto/webservices/openeweathermap/command/OpenWeatherMap.java @@ -125,6 +125,7 @@ public class OpenWeatherMap extends AbstractConditionableCommand { builder.sunset(systemInfo.getSunset() != null ? Instant.ofEpochSecond(systemInfo.getSunset()) : null); builder.sunset(systemInfo.getSunrise() != null ? Instant.ofEpochSecond(systemInfo.getSunrise()) : null); } + builder.locationId(weatherResult.getLocationId()); return templateService.renderEmbedTemplate(OPEN_WEATHER_MAP_RESPONSE_TEMPLATE_KEY, builder.build(), serverId); } catch (IOException e) { log.warn("Failed to load weather in server {}", serverId, e); diff --git a/abstracto-application/abstracto-modules/webservices/webservices-int/src/main/java/dev/sheldan/abstracto/webservices/openweathermap/model/WeatherResponseModel.java b/abstracto-application/abstracto-modules/webservices/webservices-int/src/main/java/dev/sheldan/abstracto/webservices/openweathermap/model/WeatherResponseModel.java index 3e892d2de..372c804d0 100644 --- a/abstracto-application/abstracto-modules/webservices/webservices-int/src/main/java/dev/sheldan/abstracto/webservices/openweathermap/model/WeatherResponseModel.java +++ b/abstracto-application/abstracto-modules/webservices/webservices-int/src/main/java/dev/sheldan/abstracto/webservices/openweathermap/model/WeatherResponseModel.java @@ -33,4 +33,5 @@ public class WeatherResponseModel { private String locationName; private String countryKey; private Color embedColor; + private Long locationId; } diff --git a/abstracto-application/abstracto-modules/webservices/webservices-int/src/main/java/dev/sheldan/abstracto/webservices/openweathermap/model/WeatherResult.java b/abstracto-application/abstracto-modules/webservices/webservices-int/src/main/java/dev/sheldan/abstracto/webservices/openweathermap/model/WeatherResult.java index b4fcd01e1..0e80f090e 100644 --- a/abstracto-application/abstracto-modules/webservices/webservices-int/src/main/java/dev/sheldan/abstracto/webservices/openweathermap/model/WeatherResult.java +++ b/abstracto-application/abstracto-modules/webservices/webservices-int/src/main/java/dev/sheldan/abstracto/webservices/openweathermap/model/WeatherResult.java @@ -29,5 +29,6 @@ public class WeatherResult { private WeatherResultSystem systemInfo; @SerializedName("timezone") private Long timezoneShift; - + @SerializedName("id") + private Long locationId; }