From a9c76db53243f2fc9ed0acf2c6ceb487a7f1b585 Mon Sep 17 00:00:00 2001
From: Humorhenker <36549980+Humorhenker@users.noreply.github.com>
Date: Mon, 3 Jun 2019 00:12:23 +0200
Subject: [PATCH] Fixing #835 and writing config.go and
 matterbridge.toml.sample entries

---
 bridge/config/config.go  | 1 +
 bridge/xmpp/xmpp.go      | 9 +++++++--
 matterbridge.toml.sample | 5 +++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/bridge/config/config.go b/bridge/config/config.go
index a0cc20f7..3cd7c05a 100644
--- a/bridge/config/config.go
+++ b/bridge/config/config.go
@@ -79,6 +79,7 @@ type Protocol struct {
 	ColorNicks             bool   // only irc for now
 	Debug                  bool   // general
 	DebugLevel             int    // only for irc now
+	DelayedEnable          bool   // only for xmpp now
 	EditSuffix             string // mattermost, slack, discord, telegram, gitter
 	EditDisable            bool   // mattermost, slack, discord, telegram, gitter
 	IconURL                string // mattermost, slack
diff --git a/bridge/xmpp/xmpp.go b/bridge/xmpp/xmpp.go
index 66368087..5c830fc4 100644
--- a/bridge/xmpp/xmpp.go
+++ b/bridge/xmpp/xmpp.go
@@ -331,6 +331,11 @@ func (b *Bxmpp) skipMessage(message xmpp.Chat) bool {
 		return true
 	}
 
-	// skip delayed messages
-	return message.Stamp.IsZero()
+	// disable delayed skiping #835
+    if b.GetBool("DelayedEnable") {
+        return false
+    } else {
+		// skip delayed messages
+        return message.Stamp.IsZero()
+	}
 }
diff --git a/matterbridge.toml.sample b/matterbridge.toml.sample
index 7dd12e44..317459e6 100644
--- a/matterbridge.toml.sample
+++ b/matterbridge.toml.sample
@@ -277,6 +277,11 @@ StripNick=false
 #OPTIONAL (default false)
 ShowTopicChange=false
 
+#Enable to fix a problem where xmpp servers dont send timestamps and all messages are skipped. See https://github.com/42wim/matterbridge/issues/835
+#This will bypass the check for delayed messages.
+#OPTIONAL (default false)
+DelayedEnable=false
+
 ###################################################################
 #mattermost section
 ###################################################################