bvn13
/
JIrcBot
mirror of https://github.com/bvn13/JIrcBot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

disable all notices

pull/6/head
Vyacheslav N. Boyko 2018-08-02 10:37:19 +03:00
parent 0390d19e73
commit d31313b006
6 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/ru/bvn13/jircbot/database/repositories/DeferredMessageRepository.java
View File

@ -15,6 +15,6 @@ import java.util.List;
public interface DeferredMessageRepository extends JpaRepository<DeferredMessage, Long> {
List<DeferredMessage> 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<DeferredMessage> getDeferredMessagesByChannelNameAndRecipientIdentAndSentOrderByDtCreated(@Param("channelName") String channelName, @Param("ident") String recipientIdent, @Param("sent") Boolean sent);
}

2
src/main/java/ru/bvn13/jircbot/listeners/AutoRejoinListener.java
View File

@ -48,7 +48,7 @@ public class AutoRejoinListener extends ImprovedListenerAdapter {
if (wasKicked) {
wasKicked = false;
this.sendNotice(event, ""+offender+", "+ AdviceEngine.getAdvice());
event.respond(""+offender+", "+ AdviceEngine.getAdvice());
}
}

2
src/main/java/ru/bvn13/jircbot/listeners/BashOrgListener.java
View File

@ -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();

20
src/main/java/ru/bvn13/jircbot/listeners/DeferredMessagesListener.java
View File

@ -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 <UserNick/ME> your message here");
event.respond("Deferred messages usage: ?tell <UserNick/ME/Ident> 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<DeferredMessage> 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<DeferredMessage> 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<DeferredMessage> 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<DeferredMessage> 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<DeferredMessage> 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)");
}

2
src/main/java/ru/bvn13/jircbot/listeners/GrammarCorrectorListener.java
View File

@ -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);
}
//}
});

2
src/main/java/ru/bvn13/jircbot/listeners/LinkPreviewListener.java
View File

@ -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);
}
};