misc/chomens-bot-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: weather command refactoring which includes more features

Browse Source
This commit is contained in:
ChomeNS
2024-12-30 14:31:41 +07:00
parent e4743fd503
commit cb487b5939
2 changed files with 45 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build-number.txt
View File

@@ -1 +1 @@
1365
1369

58
src/main/java/me/chayapak1/chomens_bot/commands/WeatherCommand.java
View File

@@ -12,12 +12,10 @@ import me.chayapak1.chomens_bot.util.HttpUtilities;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import java.net.URI;
import java.net.URL;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
public class WeatherCommand extends Command {
public WeatherCommand () {
@@ -39,27 +37,20 @@ public class WeatherCommand extends Command {
final Gson gson = new Gson();
try {
final URL url = new URL(
final URL url = new URI(
"https://api.weatherapi.com/v1/current.json?key=" + bot.config.weatherApiKey + "&q=" +
URLEncoder.encode(
location,
StandardCharsets.UTF_8
)
+ "&aqi=no"
);
).toURL();
final String jsonOutput = HttpUtilities.getRequest(url);
final JsonObject jsonObject = gson.fromJson(jsonOutput, JsonObject.class);
final ZoneId zoneId = ZoneId.of(jsonObject.get("location").getAsJsonObject().get("tz_id").getAsString());
final ZonedDateTime zonedDateTime = ZonedDateTime.now(zoneId);
final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("hh:mm:ss a");
final String time = zonedDateTime.format(formatter);
return Component.translatable(
"Weather forecast for %s, %s:\n%s (%s), feels like %s (%s)\nTime: %s",
"Current weather for %s, %s:\n%s (%s), feels like %s (%s)\nCondition: %s\nCloud cover: %s\nHumidity: %s\nTime: %s",
Component.text(jsonObject.get("location").getAsJsonObject().get("name").getAsString()).color(ColorUtilities.getColorByString(bot.config.colorPalette.string)),
Component.text(jsonObject.get("location").getAsJsonObject().get("country").getAsString()).color(ColorUtilities.getColorByString(bot.config.colorPalette.string)),
Component
@@ -102,7 +93,46 @@ public class WeatherCommand extends Command {
.getAsString() + "°F"
)
.color(NamedTextColor.GREEN),
Component.text(time).color(ColorUtilities.getColorByString(bot.config.colorPalette.string))
Component
.text(
jsonObject
.get("current")
.getAsJsonObject()
.get("condition")
.getAsJsonObject()
.get("text")
.getAsString()
)
.color(ColorUtilities.getColorByString(bot.config.colorPalette.string)),
Component
.text(
jsonObject
.get("current")
.getAsJsonObject()
.get("cloud")
.getAsInt()
)
.append(Component.text("%"))
.color(ColorUtilities.getColorByString(bot.config.colorPalette.number)),
Component
.text(
jsonObject
.get("current")
.getAsJsonObject()
.get("humidity")
.getAsInt()
)
.append(Component.text("%"))
.color(ColorUtilities.getColorByString(bot.config.colorPalette.number)),
Component
.text(
jsonObject
.get("location")
.getAsJsonObject()
.get("localtime")
.getAsString()
)
.color(ColorUtilities.getColorByString(bot.config.colorPalette.string))
).color(ColorUtilities.getColorByString(bot.config.colorPalette.defaultColor));
} catch (Exception e) {
throw new CommandException(Component.text("Location \"" + location + "\" not found"));