Show message in spam folder to initiator. Show messages in spam if mo…

…ved to spam on block word.

src/Pagerfanta/AbstractConversationsAdapter.php

@@ -57,7 +57,10 @@ public function getNbResults(): int
      */
     public function getSlice(int $offset, int $length): iterable
     {
-        $sql = 'SELECT * FROM (' . $this->getConversationsQuery() . ') m';
+        $sql = 'SELECT *, i.id, r.id, s.id FROM (' . $this->getConversationsQuery() . ') m';
+        $sql .= ' JOIN members i ON m.initiator_id = i.id';
+        $sql .= ' JOIN members r ON m.IdReceiver = r.id';
+        $sql .= ' JOIN members s ON m.IdSender = s.id';
         $sql .= ' ORDER BY `m`.`created` DESC LIMIT ' . $length . ' OFFSET ' . $offset;
 
         $query = $this->entityManager->createNativeQuery($sql, new MessageResultSetMapping())
@@ -121,7 +124,7 @@ protected function getInitiatorCondition(): string
 
     protected function getNotSpamCondition(): string
     {
-        return 'InFolder <> \'' . InFolderType::SPAM . '\'';
+        return '(m.initiator_id <> :memberId AND InFolder <> \'' . InFolderType::SPAM . '\')';
     }
 
     abstract protected function getConversationsQuery(): string;

src/Pagerfanta/SpamAdapter.php

@@ -42,6 +42,6 @@ protected function getConversationsQuery(): string
 
     private function getSpamCondition(): string
     {
-        return 'SpamInfo LIKE \'%' . SpamInfoType::MEMBER_SAYS_SPAM . '%\' AND InFolder = \'' . InFolderType::SPAM . '\'';
+        return '(SpamInfo LIKE \'%' . SpamInfoType::MEMBER_SAYS_SPAM . '%\'SpamInfo LIKE \'%' . SpamInfoType::SPAM_BLOCKED_WORD . '%\') OR AND InFolder = \'' . InFolderType::SPAM . '\'';
     }
 }