Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Nincodedo/Ninbot
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3.3.0
Choose a base ref
...
head repository: Nincodedo/Ninbot
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3.4.0
Choose a head ref
  • 6 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 22, 2022

  1. Merge tag '3.3.0' into dev

    3.3.0 3.3.0
    Nincodedo committed Apr 22, 2022
    Copy the full SHA
    728f86c View commit details
  2. Update version for dev

    Nincodedo committed Apr 22, 2022
    Copy the full SHA
    97fa5e8 View commit details

Commits on Apr 29, 2022

  1. Bump pitest-maven from 1.7.5 to 1.7.6 (#689)

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Apr 29, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    0ee73cc View commit details

Commits on May 4, 2022

  1. Copy the full SHA
    8e593e9 View commit details
  2. Update version for release

    Nincodedo committed May 4, 2022
    Copy the full SHA
    c1f1809 View commit details
  3. Copy the full SHA
    4ca0e3c View commit details
Showing with 11 additions and 3 deletions.
  1. +2 −2 pom.xml
  2. +9 −1 src/main/java/dev/nincodedo/ninbot/components/reaction/ReactionListener.java
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
</parent>
<groupId>dev.nincodedo</groupId>
<artifactId>ninbot</artifactId>
<version>3.3.0</version>
<version>3.4.0</version>
<name>Ninbot</name>
<description>Discord bot for OCW Discord using JDA</description>
<url>https://github.com/Nincodedo/Ninbot</url>
@@ -49,7 +49,7 @@
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
<sap-conversational-ai-java-api.version>0.0.4</sap-conversational-ai-java-api.version>
<pitest-maven.version>1.7.5</pitest-maven.version>
<pitest-maven.version>1.7.6</pitest-maven.version>
<sonar.coverage.jacoco.xmlReportPaths>target/site/jacoco/jacoco.xml,target/site/jacoco-it/jacoco.xml
</sonar.coverage.jacoco.xmlReportPaths>
<sortpom-maven-plugin.version>3.0.1</sortpom-maven-plugin.version>
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
package dev.nincodedo.ninbot.components.reaction;

import dev.nincodedo.ninbot.common.StatAwareListenerAdapter;
import dev.nincodedo.ninbot.common.logging.UtilLogging;
import dev.nincodedo.ninbot.components.config.component.ComponentService;
import dev.nincodedo.ninbot.components.config.component.ComponentType;
import dev.nincodedo.ninbot.components.stats.StatCategory;
import dev.nincodedo.ninbot.components.stats.StatManager;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.List;

@Slf4j
@Component
class ReactionListener extends StatAwareListenerAdapter {

@@ -35,7 +38,12 @@ public ReactionListener(List<ReactionResponse> reactionResponseList, ComponentSe
public void onMessageReceived(MessageReceivedEvent event) {
if (event.isFromGuild() && !event.getAuthor().isBot()
&& !componentService.isDisabled(componentName, event.getGuild().getId())) {
respond(event);
try {
respond(event);
} catch (Exception e) {
log.error("Reaction listener error in server {} in channel {}",
UtilLogging.logGuildInfo(event.getGuild()), UtilLogging.logChannelInfo(event.getChannel()), e);
}
}
}