Skip to content

Commit dcfd400

Browse files
committed
Fix ApplicationEmojiWrapper
1 parent ca40dce commit dcfd400

2 files changed

Lines changed: 22 additions & 52 deletions

File tree

Lines changed: 18 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,36 @@
11
package xyz.srnyx.lazylibrary.emoji;
22

3-
import net.dv8tion.jda.api.JDA;
4-
import net.dv8tion.jda.api.entities.User;
5-
import net.dv8tion.jda.api.entities.emoji.ApplicationEmoji;
6-
import net.dv8tion.jda.api.managers.ApplicationEmojiManager;
7-
import net.dv8tion.jda.api.requests.RestAction;
8-
import net.dv8tion.jda.api.utils.data.DataObject;
3+
import net.dv8tion.jda.api.entities.emoji.*;
4+
import net.dv8tion.jda.internal.JDAImpl;
5+
import net.dv8tion.jda.internal.entities.emoji.ApplicationEmojiImpl;
96

107
import org.jetbrains.annotations.NotNull;
11-
import org.jetbrains.annotations.Nullable;
128

139

1410
/**
15-
* A wrapper for {@link ApplicationEmoji} that adds a custom {@link #toString()} method
11+
* A wrapper for {@link ApplicationEmojiImpl} that adds a custom {@link #toString()} method
1612
*
17-
* @param emoji the emoji to wrap
1813
*/
19-
public record ApplicationEmojiWrapper(@NotNull ApplicationEmoji emoji) implements ApplicationEmoji {
14+
public final class ApplicationEmojiWrapper extends ApplicationEmojiImpl {
15+
@NotNull private final ApplicationEmoji emoji;
16+
17+
/**
18+
* Constructs a new ApplicationEmojiWrapper with the provided ApplicationEmoji
19+
*
20+
* @param emoji the ApplicationEmoji to wrap
21+
*/
22+
public ApplicationEmojiWrapper(@NotNull ApplicationEmoji emoji) {
23+
super(emoji.getIdLong(), (JDAImpl) emoji.getJDA(), emoji.getOwner());
24+
this.emoji = emoji;
25+
}
26+
2027
/**
2128
* Returns the mention of the emoji (e.g. {@code <:emoji_name:emoji_id>})
2229
*
23-
* @return the mention of the emoji
30+
* @return the mention of the emoji
2431
*/
2532
@Override @NotNull
2633
public String toString() {
2734
return emoji.getAsMention();
2835
}
29-
30-
@Override @NotNull
31-
public JDA getJDA() {
32-
return emoji.getJDA();
33-
}
34-
@Override @Nullable
35-
public User getOwner() {
36-
return emoji.getOwner();
37-
}
38-
@Override @NotNull
39-
public RestAction<Void> delete() {
40-
return emoji.delete();
41-
}
42-
@Override @NotNull
43-
public ApplicationEmojiManager getManager() {
44-
return emoji.getManager();
45-
}
46-
@Override
47-
public boolean isAnimated() {
48-
return emoji.isAnimated();
49-
}
50-
@Override
51-
public long getIdLong() {
52-
return emoji.getIdLong();
53-
}
54-
@Override @NotNull
55-
public String getName() {
56-
return emoji.getName();
57-
}
58-
@Override @NotNull
59-
public String getAsReactionCode() {
60-
return emoji.getAsReactionCode();
61-
}
62-
@Override @NotNull
63-
public DataObject toData() {
64-
return emoji.toData();
65-
}
6636
}

src/main/java/xyz/srnyx/lazylibrary/paginator/PaginatorV2.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private void updateMessage(@NotNull ButtonEvent event) {
8383
@NotNull
8484
public ActionRow getButtonRow() {
8585
return ActionRow.of(
86-
buttons.primary(LazyEmoji.BACK_CLEAR_DARK.emoji()).ephemeral()
86+
buttons.primary(LazyEmoji.BACK_CLEAR_DARK).ephemeral()
8787
.bindTo(event -> {
8888
event.deferEdit().queue();
8989
currentPage = 0;
@@ -92,7 +92,7 @@ public ActionRow getButtonRow() {
9292
.constraints(constraints)
9393
.build()
9494
.withDisabled(currentPage == 0),
95-
buttons.primary(LazyEmoji.LEFT2_CLEAR_DARK.emoji()).ephemeral()
95+
buttons.primary(LazyEmoji.LEFT2_CLEAR_DARK).ephemeral()
9696
.bindTo(event -> {
9797
event.deferEdit().queue();
9898
currentPage = Math.max(0, currentPage - 1);
@@ -102,7 +102,7 @@ public ActionRow getButtonRow() {
102102
.build()
103103
.withDisabled(currentPage == 0),
104104
buttons.secondary((currentPage + 1) + " / " + maxPages).toLabelButton(),
105-
buttons.primary(LazyEmoji.RIGHT2_CLEAR_DARK.emoji()).ephemeral()
105+
buttons.primary(LazyEmoji.RIGHT2_CLEAR_DARK).ephemeral()
106106
.bindTo(event -> {
107107
event.deferEdit().queue();
108108
currentPage = Math.min(maxPages - 1, currentPage + 1);
@@ -111,7 +111,7 @@ public ActionRow getButtonRow() {
111111
.constraints(constraints)
112112
.build()
113113
.withDisabled(currentPage >= maxPages - 1),
114-
buttons.primary(LazyEmoji.FORWARD_CLEAR_DARK.emoji()).ephemeral()
114+
buttons.primary(LazyEmoji.FORWARD_CLEAR_DARK).ephemeral()
115115
.bindTo(event -> {
116116
event.deferEdit().queue();
117117
currentPage = maxPages - 1;

0 commit comments

Comments
 (0)