Skip to content

Commit ee90261

Browse files
committed
Fixed failing tests
1 parent dface21 commit ee90261

File tree

4 files changed

+104
-4
lines changed

4 files changed

+104
-4
lines changed

application/src/test/java/org/togetherjava/tjbot/jda/JdaTester.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
import net.dv8tion.jda.api.requests.SequentialRestRateLimiter;
3232
import net.dv8tion.jda.api.requests.restaction.CacheRestAction;
3333
import net.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction;
34-
import net.dv8tion.jda.api.utils.AttachmentProxy;
3534
import net.dv8tion.jda.api.utils.ConcurrentSessionController;
3635
import net.dv8tion.jda.api.utils.FileUpload;
36+
import net.dv8tion.jda.api.utils.NamedAttachmentProxy;
3737
import net.dv8tion.jda.api.utils.cache.CacheFlag;
3838
import net.dv8tion.jda.api.utils.messages.MessageCreateData;
3939
import net.dv8tion.jda.api.utils.messages.MessageEditData;
@@ -770,7 +770,7 @@ public Message clientMessageToReceivedMessageMock(MessageCreateData clientMessag
770770
private Message.Attachment clientAttachmentToReceivedAttachmentMock(
771771
FileUpload clientAttachment) {
772772
Message.Attachment receivedAttachment = mock(Message.Attachment.class);
773-
AttachmentProxy attachmentProxy = mock(AttachmentProxy.class);
773+
NamedAttachmentProxy attachmentProxy = mock(NamedAttachmentProxy.class);
774774

775775
when(receivedAttachment.getJDA()).thenReturn(jda);
776776
when(receivedAttachment.getFileName()).thenReturn(clientAttachment.getName());

application/src/test/java/org/togetherjava/tjbot/jda/SlashCommandInteractionEventBuilder.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,19 @@
55
import net.dv8tion.jda.api.entities.Member;
66
import net.dv8tion.jda.api.entities.User;
77
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
8+
import net.dv8tion.jda.api.interactions.IntegrationOwners;
9+
import net.dv8tion.jda.api.interactions.InteractionContextType;
810
import net.dv8tion.jda.api.interactions.commands.OptionType;
911
import net.dv8tion.jda.api.interactions.commands.build.OptionData;
1012
import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
1113
import net.dv8tion.jda.api.utils.data.DataObject;
1214
import net.dv8tion.jda.internal.JDAImpl;
15+
import net.dv8tion.jda.internal.interactions.IntegrationOwnersImpl;
1316
import net.dv8tion.jda.internal.interactions.command.SlashCommandInteractionImpl;
1417

1518
import org.togetherjava.tjbot.features.SlashCommand;
1619
import org.togetherjava.tjbot.jda.payloads.PayloadChannel;
20+
import org.togetherjava.tjbot.jda.payloads.PayloadGuild;
1721
import org.togetherjava.tjbot.jda.payloads.PayloadMember;
1822
import org.togetherjava.tjbot.jda.payloads.PayloadUser;
1923
import org.togetherjava.tjbot.jda.payloads.slashcommand.PayloadSlashCommand;
@@ -28,6 +32,7 @@
2832
import java.util.HashMap;
2933
import java.util.List;
3034
import java.util.Map;
35+
import java.util.Set;
3136
import java.util.function.Supplier;
3237
import java.util.function.UnaryOperator;
3338
import java.util.stream.Collectors;
@@ -278,6 +283,8 @@ private PayloadSlashCommand createEvent() {
278283
"1099511627775", List.of(), false, false, false, null, false, user);
279284
PayloadChannel channel = new PayloadChannel(channelId, 1);
280285

286+
PayloadGuild guild = new PayloadGuild(Long.parseLong(guildId), "en-US", Set.of());
287+
281288
List<PayloadSlashCommandOption> options;
282289
if (subcommand == null) {
283290
options = extractOptionsOrNull(nameToOption);
@@ -288,8 +295,11 @@ private PayloadSlashCommand createEvent() {
288295
PayloadSlashCommandData data = new PayloadSlashCommandData(command.getName(), "1", 1,
289296
options, extractResolvedOrNull(nameToOption));
290297

298+
IntegrationOwners owners = new IntegrationOwnersImpl(DataObject.empty());
299+
291300
return new PayloadSlashCommand(guildId, "897425767397466123", 2, 1, applicationId, token,
292-
member, channel, data);
301+
member, channel, guild, data, Long.parseLong(channelId),
302+
InteractionContextType.PRIVATE_CHANNEL, owners);
293303
}
294304

295305
@Nullable
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
package org.togetherjava.tjbot.jda.payloads;
2+
3+
import com.fasterxml.jackson.annotation.JsonProperty;
4+
5+
import java.util.Set;
6+
7+
public class PayloadGuild {
8+
9+
private long id;
10+
@JsonProperty("preferred_locale")
11+
private String preferredLocale;
12+
private Set<String> features;
13+
14+
public PayloadGuild(long id, String preferredLocale, Set<String> features) {
15+
this.id = id;
16+
this.preferredLocale = preferredLocale;
17+
this.features = features;
18+
}
19+
20+
public long getId() {
21+
return id;
22+
}
23+
24+
public void setId(long id) {
25+
this.id = id;
26+
}
27+
28+
public String getPreferredLocale() {
29+
return preferredLocale;
30+
}
31+
32+
public void setPreferredLocale(String preferredLocale) {
33+
this.preferredLocale = preferredLocale;
34+
}
35+
36+
public Set<String> getFeatures() {
37+
return features;
38+
}
39+
40+
public void setFeatures(Set<String> features) {
41+
this.features = features;
42+
}
43+
44+
}

application/src/test/java/org/togetherjava/tjbot/jda/payloads/slashcommand/PayloadSlashCommand.java

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
package org.togetherjava.tjbot.jda.payloads.slashcommand;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import net.dv8tion.jda.api.interactions.IntegrationOwners;
5+
import net.dv8tion.jda.api.interactions.InteractionContextType;
46

57
import org.togetherjava.tjbot.jda.payloads.PayloadChannel;
8+
import org.togetherjava.tjbot.jda.payloads.PayloadGuild;
69
import org.togetherjava.tjbot.jda.payloads.PayloadMember;
710

811
public final class PayloadSlashCommand {
@@ -16,11 +19,18 @@ public final class PayloadSlashCommand {
1619
private String token;
1720
private PayloadMember member;
1821
private PayloadChannel channel;
22+
private PayloadGuild guild;
1923
private PayloadSlashCommandData data;
24+
@JsonProperty("channel_id")
25+
private long channelId;
26+
private InteractionContextType context;
27+
@JsonProperty("authorizing_integration_owners")
28+
private IntegrationOwners integrationOwners;
2029

2130
public PayloadSlashCommand(String guildId, String id, int type, int version,
2231
String applicationId, String token, PayloadMember member, PayloadChannel channel,
23-
PayloadSlashCommandData data) {
32+
PayloadGuild guild, PayloadSlashCommandData data, long channelId,
33+
InteractionContextType context, IntegrationOwners integrationOwners) {
2434
this.guildId = guildId;
2535
this.id = id;
2636
this.type = type;
@@ -29,7 +39,11 @@ public PayloadSlashCommand(String guildId, String id, int type, int version,
2939
this.token = token;
3040
this.member = member;
3141
this.channel = channel;
42+
this.guild = guild;
3243
this.data = data;
44+
this.channelId = channelId;
45+
this.context = context;
46+
this.integrationOwners = integrationOwners;
3347
}
3448

3549
public String getGuildId() {
@@ -96,6 +110,14 @@ public void setChannel(PayloadChannel channel) {
96110
this.channel = channel;
97111
}
98112

113+
public PayloadGuild getGuild() {
114+
return guild;
115+
}
116+
117+
public void setGuild(PayloadGuild guild) {
118+
this.guild = guild;
119+
}
120+
99121
public PayloadSlashCommandData getData() {
100122
return data;
101123
}
@@ -104,4 +126,28 @@ public void setData(PayloadSlashCommandData data) {
104126
this.data = data;
105127
}
106128

129+
public long getChannelId() {
130+
return channelId;
131+
}
132+
133+
public void setChannelId(long channelId) {
134+
this.channelId = channelId;
135+
}
136+
137+
public InteractionContextType getContext() {
138+
return context;
139+
}
140+
141+
public void setContext(InteractionContextType context) {
142+
this.context = context;
143+
}
144+
145+
public IntegrationOwners getIntegrationOwners() {
146+
return integrationOwners;
147+
}
148+
149+
public void setIntegrationOwners(IntegrationOwners integrationOwners) {
150+
this.integrationOwners = integrationOwners;
151+
}
152+
107153
}

0 commit comments

Comments
 (0)