From d31313b0069225df99c0a4228c3c30b8fc8ed002 Mon Sep 17 00:00:00 2001 From: "Vyacheslav N. Boyko" Date: Thu, 2 Aug 2018 10:37:19 +0300 Subject: [PATCH] disable all notices --- .../DeferredMessageRepository.java | 2 +- .../jircbot/listeners/AutoRejoinListener.java | 2 +- .../jircbot/listeners/BashOrgListener.java | 2 +- .../listeners/DeferredMessagesListener.java | 20 +++++++++++-------- .../listeners/GrammarCorrectorListener.java | 2 +- .../listeners/LinkPreviewListener.java | 2 +- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/main/java/ru/bvn13/jircbot/database/repositories/DeferredMessageRepository.java b/src/main/java/ru/bvn13/jircbot/database/repositories/DeferredMessageRepository.java index 5e7a120..67bab0b 100644 --- a/src/main/java/ru/bvn13/jircbot/database/repositories/DeferredMessageRepository.java +++ b/src/main/java/ru/bvn13/jircbot/database/repositories/DeferredMessageRepository.java @@ -15,6 +15,6 @@ import java.util.List; public interface DeferredMessageRepository extends JpaRepository { List getDeferredMessagesByChannelNameAndRecipientAndSentOrderByDtCreated(String channelName, String recipient, Boolean sent); @Query(nativeQuery=true, - value = "select d.* from DeferredMessage as d where d.channelName = :channelName and d.recipientIdent regexp :ident and d.sent = :sent") + value = "select d.* from DeferredMessage as d where d.channelName = :channelName and :ident ~ d.recipientIdent and d.sent = :sent") List getDeferredMessagesByChannelNameAndRecipientIdentAndSentOrderByDtCreated(@Param("channelName") String channelName, @Param("ident") String recipientIdent, @Param("sent") Boolean sent); } diff --git a/src/main/java/ru/bvn13/jircbot/listeners/AutoRejoinListener.java b/src/main/java/ru/bvn13/jircbot/listeners/AutoRejoinListener.java index 79a343a..cd50237 100644 --- a/src/main/java/ru/bvn13/jircbot/listeners/AutoRejoinListener.java +++ b/src/main/java/ru/bvn13/jircbot/listeners/AutoRejoinListener.java @@ -48,7 +48,7 @@ public class AutoRejoinListener extends ImprovedListenerAdapter { if (wasKicked) { wasKicked = false; - this.sendNotice(event, ""+offender+", "+ AdviceEngine.getAdvice()); + event.respond(""+offender+", "+ AdviceEngine.getAdvice()); } } diff --git a/src/main/java/ru/bvn13/jircbot/listeners/BashOrgListener.java b/src/main/java/ru/bvn13/jircbot/listeners/BashOrgListener.java index 02159e4..f636e23 100644 --- a/src/main/java/ru/bvn13/jircbot/listeners/BashOrgListener.java +++ b/src/main/java/ru/bvn13/jircbot/listeners/BashOrgListener.java @@ -46,7 +46,7 @@ public class BashOrgListener extends ImprovedListenerAdapter { } try { - this.sendNotice(event, getRandomBashQuote()); + event.respond(getRandomBashQuote()); } catch (Exception e) { event.respond("ОШИБКА: "+e.getMessage()); e.printStackTrace(); diff --git a/src/main/java/ru/bvn13/jircbot/listeners/DeferredMessagesListener.java b/src/main/java/ru/bvn13/jircbot/listeners/DeferredMessagesListener.java index 31a3201..a660fb2 100644 --- a/src/main/java/ru/bvn13/jircbot/listeners/DeferredMessagesListener.java +++ b/src/main/java/ru/bvn13/jircbot/listeners/DeferredMessagesListener.java @@ -47,33 +47,33 @@ public class DeferredMessagesListener extends ImprovedListenerAdapter { String userName = event.getUser().getNick(); String channelName = this.getChannelName(event); - String userIdent = event.getUser().getIdent(); + String userIdent = event.getUser().getNick() + "!" + event.getUser().getLogin() + "@" + event.getUser().getHostname(); if (event.getMessage().startsWith(COMMAND)) { String message = event.getMessage().replace(COMMAND, "").trim(); String commands[] = message.split(" ", 2); if (commands.length != 2) { - event.respond("Deferred messages usage: ?tell your message here"); + event.respond("Deferred messages usage: ?tell your message here"); return; } if (commands[0].equalsIgnoreCase("me")) { // deferred to myself deferredMessageService.saveDeferredMessage(channelName, userName, userName.toLowerCase(), commands[1]); - this.sendNotice(event,"Saved message to "+userName); + event.respond("Saved message to "+userName); } else { if (commands[0].equalsIgnoreCase(event.getBot().getUserBot().getNick())) { - this.sendNotice(event,"Sorry, message cannot be deferred to me."); + event.respond("Sorry, message cannot be deferred to me."); } else { // deferred to somebody deferredMessageService.saveDeferredMessage(channelName, userName, commands[0].toLowerCase(), commands[1]); - this.sendNotice(event, "Saved message to " + commands[0]); + event.respond("Saved message to " + commands[0]); } } } else if (event.getMessage().startsWith(COMMAND_FORGET)) { int count = deferredMessageService.forgetAllMessages(channelName, userName, userIdent); - this.sendNotice(event, "All "+count+" messages to "+userName+" were deleted"); + event.respond("All "+count+" messages to "+userName+" were deleted"); } else if (event.getMessage().startsWith(COMMAND_READ)) { List deferredMessages = deferredMessageService.getDeferredMessagesForUser(channelName, userName, userIdent); deferredMessages.forEach(msg -> { @@ -89,7 +89,9 @@ public class DeferredMessagesListener extends ImprovedListenerAdapter { private void sendDeferredMessage(final MessageEvent event) { - List deferredMessages = deferredMessageService.getDeferredMessagesForUser(this.getChannelName(event), event.getUser().getNick().toLowerCase(), event.getUser().getIdent()); + String userIdent = event.getUser().getNick() + "!" + event.getUser().getLogin() + "@" + event.getUser().getHostname(); + + List deferredMessages = deferredMessageService.getDeferredMessagesForUser(this.getChannelName(event), event.getUser().getNick().toLowerCase(), userIdent); if (deferredMessages != null && deferredMessages.size() > 0) { DeferredMessage msg = deferredMessages.get(0); String more = "" + (deferredMessages.size() > 1 ? " ("+(deferredMessages.size()-1)+" message/-s more)" : ""); @@ -106,7 +108,9 @@ public class DeferredMessagesListener extends ImprovedListenerAdapter { return; } - List deferredMessages = deferredMessageService.getDeferredMessagesForUser(this.getChannelName(event), event.getUser().getNick().toLowerCase(), event.getUser().getIdent()); + String userIdent = event.getUser().getNick() + "!" + event.getUser().getLogin() + "@" + event.getUser().getHostname(); + + List deferredMessages = deferredMessageService.getDeferredMessagesForUser(this.getChannelName(event), event.getUser().getNick().toLowerCase(), userIdent); if (deferredMessages != null && deferredMessages.size() > 0) { event.respond("You have "+deferredMessages.size()+" unread message(-s)"); } diff --git a/src/main/java/ru/bvn13/jircbot/listeners/GrammarCorrectorListener.java b/src/main/java/ru/bvn13/jircbot/listeners/GrammarCorrectorListener.java index 9c299e8..3181046 100644 --- a/src/main/java/ru/bvn13/jircbot/listeners/GrammarCorrectorListener.java +++ b/src/main/java/ru/bvn13/jircbot/listeners/GrammarCorrectorListener.java @@ -64,7 +64,7 @@ public class GrammarCorrectorListener extends ImprovedListenerAdapter { Matcher matcher = REGEX.matcher(data[0].trim()); if (matcher.find() && !matcher.group().trim().equalsIgnoreCase(data[2].trim())) { String correct = matcher.group().replace(data[1], data[2]); - this.sendNotice(event,"*"+correct); + event.respond("*"+correct); } //} }); diff --git a/src/main/java/ru/bvn13/jircbot/listeners/LinkPreviewListener.java b/src/main/java/ru/bvn13/jircbot/listeners/LinkPreviewListener.java index 6e6488d..55c227e 100644 --- a/src/main/java/ru/bvn13/jircbot/listeners/LinkPreviewListener.java +++ b/src/main/java/ru/bvn13/jircbot/listeners/LinkPreviewListener.java @@ -53,7 +53,7 @@ public class LinkPreviewListener extends ImprovedListenerAdapter { for (String link : links) { String info = parseLink(link); if (info != null && !info.isEmpty()) { - this.sendNotice(event, info); + event.respond(info); } };