erik/mobibot
erik/mobibot
1
1
Fork 0
Code Issues Releases Activity

Added country to invalid city ID search.

Browse source
This commit is contained in:
Erik C. Thauvin 2019-07-28 23:13:47 -07:00
parent 351f117d38
commit 34c7adddff
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
View file

@ -169,14 +169,14 @@ public class Weather2 extends ThreadedModule {
} }
} }
if (cwd.getCityId() != null) { if (cwd.hasCityId() && cwd.getCityId() != null) {
if (cwd.getCityId() > 0) { if (cwd.getCityId() > 0) {
messages.add(new NoticeMessage("https://openweathermap.org/city/" + cwd.getCityId(), messages.add(new NoticeMessage("https://openweathermap.org/city/" + cwd.getCityId(),
Colors.GREEN)); Colors.GREEN));
} else { } else {
final HttpUrl url = final HttpUrl url =
HttpUrl.parse("https://openweathermap.org/find").newBuilder().addQueryParameter( HttpUrl.parse("https://openweathermap.org/find").newBuilder().addQueryParameter(
"q", city).build(); "q", city + ',' + country).build();
messages.add( messages.add(
new NoticeMessage(url.toString(), Colors.GREEN)); new NoticeMessage(url.toString(), Colors.GREEN));
} }

2
src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java
View file

@ -53,7 +53,7 @@ public class Weather2Test extends LocalProperties {
public void testWeather() throws ModuleException { public void testWeather() throws ModuleException {
List<Message> messages = Weather2.getWeather("98204", LocalProperties.getProperty(Weather2.OWM_API_KEY_PROP)); List<Message> messages = Weather2.getWeather("98204", LocalProperties.getProperty(Weather2.OWM_API_KEY_PROP));
assertThat(messages.get(0).getMessage()).as("is Everett").contains("Everett"); assertThat(messages.get(0).getMessage()).as("is Everett").contains("Everett");
assertThat(messages.get(messages.size() - 1).getMessage()).as("is City Search").endsWith("98204"); assertThat(messages.get(messages.size() - 1).getMessage()).as("is City Search").endsWith("98204%2CUS");
messages = Weather2.getWeather("London, UK", LocalProperties.getProperty(Weather2.OWM_API_KEY_PROP)); messages = Weather2.getWeather("London, UK", LocalProperties.getProperty(Weather2.OWM_API_KEY_PROP));
assertThat(messages.get(0).getMessage()).as("is UK").contains("UK"); assertThat(messages.get(0).getMessage()).as("is UK").contains("UK");