Merge branch 'dos1-mam'

app/widgets/Chats/Chats.php

@@ -94,7 +94,7 @@ class Chats extends \Movim\Widget\Base
                                   ->orderBy('published', 'desc')
                                   ->first();
             if ($message) {
-                $g->setStart(strtotime($message->published)+10);
+                $g->setStart(strtotime($message->published));
             }
 
             $g->setLimit(150);
@@ -110,8 +110,7 @@ class Chats extends \Movim\Widget\Base
             $g->setJid(echapJid($jid));
 
             if ($message) {
-                // We add a little delay of 10sec to prevent some sync issues
-                $g->setStart(strtotime($message->published)+10);
+                $g->setStart(strtotime($message->published));
             }
 
             $g->request();

lib/moxl/src/Moxl/Xec/Action/MAM/Get.php

@@ -51,11 +51,14 @@ class Get extends Action
         if(isset($stanza->fin)
         && isset($stanza->fin->set) && $stanza->fin->set->attributes()->xmlns == 'http://jabber.org/protocol/rsm'
         && isset($stanza->fin->set->last)
-        && !isset($this->_jid)
-        && !isset($this->_to)
         && (string)$stanza->fin->set->last != $this->_after) {
             $g = new Get;
+            $g->setJid($this->_jid);
+            $g->setTo($this->_to);
             $g->setLimit($this->_limit);
+            $g->setStart($this->_start);
+            $g->setEnd($this->_end);
+            $g->setBefore($this->_before);
             $g->setAfter((string)$stanza->fin->set->last);
             $g->request();
         }

lib/moxl/src/Moxl/Xec/Action/Presence/Muc.php

@@ -24,7 +24,7 @@ class Muc extends Action
             $this->_nickname = $session->get('username');
         }
 
-        if ($this->_mam == false) {
+        if ($this->_mam == false && $this->_mam2 == false) {
             \App\User::me()->messages()->where('jidfrom', $this->_to)->delete();
         }