mirror of https://github.com/bvn13/JIrcBot.git
pull/6/head
parent
5d12353a78
commit
e4a55d5714
|
@ -27,7 +27,9 @@ public class ImprovedListenerAdapter extends ListenerAdapter {
|
||||||
|
|
||||||
protected boolean isUserOnline(GenericEvent event, String username) {
|
protected boolean isUserOnline(GenericEvent event, String username) {
|
||||||
|
|
||||||
List<String> usersNicks = event.getBot().getUserChannelDao().getAllUsers().stream()
|
String channel = getChannelName(event);
|
||||||
|
|
||||||
|
List<String> usersNicks = event.getBot().getUserChannelDao().getChannel(channel).getUsers().stream()
|
||||||
.map(u -> u.getNick().toLowerCase()).collect(Collectors.toList());
|
.map(u -> u.getNick().toLowerCase()).collect(Collectors.toList());
|
||||||
|
|
||||||
return usersNicks.contains(username.toLowerCase());
|
return usersNicks.contains(username.toLowerCase());
|
||||||
|
|
|
@ -67,7 +67,7 @@ public class DeferredMessagesListener extends ImprovedListenerAdapter {
|
||||||
event.respond("Sorry, message cannot be deferred to me.");
|
event.respond("Sorry, message cannot be deferred to me.");
|
||||||
} else {
|
} else {
|
||||||
// deferred to somebody
|
// deferred to somebody
|
||||||
if (isUserOnline(event, userName)) {
|
if (isUserOnline(event, commands[0])) {
|
||||||
event.respond(String.format("%s is online, tell him/her directly, please.", commands[0]));
|
event.respond(String.format("%s is online, tell him/her directly, please.", commands[0]));
|
||||||
} else {
|
} else {
|
||||||
deferredMessageService.saveDeferredMessage(channelName, userName, commands[0].toLowerCase(), commands[1]);
|
deferredMessageService.saveDeferredMessage(channelName, userName, commands[0].toLowerCase(), commands[1]);
|
||||||
|
|
Loading…
Reference in New Issue