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

Fixed public messages.

Browse source
This commit is contained in:
Erik C. Thauvin 2019-04-10 00:18:27 -07:00
parent a4907ce111
commit 32e827d50a
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -117,23 +117,23 @@ public class Weather2 extends ThreadedModule {
cwd = owm.currentWeatherByCityName(city, getCountry(country)); cwd = owm.currentWeatherByCityName(city, getCountry(country));
} }
if (cwd.hasCityName()) { if (cwd.hasCityName()) {
messages.add(new NoticeMessage("City: " + cwd.getCityName() + " [" + country + "]")); messages.add(new PublicMessage("City: " + cwd.getCityName() + " [" + country + "]"));
final Main main = cwd.getMainData(); final Main main = cwd.getMainData();
if (main != null) { if (main != null) {
if (main.hasTemp()) { if (main.hasTemp()) {
messages.add(new NoticeMessage("Temperature: " + fAndC(main.getTemp()))); messages.add(new PublicMessage("Temperature: " + fAndC(main.getTemp())));
} }
if (main.hasHumidity() && (main.getHumidity() != null)) { if (main.hasHumidity() && (main.getHumidity() != null)) {
messages.add(new PublicMessage("Humidity: " + Math.round(main.getHumidity()) + "%")); messages.add(new NoticeMessage("Humidity: " + Math.round(main.getHumidity()) + "%"));
} }
} }
if (cwd.hasWindData()) { if (cwd.hasWindData()) {
final Wind w = cwd.getWindData(); final Wind w = cwd.getWindData();
if (w != null && w.hasSpeed()) { if (w != null && w.hasSpeed()) {
messages.add(new PublicMessage("Wind: " + wind(w.getSpeed()))); messages.add(new NoticeMessage("Wind: " + wind(w.getSpeed())));
} }
} }
@ -148,7 +148,7 @@ public class Weather2 extends ThreadedModule {
condition.append(", ").append(w.getDescription()); condition.append(", ").append(w.getDescription());
} }
} }
messages.add(new PublicMessage(condition.toString())); messages.add(new NoticeMessage(condition.toString()));
} }
} }
messages.add(new NoticeMessage("https://openweathermap.org/city/" messages.add(new NoticeMessage("https://openweathermap.org/city/"