From 301cf744701d3deafdec6c2fef9de94b4a0421db Mon Sep 17 00:00:00 2001
From: Dmitry Isaenko <developer.su@gmail.com>
Date: Tue, 29 Jan 2019 02:57:11 +0300
Subject: [PATCH] v0.5.1 rolling: PING works as expected

---
 pom.xml                                             |  2 +-
 src/main/java/InnaIrcBot/Commanders/CTCPHelper.java | 12 ++++++++++--
 src/main/java/InnaIrcBot/GlobalData.java            |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 148eb92..bc0bd77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>loper</groupId>
     <artifactId>InnaIrcBot</artifactId>
-    <version>0.5-SNAPSHOT</version>
+    <version>0.5.1-SNAPSHOT</version>
 
     <packaging>jar</packaging>
     <name>InnaIrcBot</name>
diff --git a/src/main/java/InnaIrcBot/Commanders/CTCPHelper.java b/src/main/java/InnaIrcBot/Commanders/CTCPHelper.java
index 6619b14..f678338 100644
--- a/src/main/java/InnaIrcBot/Commanders/CTCPHelper.java
+++ b/src/main/java/InnaIrcBot/Commanders/CTCPHelper.java
@@ -2,6 +2,7 @@ package InnaIrcBot.Commanders;
 
 import InnaIrcBot.ProvidersConsumers.StreamProvider;
 
+import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -55,7 +56,10 @@ public class CTCPHelper {
                 if (current.isValid(currentTime)){
                     chanelOrUser = current.getRequesterChanelOrUser(whoReplied);
                     if ( chanelOrUser != null && current.getType().equals(whatReplied.replaceAll("\\s.*$", ""))) {
-                        StreamProvider.writeToStream(serverReplied, "PRIVMSG " + chanelOrUser + " :" + whoReplied + ": " + whatReplied);
+                        if (whatReplied.equals("PING inna"))
+                            StreamProvider.writeToStream(serverReplied, "PRIVMSG " + chanelOrUser + " :" + whoReplied + ": " + Duration.between(current.getCreationTime(), currentTime).toMillis()+"ms");
+                        else
+                            StreamProvider.writeToStream(serverReplied, "PRIVMSG " + chanelOrUser + " :" + whoReplied + ": " + whatReplied);
                         iterator.remove();
                     }
                 }
@@ -110,7 +114,6 @@ class CtcpRequest {
         this.notFoundMessage = notFoundMessage;
         this.CTCPtype = CTCPType;
     }
-    String getType(){ return CTCPtype; }
     String getRequesterChanelOrUser(String userResponds){      // return channel name
         if (userResponding.equals(userResponds))
             return requesterChanelOrUser;
@@ -120,6 +123,11 @@ class CtcpRequest {
     boolean isValid(LocalDateTime currentTime){
         return currentTime.isBefore(initiatedTime.plusSeconds(5));
     }
+
+    String getType(){ return CTCPtype; }
+
+    LocalDateTime getCreationTime(){ return initiatedTime; }
+
     String getNotFoundMessage(String userResponds){
         if (this.userResponding.equals(userResponds))
             if (notFoundMessage.isEmpty())
diff --git a/src/main/java/InnaIrcBot/GlobalData.java b/src/main/java/InnaIrcBot/GlobalData.java
index 556bdbb..84a215e 100644
--- a/src/main/java/InnaIrcBot/GlobalData.java
+++ b/src/main/java/InnaIrcBot/GlobalData.java
@@ -1,7 +1,7 @@
 package InnaIrcBot;
 
 public class GlobalData {
-    private static final String version = "InnaIrcBot v0.5 \"Шикотан\"";
+    private static final String version = "InnaIrcBot v0.5.1 \"Шикотан\"";
     public static synchronized String getAppVersion(){
         return version;
     }