All IRCProcessors should parse the dates from the server where provided, not just some of them.

irc/src/main/java/com/dmdirc/parser/irc/IRCParser.java

@@ -1214,7 +1214,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
                         case IrcConstants.NUMERIC_ERROR_PASSWORD_MISMATCH:
                         case IrcConstants.NUMERIC_ERROR_NICKNAME_IN_USE:
                             try {
-                                myProcessingManager.process(sParam, token);
+                                myProcessingManager.process(lineTS, sParam, token);
                             } catch (ProcessorNotFoundException e) {
                             }
                             break;

irc/src/main/java/com/dmdirc/parser/irc/ProcessingManager.java

@@ -125,17 +125,6 @@ public class ProcessingManager {
         }
     }
 
-    /**
-     * Process a Line.
-     *
-     * @param sParam Type of line to process ("005", "PRIVMSG" etc)
-     * @param token IRCTokenised line to process
-     * @throws ProcessorNotFoundException exception if no processors exists to handle the line
-     */
-    public void process(final String sParam, final String... token) throws ProcessorNotFoundException {
-        process(LocalDateTime.now(), sParam, token);
-    }
-
     /**
      * Process a Line.
      *
@@ -149,11 +138,7 @@ public class ProcessingManager {
         IRCProcessor messageProcessor = null;
         try {
             messageProcessor = getProcessor(sParam);
-            if (messageProcessor instanceof TimestampedIRCProcessor) {
-                ((TimestampedIRCProcessor)messageProcessor).process(date, sParam, token);
-            } else {
-                messageProcessor.process(sParam, token);
-            }
+            messageProcessor.process(date, sParam, token);
         } catch (ProcessorNotFoundException p) {
             throw p;
         } catch (Exception e) {
@@ -164,9 +149,9 @@ public class ProcessingManager {
             parser.callErrorInfo(ei);
         } finally {
             // Try to call callNumeric. We don't want this to work if sParam is a non
-            // integer param, hense the empty catch
+            // integer param, hence the empty catch
             try {
-                callNumeric(Integer.parseInt(sParam), token);
+                callNumeric(date, Integer.parseInt(sParam), token);
             } catch (NumberFormatException e) {
             }
         }
@@ -178,8 +163,8 @@ public class ProcessingManager {
      * @param numeric What numeric is this for
      * @param token IRC Tokenised line
      */
-    protected void callNumeric(final int numeric, final String... token) {
-        parser.getCallbackManager().publish(new NumericEvent(parser, LocalDateTime.now(), numeric,
+    protected void callNumeric(final LocalDateTime time, final int numeric, final String... token) {
+        parser.getCallbackManager().publish(new NumericEvent(parser, time, numeric,
                 token));
     }
 }

irc/src/main/java/com/dmdirc/parser/irc/TimestampedIRCProcessor.java

@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2006-2017 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.parser.irc;
-
-import com.dmdirc.parser.irc.processors.IRCProcessor;
-
-import java.time.LocalDateTime;
-
-/**
- * TimestampedIRCProcessor.
- *
- * Superclass for all IRCProcessor types that accept timestamps for process.
- */
-public abstract class TimestampedIRCProcessor extends IRCProcessor {
-
-    /**
-     * Create a new instance of the IRCTimestampedProcessor Object.
-     *
-     * @param parser IRCParser That owns this IRCProcessor
-     * @param handledTokens Tokens that this processor handles
-     */
-    protected TimestampedIRCProcessor(final IRCParser parser, final String... handledTokens) {
-        super(parser, handledTokens);
-    }
-
-    @Override
-    public final void process(final String sParam, final String... token) {
-        process(LocalDateTime.now(), sParam, token);
-    }
-
-    /**
-     * Process a Line.
-     *
-     * @param date Date of this line
-     * @param sParam Type of line to process ("005", "PRIVMSG" etc)
-     * @param token IRCTokenised line to process
-     */
-    public abstract void process(final LocalDateTime date, final String sParam,
-            final String... token);
-
-
-}

irc/src/main/java/com/dmdirc/parser/irc/processors/IRCProcessor.java

@@ -29,6 +29,8 @@ import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
 
+import java.time.LocalDateTime;
+
 /**
  * IRCProcessor.
  * Superclass for all IRCProcessor types.
@@ -130,10 +132,11 @@ public abstract class IRCProcessor {
     /**
      * Process a Line.
      *
+     * @param date Date of this line
      * @param sParam Type of line to process ("005", "PRIVMSG" etc)
      * @param token IRCTokenised line to process
      */
-    public abstract void process(final String sParam, final String... token);
+    public abstract void process(final LocalDateTime date, final String sParam, final String... token);
 
     /**
      * What does this IRCProcessor handle.

irc/src/main/java/com/dmdirc/parser/irc/processors/Process001.java

@@ -26,6 +26,7 @@ import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.irc.IRCParser;
 
+import java.time.LocalDateTime;
 import java.util.Collection;
 
 import javax.inject.Inject;
@@ -52,7 +53,7 @@ public class Process001 extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String... token) {
+    public void process(final LocalDateTime time, final String sParam, final String... token) {
         parser.got001 = true;
         // << :demon1.uk.quakenet.org 001 Java-Test :Welcome to the QuakeNet IRC Network, Java-Test
         parser.updateServerName(token[0].substring(1, token[0].length()));

irc/src/main/java/com/dmdirc/parser/irc/processors/Process004005.java

@@ -58,7 +58,7 @@ public class Process004005 extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String... token) {
+    public void process(final LocalDateTime time, final String sParam, final String... token) {
         switch (sParam) {
             case "002":
                 process002();

irc/src/main/java/com/dmdirc/parser/irc/processors/Process464.java

@@ -25,6 +25,7 @@ package com.dmdirc.parser.irc.processors;
 import com.dmdirc.parser.events.PasswordRequiredEvent;
 import com.dmdirc.parser.irc.IRCParser;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 import javax.inject.Inject;
@@ -51,14 +52,14 @@ public class Process464 extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String... token) {
-        callPasswordRequired();
+    public void process(final LocalDateTime time, final String sParam, final String... token) {
+        callPasswordRequired(time);
     }
 
     /**
      * Callback to all objects implementing the PasswordRequired Callback.
      */
-    protected void callPasswordRequired() {
-        getCallbackManager().publish(new PasswordRequiredEvent(parser, LocalDateTime.now()));
+    protected void callPasswordRequired(final LocalDateTime time) {
+        getCallbackManager().publish(new PasswordRequiredEvent(parser, time));
     }
 }

irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessAccount.java

@@ -25,6 +25,8 @@ package com.dmdirc.parser.irc.processors;
 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
 
+import java.time.LocalDateTime;
+
 import javax.inject.Inject;
 
 /**
@@ -49,7 +51,7 @@ public class ProcessAccount extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String... token) {
+    public void process(final LocalDateTime time, final String sParam, final String... token) {
         // :nick!user@host ACCOUNT accountname
         final IRCClientInfo iClient = getClientInfo(token[0]);
         if (iClient != null) {

irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessAway.java

@@ -52,7 +52,7 @@ public class ProcessAway extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String... token) {
+    public void process(final LocalDateTime time, final String sParam, final String... token) {
         final IRCClientInfo iClient = getClientInfo(token[0]);
         switch (sParam) {
             case "AWAY":
@@ -64,7 +64,7 @@ public class ProcessAway extends IRCProcessor {
                     iClient.setAwayState(reason.isEmpty() ? AwayState.HERE : AwayState.AWAY);
 
                     if (iClient == parser.getLocalClient()) {
-                        callAwayState(oldState, iClient.getAwayState(), iClient.getAwayReason());
+                        callAwayState(time, oldState, iClient.getAwayState(), iClient.getAwayReason());
                     }
                 }
                 break;
@@ -78,7 +78,7 @@ public class ProcessAway extends IRCProcessor {
                 // IRC HERE/BACK response
                 final AwayState oldState = parser.getLocalClient().getAwayState();
                 parser.getLocalClient().setAwayState("306".equals(sParam) ? AwayState.AWAY : AwayState.HERE);
-                callAwayState(oldState, parser.getLocalClient().getAwayState(), parser.getLocalClient().getAwayReason());
+                callAwayState(time, oldState, parser.getLocalClient().getAwayState(), parser.getLocalClient().getAwayReason());
                 break;
         }
     }
@@ -90,10 +90,10 @@ public class ProcessAway extends IRCProcessor {
      * @param currentState Current Away State
      * @param reason Best guess at away reason
      */
-    protected void callAwayState(final AwayState oldState, final AwayState currentState,
+    protected void callAwayState(final LocalDateTime time, final AwayState oldState, final AwayState currentState,
             final String reason) {
         getCallbackManager().publish(
-                new AwayStateEvent(parser, LocalDateTime.now(), oldState, currentState, reason));
+                new AwayStateEvent(parser, time, oldState, currentState, reason));
     }
 
 }

irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessCap.java

@@ -24,7 +24,6 @@ package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.irc.CapabilityState;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.TimestampedIRCProcessor;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -44,7 +43,7 @@ import javax.inject.Inject;
  * See: http://www.leeh.co.uk/draft-mitchell-irc-capabilities-02.html
  * See: http://ircv3.atheme.org/specification/capability-negotiation-3.1
  */
-public class ProcessCap extends TimestampedIRCProcessor {
+public class ProcessCap extends IRCProcessor {
     /** Have we handled the pre-connect cap request? */
     private boolean hasCapped;
     /** List of supported capabilities. */

irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessInvite.java

@@ -51,10 +51,10 @@ public class ProcessInvite extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String... token) {
+    public void process(final LocalDateTime time, final String sParam, final String... token) {
         // :Tobavaj!shane@Tobavaj.users.quakenet.org INVITE Dataforce #dataforceisgod 1188846462
         if (token.length > 2) {
-            callInvite(token[0].substring(1), token[3]);
+            callInvite(time, token[0].substring(1), token[3]);
         }
     }
 
@@ -64,9 +64,9 @@ public class ProcessInvite extends IRCProcessor {
      * @param userHost The hostname of the person who invited us
      * @param channel The name of the channel we were invited to
      */
-    protected void callInvite(final String userHost, final String channel) {
+    protected void callInvite(final LocalDateTime time, final String userHost, final String channel) {
         getCallbackManager().publish(new InviteEvent(
-                parser, LocalDateTime.now(), userHost, channel));
+                parser, time, userHost, channel));
     }
 
 }

irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessJoin.java

@@ -36,7 +36,6 @@ import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ModeManager;
 import com.dmdirc.parser.irc.PrefixModeManager;
 import com.dmdirc.parser.irc.ProcessorNotFoundException;
-import com.dmdirc.parser.irc.TimestampedIRCProcessor;
 import com.dmdirc.parser.irc.events.IRCDataOutEvent;
 import net.engio.mbassy.listener.Handler;
 
@@ -51,7 +50,7 @@ import javax.inject.Named;
 /**
  * Process a channel join.
  */
-public class ProcessJoin extends TimestampedIRCProcessor {
+public class ProcessJoin extends IRCProcessor {
 
     /** The manager to use to access prefix modes. */
     private final PrefixModeManager prefixModeManager;
@@ -155,7 +154,7 @@ public class ProcessJoin extends TimestampedIRCProcessor {
                         } else {
                             // If we are joining a channel we are already on, fake a part from
                             // the channel internally, and rejoin.
-                            parser.getProcessingManager().process("PART", token);
+                            parser.getProcessingManager().process(date, "PART", token);
                         }
                     } catch (ProcessorNotFoundException e) {
                     }

irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessKick.java

@@ -30,7 +30,6 @@ import com.dmdirc.parser.irc.IRCChannelClientInfo;
 import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.TimestampedIRCProcessor;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;
@@ -40,7 +39,7 @@ import javax.inject.Inject;
 /**
  * Process a channel kick.
  */
-public class ProcessKick extends TimestampedIRCProcessor {
+public class ProcessKick extends IRCProcessor {
 
     /**
      * Create a new instance of the IRCProcessor Object.

irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessList.java

@@ -53,20 +53,20 @@ public class ProcessList extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String... token) {
+    public void process(final LocalDateTime time, final String sParam, final String... token) {
         // :port80b.se.quakenet.org 321 MD87 Channel :Users  Name
         // :port80b.se.quakenet.org 322 MD87 #DMDirc 10 :
         // :port80b.se.quakenet.org 323 MD87 :End of /LIST
         switch (sParam) {
             case "321":
-                getCallbackManager().publish(new GroupListStartEvent(parser, LocalDateTime.now()));
+                getCallbackManager().publish(new GroupListStartEvent(parser, time));
                 break;
             case "322":
-                getCallbackManager().publish(new GroupListEntryEvent(parser, LocalDateTime.now(),
+                getCallbackManager().publish(new GroupListEntryEvent(parser, time,
                         token[3], Integer.parseInt(token[4]), token[5]));
                 break;
             case "323":
-                getCallbackManager().publish(new GroupListEndEvent(parser, LocalDateTime.now()));
+                getCallbackManager().publish(new GroupListEndEvent(parser, time));
                 break;
         }
     }

irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessListModes.java

@@ -29,7 +29,6 @@ import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ServerType;
 import com.dmdirc.parser.irc.ServerTypeGroup;
-import com.dmdirc.parser.irc.TimestampedIRCProcessor;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;
@@ -41,7 +40,7 @@ import javax.inject.Inject;
 /**
  * Process a List Modes.
  */
-public class ProcessListModes extends TimestampedIRCProcessor {
+public class ProcessListModes extends IRCProcessor {
 
     /**
      * Create a new instance of the IRCProcessor Object.

irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessMOTD.java

@@ -53,16 +53,16 @@ public class ProcessMOTD extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String... token) {
+    public void process(final LocalDateTime time, final String sParam, final String... token) {
         switch (sParam) {
             case "375":
-                callMOTDStart(token[token.length - 1]);
+                callMOTDStart(time, token[token.length - 1]);
                 break;
             case "372":
-                callMOTDLine(token[token.length - 1]);
+                callMOTDLine(time, token[token.length - 1]);
                 break;
             default:
-                callMOTDEnd("422".equals(sParam), token[token.length - 1]);
+                callMOTDEnd(time, "422".equals(sParam), token[token.length - 1]);
                 break;
         }
     }
@@ -73,8 +73,8 @@ public class ProcessMOTD extends IRCProcessor {
      * @param noMOTD Was this an MOTDEnd or NoMOTD
      * @param data The contents of the line (incase of language changes or so)
      */
-    protected void callMOTDEnd(final boolean noMOTD, final String data) {
-        getCallbackManager().publish(new MOTDEndEvent(parser, LocalDateTime.now(), noMOTD, data));
+    protected void callMOTDEnd(final LocalDateTime time, final boolean noMOTD, final String data) {
+        getCallbackManager().publish(new MOTDEndEvent(parser, time, noMOTD, data));
     }
 
     /**
@@ -82,8 +82,8 @@ public class ProcessMOTD extends IRCProcessor {
      *
      * @param data Incomming Line.
      */
-    protected void callMOTDLine(final String data) {
-        getCallbackManager().publish(new MOTDLineEvent(parser, LocalDateTime.now(), data));
+    protected void callMOTDLine(final LocalDateTime time, final String data) {
+        getCallbackManager().publish(new MOTDLineEvent(parser, time, data));
     }
 
     /**
@@ -91,8 +91,8 @@ public class ProcessMOTD extends IRCProcessor {
      *
      * @param data Incomming Line.
      */
-    protected void callMOTDStart(final String data) {
-        getCallbackManager().publish(new MOTDStartEvent(parser, LocalDateTime.now(), data));
+    protected void callMOTDStart(final LocalDateTime time, final String data) {
+        getCallbackManager().publish(new MOTDStartEvent(parser, time, data));
     }
 
 }

irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessMessage.java

@@ -50,7 +50,6 @@ import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.PrefixModeManager;
 import com.dmdirc.parser.irc.ProcessorNotFoundException;
-import com.dmdirc.parser.irc.TimestampedIRCProcessor;
 
 import java.time.LocalDateTime;
 import java.util.regex.PatternSyntaxException;
@@ -65,7 +64,7 @@ import javax.inject.Inject;
  * Actions are handled here aswell separately from CTCPs.<br>
  * Each type has 5 Calls, making 15 callbacks handled here.
  */
-public class ProcessMessage extends TimestampedIRCProcessor {
+public class ProcessMessage extends IRCProcessor {
 
     /** The manager to use to access prefix modes. */
     private final PrefixModeManager prefixModeManager;

irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessMode.java

@@ -39,7 +39,6 @@ import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ModeManager;
 import com.dmdirc.parser.irc.PrefixModeManager;
-import com.dmdirc.parser.irc.TimestampedIRCProcessor;
 
 import java.time.LocalDateTime;
 import java.util.Calendar;
@@ -50,7 +49,7 @@ import javax.inject.Named;
 /**
  * Process a Mode line.
  */
-public class ProcessMode extends TimestampedIRCProcessor {
+public class ProcessMode extends IRCProcessor {
 
     /** The manager to use to access prefix modes. */
     private final PrefixModeManager prefixModeManager;
@@ -236,7 +235,7 @@ public class ProcessMode extends TimestampedIRCProcessor {
                         if (!"324".equals(sParam)) {
                             getCallbackManager().publish(
                                     new ChannelSingleModeChangeEvent(
-                                            parser, LocalDateTime.now(), iChannel,
+                                            parser, date, iChannel,
                                             setterCCI, token[0], cPositive + cMode + " " +
                                             sModeParam));
                         }
@@ -251,7 +250,7 @@ public class ProcessMode extends TimestampedIRCProcessor {
                             if (!"324".equals(sParam)) {
                                 getCallbackManager().publish(
                                         new ChannelSingleModeChangeEvent(
-                                                parser, LocalDateTime.now(),
+                                                parser, date,
                                                 iChannel, setterCCI, token[0],
                                                 cPositive + cMode + " " +
                                                         sModeParam));
@@ -269,7 +268,7 @@ public class ProcessMode extends TimestampedIRCProcessor {
                             if (!"324".equals(sParam)) {
                                 getCallbackManager().publish(
                                         new ChannelSingleModeChangeEvent(
-                                                parser, LocalDateTime.now(),
+                                                parser, date,
                                                 iChannel, setterCCI, token[0],
                                                 trim(cPositive + cMode + " " + sModeParam)));
                             }
@@ -290,7 +289,7 @@ public class ProcessMode extends TimestampedIRCProcessor {
         } else {
             callChannelModeChanged(date, iChannel, setterCCI, token[0], sFullModeStr.toString().trim());
             getCallbackManager().publish(
-                    new ChannelNonUserModeChangeEvent(parser, LocalDateTime.now(), iChannel,
+                    new ChannelNonUserModeChangeEvent(parser, date, iChannel,
                             setterCCI, token[0],
                             trim(sNonUserModeStr.toString() + sNonUserModeStrParams)));
         }

irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessNames.java

@@ -69,7 +69,7 @@ public class ProcessNames extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String... token) {
+    public void process(final LocalDateTime time, final String sParam, final String... token) {
         final IRCChannelInfo iChannel;
         if ("366".equals(sParam)) {
             // End of names
@@ -79,11 +79,11 @@ public class ProcessNames extends IRCProcessor {
             }
 
             if (!iChannel.hadTopic()) {
-                callChannelTopic(iChannel, true);
+                callChannelTopic(time, iChannel, true);
             }
 
             iChannel.setAddingNames(false);
-            callChannelGotNames(iChannel);
+            callChannelGotNames(time, iChannel);
 
             if (!iChannel.hasAskedForListModes()
                     && parser.getAutoListMode()) {
@@ -146,10 +146,10 @@ public class ProcessNames extends IRCProcessor {
      * @param cChannel Channel that topic was set on
      * @param bIsJoinTopic True when getting topic on join, false if set by user/server
      */
-    protected void callChannelTopic(final ChannelInfo cChannel, final boolean bIsJoinTopic) {
+    protected void callChannelTopic(final LocalDateTime time, final ChannelInfo cChannel, final boolean bIsJoinTopic) {
         ((IRCChannelInfo) cChannel).setHadTopic();
         getCallbackManager().publish(
-                new ChannelTopicEvent(parser, LocalDateTime.now(), cChannel, bIsJoinTopic));
+                new ChannelTopicEvent(parser, time, cChannel, bIsJoinTopic));
     }
 
     /**
@@ -157,8 +157,8 @@ public class ProcessNames extends IRCProcessor {
      *
      * @param cChannel Channel which the names reply is for
      */
-    protected void callChannelGotNames(final ChannelInfo cChannel) {
-        getCallbackManager().publish(new ChannelNamesEvent(parser, LocalDateTime.now(), cChannel));
+    protected void callChannelGotNames(final LocalDateTime time, final ChannelInfo cChannel) {
+        getCallbackManager().publish(new ChannelNamesEvent(parser, time, cChannel));
     }
 
 }

irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessNick.java

@@ -32,7 +32,6 @@ import com.dmdirc.parser.irc.IRCChannelClientInfo;
 import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.TimestampedIRCProcessor;
 
 import java.time.LocalDateTime;
 
@@ -41,7 +40,7 @@ import javax.inject.Inject;
 /**
  * Process a Nick change.
  */
-public class ProcessNick extends TimestampedIRCProcessor {
+public class ProcessNick extends IRCProcessor {
 
     /**
      * Create a new instance of the IRCProcessor Object.

irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessNickInUse.java

@@ -63,8 +63,8 @@ public class ProcessNickInUse extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String... token) {
-        callNickInUse(token[3]);
+    public void process(final LocalDateTime time, final String sParam, final String... token) {
+        callNickInUse(time, token[3]);
     }
 
     /**
@@ -72,8 +72,8 @@ public class ProcessNickInUse extends IRCProcessor {
      *
      * @param nickname Nickname that was wanted.
      */
-    protected void callNickInUse(final String nickname) {
-        getCallbackManager().publish(new NickInUseEvent(parser, LocalDateTime.now(), nickname));
+    protected void callNickInUse(final LocalDateTime time, final String nickname) {
+        getCallbackManager().publish(new NickInUseEvent(parser, time, nickname));
     }
 
 }

irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessNoticeAuth.java

@@ -51,8 +51,8 @@ public class ProcessNoticeAuth extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String... token) {
-        callNoticeAuth(token[token.length - 1]);
+    public void process(final LocalDateTime time, final String sParam, final String... token) {
+        callNoticeAuth(time, token[token.length - 1]);
     }
 
     /**
@@ -60,8 +60,8 @@ public class ProcessNoticeAuth extends IRCProcessor {
      *
      * @param data Incomming Line.
      */
-    protected void callNoticeAuth(final String data) {
-        getCallbackManager().publish(new AuthNoticeEvent(parser, LocalDateTime.now(), data));
+    protected void callNoticeAuth(final LocalDateTime time, final String data) {
+        getCallbackManager().publish(new AuthNoticeEvent(parser, time, data));
     }
 
 }

irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessPart.java

@@ -30,7 +30,6 @@ import com.dmdirc.parser.irc.IRCChannelClientInfo;
 import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.TimestampedIRCProcessor;
 
 import java.time.LocalDateTime;
 
@@ -39,7 +38,7 @@ import javax.inject.Inject;
 /**
  * Process a channel part.
  */
-public class ProcessPart extends TimestampedIRCProcessor {
+public class ProcessPart extends IRCProcessor {
 
     /**
      * Create a new instance of the IRCProcessor Object.

irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessQuit.java

@@ -31,7 +31,6 @@ import com.dmdirc.parser.irc.IRCChannelClientInfo;
 import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.TimestampedIRCProcessor;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -41,7 +40,7 @@ import javax.inject.Inject;
 /**
  * Process a Quit message.
  */
-public class ProcessQuit extends TimestampedIRCProcessor {
+public class ProcessQuit extends IRCProcessor {
 
     /**
      * Create a new instance of the IRCProcessor Object.
@@ -125,7 +124,7 @@ public class ProcessQuit extends TimestampedIRCProcessor {
     protected void callChannelQuit(final LocalDateTime date, final ChannelInfo cChannel,
             final ChannelClientInfo cChannelClient, final String sReason) {
         getCallbackManager().publish(
-                new ChannelQuitEvent(parser, LocalDateTime.now(), cChannel, cChannelClient,
+                new ChannelQuitEvent(parser, date, cChannel, cChannelClient,
                         sReason));
     }
 

irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessTopic.java

@@ -27,7 +27,6 @@ import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.TimestampedIRCProcessor;
 
 import java.time.LocalDateTime;
 
@@ -36,7 +35,7 @@ import javax.inject.Inject;
 /**
  * Process a topic change.
  */
-public class ProcessTopic extends TimestampedIRCProcessor {
+public class ProcessTopic extends IRCProcessor {
 
     /**
      * Create a new instance of the IRCProcessor Object.

irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessWallops.java

@@ -53,7 +53,7 @@ public class ProcessWallops extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String... token) {
+    public void process(final LocalDateTime time, final String sParam, final String... token) {
         if (token.length < 3) {
             return;
         }
@@ -67,14 +67,14 @@ public class ProcessWallops extends IRCProcessor {
 
         if (bits.length > 1) {
             if (message.charAt(0) == '*') {
-                callWallop(bits[1], user);
+                callWallop(time, bits[1], user);
                 return;
             } else if (message.charAt(0) == '$') {
-                callWalluser(bits[1], user);
+                callWalluser(time, bits[1], user);
                 return;
             }
         }
-        callWallDesync(message, user);
+        callWallDesync(time, message, user);
     }
 
     /**
@@ -83,8 +83,8 @@ public class ProcessWallops extends IRCProcessor {
      * @param message The message
      * @param host Host of the user who sent the wallop
      */
-    protected void callWallop(final String message, final String host) {
-        getCallbackManager().publish(new WallopEvent(parser, LocalDateTime.now(), message, host));
+    protected void callWallop(final LocalDateTime time, final String message, final String host) {
+        getCallbackManager().publish(new WallopEvent(parser, time, message, host));
     }
 
     /**
@@ -93,8 +93,8 @@ public class ProcessWallops extends IRCProcessor {
      * @param message The message
      * @param host Host of the user who sent the walluser
      */
-    protected void callWalluser(final String message, final String host) {
-        getCallbackManager().publish(new WalluserEvent(parser, LocalDateTime.now(), message, host));
+    protected void callWalluser(final LocalDateTime time, final String message, final String host) {
+        getCallbackManager().publish(new WalluserEvent(parser, time, message, host));
     }
 
     /**
@@ -103,9 +103,9 @@ public class ProcessWallops extends IRCProcessor {
      * @param message The message
      * @param host Host of the user who sent the WallDesync
      */
-    protected void callWallDesync(final String message, final String host) {
+    protected void callWallDesync(final LocalDateTime time, final String message, final String host) {
         getCallbackManager().publish(new WallDesyncEvent(
-                parser, LocalDateTime.now(), message, host));
+                parser, time, message, host));
     }
 
 }

irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessWho.java

@@ -58,7 +58,7 @@ public class ProcessWho extends IRCProcessor {
      * @param token IRCTokenised line to process
      */
     @Override
-    public void process(final String sParam, final String... token) {
+    public void process(final LocalDateTime time, final String sParam, final String... token) {
         // :blueyonder2.uk.quakenet.org 352 Dataforce #mdbot shane Tobavaj.users.quakenet.org *.quakenet.org Tobavaj G+x :3 Tobavaj - http://shane.dmdirc.com/scriptbot.php
         //              0               1      2        3     4              5                      6           7     8        9
         // :blueyonder2.uk.quakenet.org 352 Dataforce #mdbot ~Dataforce ResNetUser-BrynDinas-147.143.246.102.bangor.ac.uk *.quakenet.org Dataforce H@ :0 Dataforce
@@ -84,14 +84,14 @@ public class ProcessWho extends IRCProcessor {
                 final AwayState oldState = client.getAwayState();
                 client.setAwayState(isAway);
                 if (client == parser.getLocalClient()) {
-                    callAwayState(oldState, client.getAwayState(), client.getAwayReason());
+                    callAwayState(time, oldState, client.getAwayState(), client.getAwayReason());
                 } else {
-                    callAwayStateOther(client, oldState, isAway);
+                    callAwayStateOther(time, client, oldState, isAway);
 
                     for (ChannelInfo iChannel : parser.getChannels()) {
                         final ChannelClientInfo iChannelClient = iChannel.getChannelClient(client);
                         if (iChannelClient != null) {
-                            callChannelAwayStateOther(iChannel, iChannelClient, oldState, isAway);
+                            callChannelAwayStateOther(time, iChannel, iChannelClient, oldState, isAway);
                         }
                     }
                 }
@@ -106,10 +106,10 @@ public class ProcessWho extends IRCProcessor {
      * @param currentState Current Away State
      * @param reason Best guess at away reason
      */
-    protected void callAwayState(final AwayState oldState, final AwayState currentState,
+    protected void callAwayState(final LocalDateTime time, final AwayState oldState, final AwayState currentState,
             final String reason) {
         getCallbackManager().publish(
-                new AwayStateEvent(parser, LocalDateTime.now(), oldState, currentState, reason));
+                new AwayStateEvent(parser, time, oldState, currentState, reason));
     }
 
     /**
@@ -119,10 +119,10 @@ public class ProcessWho extends IRCProcessor {
      * @param oldState Old Away State
      * @param state Current Away State
      */
-    protected void callAwayStateOther(final ClientInfo client, final AwayState oldState,
+    protected void callAwayStateOther(final LocalDateTime time, final ClientInfo client, final AwayState oldState,
             final AwayState state) {
         getCallbackManager().publish(
-                new OtherAwayStateEvent(parser, LocalDateTime.now(), client, oldState, state));
+                new OtherAwayStateEvent(parser, time, client, oldState, state));
     }
 
     /**
@@ -133,10 +133,10 @@ public class ProcessWho extends IRCProcessor {
      * @param oldState Old Away State
      * @param state Current Away State
      */
-    protected void callChannelAwayStateOther(final ChannelInfo channel,
+    protected void callChannelAwayStateOther(final LocalDateTime time, final ChannelInfo channel,
             final ChannelClientInfo channelClient, final AwayState oldState, final AwayState state) {
         getCallbackManager().publish(
-                new ChannelOtherAwayStateEvent(parser, LocalDateTime.now(), channel, channelClient,
+                new ChannelOtherAwayStateEvent(parser, time, channel, channelClient,
                         oldState, state));
     }