From df437a507db52daa4af60391a6f34132f367076d Mon Sep 17 00:00:00 2001 From: freya02 <41875020+freya022@users.noreply.github.com> Date: Tue, 26 Mar 2024 11:46:15 +0100 Subject: [PATCH] Remove warning about null interaction context Context is absent on guild-scoped commands --- .../java/net/dv8tion/jda/api/interactions/Interaction.java | 2 +- .../dv8tion/jda/internal/interactions/InteractionImpl.java | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/dv8tion/jda/api/interactions/Interaction.java b/src/main/java/net/dv8tion/jda/api/interactions/Interaction.java index e9502b6c984..8e36d1ef69b 100644 --- a/src/main/java/net/dv8tion/jda/api/interactions/Interaction.java +++ b/src/main/java/net/dv8tion/jda/api/interactions/Interaction.java @@ -233,7 +233,7 @@ default DiscordLocale getGuildLocale() return getGuild().getLocale(); } - //TODO document, maybe not null + //TODO document @Nullable InteractionContextType getContext(); diff --git a/src/main/java/net/dv8tion/jda/internal/interactions/InteractionImpl.java b/src/main/java/net/dv8tion/jda/internal/interactions/InteractionImpl.java index de5c139e8ce..2aa34f30f0d 100644 --- a/src/main/java/net/dv8tion/jda/internal/interactions/InteractionImpl.java +++ b/src/main/java/net/dv8tion/jda/internal/interactions/InteractionImpl.java @@ -74,15 +74,11 @@ public InteractionImpl(JDAImpl jda, DataObject data) this.guild = jda.getGuildById(data.getUnsignedLong("guild_id", 0L)); this.channelId = data.getUnsignedLong("channel_id", 0L); this.userLocale = DiscordLocale.from(data.getString("locale", "en-US")); + // Absent in guild-scoped commands if (data.hasKey("context")) this.context = InteractionContextType.fromKey(data.getString("context")); else - { - //TODO someone claimed they received no context, it is documented as being nullable, - // but I've not seen context being null. - LOGGER.warn("No context provided in interaction"); this.context = null; - } //TODO The bot and user permissions could be added in the temporary GuildChannel // Meaning that you can still use (Self)Member#hasPermission(GuildChannel, Permission...) transparently // The drawback is that the user might see the permission overrides and think they have them (document it)