change the pr merge method from command to message

src/main/java/cholog/discord/command/PingPongCommand.java

@@ -1,6 +1,5 @@
 package cholog.discord.command;
 
-import cholog.discord.SlashCommand;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import org.springframework.stereotype.Component;
 

src/main/java/cholog/discord/SlashCommand.java → src/main/java/cholog/discord/command/SlashCommand.java

@@ -1,4 +1,4 @@
-package cholog.discord;
+package cholog.discord.command;
 
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;

src/main/java/cholog/discord/SlashCommandListenerMapper.java → src/main/java/cholog/discord/command/SlashCommandListenerMapper.java

@@ -1,4 +1,4 @@
-package cholog.discord;
+package cholog.discord.command;
 
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;

src/main/java/cholog/discord/SlashCommandRegistry.java → src/main/java/cholog/discord/command/SlashCommandRegistry.java

@@ -1,4 +1,4 @@
-package cholog.discord;
+package cholog.discord.command;
 
 import jakarta.annotation.PostConstruct;
 import net.dv8tion.jda.api.entities.Guild;

src/main/java/cholog/discord/message/GithubPullRequestMergeSubscription.java

@@ -0,0 +1,101 @@
+package cholog.discord.message;
+
+import cholog.github.GithubApi;
+import cholog.github.PullRequest;
+import cholog.github.PullRequestMergeRequest;
+import cholog.github.PullRequestUrl;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Objects;
+
+@Component
+public final class GithubPullRequestMergeSubscription implements MessageSubscription {
+
+    private static final Logger log = LoggerFactory.getLogger(GithubPullRequestMergeSubscription.class);
+
+    private final MessagesProperties properties;
+
+    private final GithubApi githubApi;
+
+    public GithubPullRequestMergeSubscription(
+            final MessagesProperties properties,
+            final GithubApi githubApi
+    ) {
+        this.properties = properties;
+        this.githubApi = githubApi;
+    }
+
+    @Override
+    public String channelId() {
+        return properties.prMergeChannelId();
+    }
+
+    @Override
+    public void onEvent(final MessageReceivedEvent event) {
+        final var message = event.getMessage();
+        final var urls = Arrays.stream(message.getContentRaw().split("\\s+"))
+                .map(String::trim)
+                .filter(it -> it.startsWith("http:"))
+                .toList();
+
+        final var fails = new HashMap<String, String>();
+        for (final String url : urls) {
+            final var pullRequestUrl = new PullRequestUrl(url);
+
+            if (properties.isDisallowOrganization(pullRequestUrl.owner())) {
+                fails.put(url, pullRequestUrl.owner() + "는 허용하지 않는 조직입니다.");
+                continue;
+            }
+            if (properties.isDisallowRepository(pullRequestUrl.repository())) {
+                fails.put(url, pullRequestUrl.repository() + "는 허용하지 않는 저장소입니다.");
+                continue;
+            }
+
+            final var pullRequest = githubApi.getPullRequest(
+                    pullRequestUrl.owner(),
+                    pullRequestUrl.repository(),
+                    pullRequestUrl.pullNumber()
+            );
+            if (pullRequest.state() == PullRequest.PullRequestState.CLOSED) {
+                fails.put(url, "이미 닫힌 PR입니다.");
+                continue;
+            }
+
+            final var targetBranch = pullRequest.base().ref();
+            if (properties.isDisallowBranch(targetBranch)) {
+                fails.put(url, targetBranch + "브랜치에는 머지할 수 없습니다.");
+                return;
+            }
+
+            final var mergeRequest = new PullRequestMergeRequest(
+                    "고생하셨습니다.",
+                    ":tada: PR 머지 완료! :tada:",
+                    pullRequest.head().sha(),
+                    PullRequestMergeRequest.MergeMethod.SQUASH
+            );
+            final var mergeResult = githubApi.mergePullRequest(
+                    pullRequestUrl.owner(),
+                    pullRequestUrl.repository(),
+                    pullRequestUrl.pullNumber(),
+                    mergeRequest
+            );
+            if (!mergeResult.merged()) {
+                fails.put(url, mergeResult.message());
+            }
+        }
+
+        final var doneEmoji = Objects.requireNonNull(message.getJDA().getEmojiById(":done:"));
+        message.addReaction(doneEmoji).queue();
+        if (!fails.isEmpty()) {
+            final var failMessages = fails.entrySet().stream()
+                    .map(entry -> entry.getKey() + ": " + entry.getValue())
+                    .collect(StringBuilder::new, StringBuilder::append, StringBuilder::append);
+            message.reply(failMessages).queue();
+        }
+    }
+}

src/main/java/cholog/discord/message/MergeSubscriptionMapper.java

@@ -0,0 +1,42 @@
+package cholog.discord.message;
+
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.lang.NonNull;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+import static java.util.stream.Collectors.toMap;
+
+@Component
+public final class MergeSubscriptionMapper extends ListenerAdapter {
+
+    private static final Logger log = LoggerFactory.getLogger(MergeSubscriptionMapper.class);
+
+    private final Map<String, MessageSubscription> messageSubscriptions;
+
+    MergeSubscriptionMapper(final List<MessageSubscription> messageSubscriptions) {
+        this.messageSubscriptions = messageSubscriptions.stream()
+                .collect(toMap(MessageSubscription::channelId, command -> command));
+    }
+
+    @Override
+    public void onMessageReceived(@NonNull final MessageReceivedEvent event) {
+        if (event.getAuthor().isBot()) {
+            log.debug("Bot message");
+            return;
+        }
+
+        final var channelId = event.getChannel().getId();
+        final var messageSubscription = messageSubscriptions.get(channelId);
+        if (messageSubscription == null) {
+            log.debug("Message subscription not found [channelId={}, message={}]", channelId, event.getMessage());
+            return;
+        }
+        messageSubscription.onEvent(event);
+    }
+}

src/main/java/cholog/discord/message/MessageSubscription.java

@@ -0,0 +1,10 @@
+package cholog.discord.message;
+
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+
+public interface MessageSubscription {
+
+    String channelId();
+
+    void onEvent(MessageReceivedEvent event);
+}

src/main/java/cholog/discord/command/CommandsConfiguration.java → src/main/java/cholog/discord/message/MessagesConfiguration.java

@@ -1,10 +1,10 @@
-package cholog.discord.command;
+package cholog.discord.message;
 
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
-@EnableConfigurationProperties(CommandsProperties.class)
+@EnableConfigurationProperties(MessagesProperties.class)
 @Configuration
-public class CommandsConfiguration {
+public class MessagesConfiguration {
 
 }

src/main/java/cholog/discord/command/CommandsProperties.java → src/main/java/cholog/discord/message/MessagesProperties.java

@@ -1,11 +1,11 @@
-package cholog.discord.command;
+package cholog.discord.message;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 import java.util.List;
 
-@ConfigurationProperties(prefix = "cholog.jda.commands")
-public record CommandsProperties(
+@ConfigurationProperties(prefix = "cholog.jda.subscriptions")
+public record MessagesProperties(
         PrMergeProperties prMerge
 ) {
 

src/main/resources/application.yml

@@ -10,7 +10,7 @@ cholog:
   jda:
     token:
     guild-id:
-    commands:
+    subscriptions:
       pr-merge:
         channel-id:
         allow-organizations: