-
Notifications
You must be signed in to change notification settings - Fork 24
add setting and getting config in json format #540
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ayyhimself
wants to merge
3
commits into
Java-Discord:main
Choose a base branch
from
ayyhimself:ayys-json-config
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,11 @@ | ||
| package net.discordjug.javabot.systems.configuration; | ||
|
|
||
| import com.google.gson.JsonSyntaxException; | ||
| import net.discordjug.javabot.annotations.AutoDetectableComponentHandler; | ||
| import net.discordjug.javabot.data.config.BotConfig; | ||
| import net.discordjug.javabot.data.config.GuildConfig; | ||
| import net.discordjug.javabot.data.config.UnknownPropertyException; | ||
| import net.discordjug.javabot.util.GsonUtils; | ||
| import net.discordjug.javabot.util.Responses; | ||
| import net.dv8tion.jda.api.components.label.Label; | ||
| import net.dv8tion.jda.api.components.textinput.TextInput; | ||
|
|
@@ -57,10 +59,11 @@ public InteractionCallbackAction<?> handleConfigSubcommand(@Nonnull SlashCommand | |
| if (resolved == null) { | ||
| return Responses.error(event, "Config `%s` not found", property); | ||
| } | ||
| String json = GsonUtils.toJson(resolved); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. When setting the config to invalid JSON, I am getting the following exception: |
||
| return event.replyModal( | ||
| Modal.create(ComponentIdBuilder.build("config-set", property), "Change configuration value") | ||
| .addComponents(Label.of("new value", TextInput.create("value", TextInputStyle.PARAGRAPH) | ||
| .setValue(String.valueOf(resolved)) | ||
| .setValue(json) | ||
| .build())) | ||
| .build()); | ||
| } | ||
|
|
@@ -78,8 +81,8 @@ public void handleModal(ModalInteractionEvent event, List<ModalMapping> values) | |
| try { | ||
| guildConfig.set(property, valueString); | ||
| Responses.success(event, "Configuration Updated", "The property `%s` has been set to `%s`.", property, valueString).queue(); | ||
| } catch (UnknownPropertyException e) { | ||
| Responses.error(event, "Property not found: %s", property).queue(); | ||
| } catch (UnknownPropertyException | JsonSyntaxException e) { | ||
| Responses.error(event, "Error while setting new value").queue(); | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| package net.discordjug.javabot.util; | ||
|
|
||
| import com.google.gson.Gson; | ||
| import com.google.gson.GsonBuilder; | ||
| import net.discordjug.javabot.data.config.PatternTypeAdapter; | ||
|
|
||
| import java.io.Reader; | ||
| import java.io.Writer; | ||
| import java.lang.reflect.Type; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| /** | ||
| * Utility class that contains several methods for using Gson. | ||
| */ | ||
| public class GsonUtils { | ||
|
|
||
| private static final Gson gson = new GsonBuilder() | ||
| .serializeNulls() | ||
| .setPrettyPrinting() | ||
| .registerTypeAdapter(Pattern.class, new PatternTypeAdapter()) | ||
| .enableComplexMapKeySerialization() | ||
| .create(); | ||
|
|
||
| public static <T> T fromJson(Reader json, Class<T> type) { | ||
| return gson.fromJson(json, type); | ||
| } | ||
|
|
||
| public static String fromJson(String json, Type type) { | ||
| return gson.fromJson(json, type); | ||
| } | ||
|
|
||
| public static String toJson(Object object) { | ||
| return gson.toJson(object); | ||
| } | ||
|
|
||
| public static void toJson(Object object, Writer writer) { | ||
| gson.toJson(object, writer); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this line can be removed as well.