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

Fixed country code.

Browse source
This commit is contained in:
Erik C. Thauvin 2021-07-30 18:33:09 -07:00
parent 9f82690ec7
commit 6f297a0d6b
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
View file

@ -122,19 +122,20 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
val argv = query.split(",") val argv = query.split(",")
if (argv.size in 1..2) { if (argv.size in 1..2) {
val city = argv[0].trim() val city = argv[0].trim()
val country: String = if (argv.size > 1 && argv[1].isNotBlank()) { val code: String = if (argv.size > 1 && argv[1].isNotBlank()) {
argv[1].trim() argv[1].trim()
} else { } else {
"US" "US"
} }
try { try {
val country = getCountry(code)
val cwd: CurrentWeather = if (city.matches("\\d+".toRegex())) { val cwd: CurrentWeather = if (city.matches("\\d+".toRegex())) {
owm.currentWeatherByZipCode(city.toInt(), getCountry(country)) owm.currentWeatherByZipCode(city.toInt(), country)
} else { } else {
owm.currentWeatherByCityName(city, getCountry(country)) owm.currentWeatherByCityName(city, country)
} }
if (cwd.hasCityName()) { if (cwd.hasCityName()) {
messages.add(PublicMessage("City: ${cwd.cityName} [${country.uppercase()}]")) messages.add(PublicMessage("City: ${cwd.cityName} [${country.value}]"))
with(cwd.mainData) { with(cwd.mainData) {
if (this != null) { if (this != null) {
if (hasTemp()) { if (hasTemp()) {
@ -177,7 +178,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
messages.add( messages.add(
NoticeMessage( NoticeMessage(
"https://openweathermap.org/find?q=" "https://openweathermap.org/find?q="
+ encodeUrl("$city,${country.uppercase()}"), + encodeUrl("$city,${code.uppercase()}"),
Colors.GREEN Colors.GREEN
) )
) )
@ -185,7 +186,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
} }
} }
} catch (e: APIException) { } catch (e: APIException) {
throw ModuleException("getWeather($query)", "A weather API error has occurred: ${e.message}", e) throw ModuleException("getWeather($query)", e.message, e)
} catch (e: NullPointerException) { } catch (e: NullPointerException) {
throw ModuleException("getWeather($query)", "Unable to perform weather lookup.", e) throw ModuleException("getWeather($query)", "Unable to perform weather lookup.", e)
} }