Skip to content

Commit 5c4efa6

Browse files
authored
Merge pull request #705 from Nincodedo/bugfix/3.4.2
2 parents 4dd89bc + 3709a25 commit 5c4efa6

File tree

3 files changed

+11
-15
lines changed

3 files changed

+11
-15
lines changed

.github/workflows/push-main.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@ jobs:
3838
steps:
3939
- uses: actions/checkout@v3
4040
- name: Set up QEMU
41-
uses: docker/setup-qemu-action@v1
41+
uses: docker/setup-qemu-action@v2
4242
- name: Set up Docker Buildx
43-
uses: docker/setup-buildx-action@v1
43+
uses: docker/setup-buildx-action@v2
4444
- name: Login to GitHub Container Registry
4545
if: github.ref == 'refs/heads/main'
46-
uses: docker/login-action@v1
46+
uses: docker/login-action@v2
4747
with:
4848
registry: ghcr.io
4949
username: ${{ github.repository_owner }}
5050
password: ${{ secrets.PACKAGE_ACTIONS_TOKEN }}
5151
- name: Build and push
52-
uses: docker/build-push-action@v2
52+
uses: docker/build-push-action@v3
5353
with:
5454
context: .
5555
platforms: linux/amd64

pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.6.7</version>
8+
<version>2.7.0</version>
99
<relativePath/>
1010
</parent>
1111
<groupId>dev.nincodedo</groupId>
1212
<artifactId>ninbot</artifactId>
13-
<version>3.4.1</version>
13+
<version>3.4.2</version>
1414
<name>Ninbot</name>
1515
<description>Discord bot for OCW Discord using JDA</description>
1616
<url>https://github.com/Nincodedo/Ninbot</url>
@@ -33,7 +33,7 @@
3333
<url>https://github.com/Nincodedo/Ninbot</url>
3434
</scm>
3535
<properties>
36-
<JDA.version>5.0.0-alpha.10</JDA.version>
36+
<JDA.version>5.0.0-alpha.12</JDA.version>
3737
<archunit.version>0.23.1</archunit.version>
3838
<assertj-core.version>3.22.0</assertj-core.version>
3939
<commons-io.version>2.11.0</commons-io.version>
@@ -49,12 +49,12 @@
4949
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
5050
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
5151
<sap-conversational-ai-java-api.version>0.0.4</sap-conversational-ai-java-api.version>
52-
<pitest-maven.version>1.7.6</pitest-maven.version>
52+
<pitest-maven.version>1.8.0</pitest-maven.version>
5353
<sonar.coverage.jacoco.xmlReportPaths>target/site/jacoco/jacoco.xml,target/site/jacoco-it/jacoco.xml
5454
</sonar.coverage.jacoco.xmlReportPaths>
55-
<sortpom-maven-plugin.version>3.0.1</sortpom-maven-plugin.version>
55+
<sortpom-maven-plugin.version>3.1.0</sortpom-maven-plugin.version>
5656
<syllable-counter.version>4.1.0</syllable-counter.version>
57-
<testcontainers.version>1.17.1</testcontainers.version>
57+
<testcontainers.version>1.17.2</testcontainers.version>
5858
<maven.compiler.source>18</maven.compiler.source>
5959
<maven.compiler.target>18</maven.compiler.target>
6060
</properties>

src/main/java/dev/nincodedo/ninbot/components/hugemoji/HugemojiCommand.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import dev.nincodedo.ninbot.common.message.MessageExecutor;
88
import dev.nincodedo.ninbot.common.message.SlashCommandEventMessageExecutor;
99
import lombok.extern.slf4j.Slf4j;
10-
import net.dv8tion.jda.api.EmbedBuilder;
1110
import net.dv8tion.jda.api.entities.Emote;
1211
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
1312
import net.dv8tion.jda.api.interactions.commands.OptionMapping;
@@ -45,10 +44,7 @@ public MessageExecutor<SlashCommandEventMessageExecutor> executeCommandAction(
4544
var emote = emoteList.get(0);
4645
var imageFileType = emote.getImageUrl().substring(emote.getImageUrl().lastIndexOf('.'));
4746
InputStream file = new URL(emote.getImageUrl()).openStream();
48-
slashCommandEvent.replyEmbeds(new EmbedBuilder().setImage(
49-
"attachment://" + emote.getName() + imageFileType).build())
50-
.addFile(file, emote.getName() + imageFileType)
51-
.queue();
47+
slashCommandEvent.replyFile(file, emote.getName() + imageFileType).queue();
5248
} catch (IOException e) {
5349
messageExecutor.addEphemeralMessage(Emojis.CROSS_X);
5450
}

0 commit comments

Comments
 (0)