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

fixed bug: double answering with deferred message if user prints into chat very quickly

pull/11/head
bvn13 2019-11-04 10:12:52 +03:00
parent 6cbf281698
commit ebb4002892
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>ru.bvn13</groupId>
<artifactId>jircbot</artifactId>
<version>2.2.1</version>
<version>2.2.2</version>
<packaging>jar</packaging>
<parent>
@ -18,8 +18,6 @@
<properties>
<bot.version>2.2.1</bot.version>
<java.version>1.8</java.version>
<pircbotx.version>2.3-SNAPSHOT</pircbotx.version>

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

@ -16,7 +16,10 @@ import ru.bvn13.jircbot.documentation.DocumentationProvider;
import ru.bvn13.jircbot.documentation.ListenerDescription;
import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import static ru.bvn13.jircbot.documentation.ListenerDescription.CommandDescription;
@ -36,6 +39,8 @@ public class DeferredMessagesListener extends ImprovedListenerAdapter implements
private DeferredMessageService deferredMessageService;
private Map<String, Object> mutexes = new ConcurrentHashMap<>();
@Autowired
public DeferredMessagesListener(DocumentationProvider documentationProvider) {
registerDescription(documentationProvider);
@ -127,18 +132,21 @@ public class DeferredMessagesListener extends ImprovedListenerAdapter implements
}
private void sendDeferredMessage(final MessageEvent event) {
if (event.getUser() != null) {
String userIdent = event.getUser().getNick() + "!" + event.getUser().getLogin() + "@" + event.getUser().getHostname();
Object mutex = mutexes.containsKey(userIdent) ? mutexes.get(userIdent) : new Object();
mutexes.put(userIdent, mutex);
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)" : "");
event.respond("User " + msg.getSender() + " at " + dt.format(msg.getDtCreated()) + " told you" + more + ": " + msg.getMessage());
deferredMessageService.markMessageWasSent(msg);
synchronized (mutex) {
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)" : "");
event.respond("User " + msg.getSender() + " at " + dt.format(msg.getDtCreated()) + " told you" + more + ": " + msg.getMessage());
deferredMessageService.markMessageWasSent(msg);
}
}
}
}

2
src/main/resources/application.properties
View File

@ -1,5 +1,5 @@
jircbot.version=2.2.1
jircbot.version=2.2.2
jircbot.config=config.json