Allow to reply to messages and return the parent on the message endpoints

Signed-off-by: Joas Schilling <coding@schilljs.com>

2 files changed, 67 insertions, 1 deletions

diff --git a/tests/php/Chat/ChatManagerTest.php b/tests/php/Chat/ChatManagerTest.php
index ab8774fe8..8398b7596 100644
--- a/tests/php/Chat/ChatManagerTest.php
+++ b/tests/php/Chat/ChatManagerTest.php
@@ -118,7 +118,54 @@ class ChatManagerTest extends TestCase {
 
 		$participant = $this->createMock(Participant::class);
 
-		$this->chatManager->sendMessage($chat, $participant, 'users', 'testUser', 'testMessage', $creationDateTime);
+		$this->chatManager->sendMessage($chat, $participant, 'users', 'testUser', 'testMessage', $creationDateTime, null);
+	}
+
+	public function testReplyToMessage() {
+		$replyTo = $this->createMock(IComment::class);
+		$comment = $this->createMock(IComment::class);
+
+		$this->commentsManager->expects($this->once())
+			->method('create')
+			->with('users', 'testUser', 'chat', 1234)
+			->willReturn($comment);
+
+		$comment->expects($this->once())
+			->method('setMessage')
+			->with('testMessage');
+
+		$creationDateTime = new \DateTime();
+		$comment->expects($this->once())
+			->method('setCreationDateTime')
+			->with($creationDateTime);
+
+		$comment->expects($this->once())
+			->method('setVerb')
+			->with('comment');
+
+		$this->commentsManager->expects($this->once())
+			->method('save')
+			->with($comment);
+
+		$chat = $this->createMock(Room::class);
+		$chat->expects($this->any())
+			->method('getId')
+			->willReturn(1234);
+
+		$this->notifier->expects($this->once())
+			->method('notifyMentionedUsers')
+			->with($chat, $comment);
+
+		$replyTo->expects($this->once())
+			->method('getId')
+			->willReturn('12345');
+
+		$comment->expects($this->once())
+			->method('setParentId')
+			->with('12345');
+
+		$participant = $this->createMock(Participant::class);
+		$this->chatManager->sendMessage($chat, $participant, 'users', 'testUser', 'testMessage', $creationDateTime, $replyTo);
 	}
 
 	public function testGetHistory() {
diff --git a/tests/php/Controller/ChatControllerTest.php b/tests/php/Controller/ChatControllerTest.php
index 6e9b82b1f..916329ff9 100644
--- a/tests/php/Controller/ChatControllerTest.php
+++ b/tests/php/Controller/ChatControllerTest.php
@@ -136,6 +136,7 @@ class ChatControllerTest extends TestCase {
 		$comment->method('getActorId')->willReturn($actorId);
 		$comment->method('getCreationDateTime')->willReturn($creationDateTime);
 		$comment->method('getMessage')->willReturn($message);
+		$comment->method('getParentId')->willReturn('0');
 
 		return $comment;
 	}
@@ -185,6 +186,12 @@ class ChatControllerTest extends TestCase {
 		$chatMessage->expects($this->once())
 			->method('getVisibility')
 			->willReturn(true);
+		$chatMessage->expects($this->exactly(2))
+			->method('getComment')
+			->willReturn($comment);
+		$chatMessage->expects($this->once())
+			->method('getRoom')
+			->willReturn($this->room);
 
 		$this->messageParser->expects($this->once())
 			->method('createMessage')
@@ -258,6 +265,12 @@ class ChatControllerTest extends TestCase {
 		$chatMessage->expects($this->once())
 			->method('getVisibility')
 			->willReturn(true);
+		$chatMessage->expects($this->exactly(2))
+			->method('getComment')
+			->willReturn($comment);
+		$chatMessage->expects($this->once())
+			->method('getRoom')
+			->willReturn($this->room);
 
 		$this->messageParser->expects($this->once())
 			->method('createMessage')
@@ -339,6 +352,12 @@ class ChatControllerTest extends TestCase {
 		$chatMessage->expects($this->once())
 			->method('getVisibility')
 			->willReturn(true);
+		$chatMessage->expects($this->exactly(2))
+			->method('getComment')
+			->willReturn($comment);
+		$chatMessage->expects($this->once())
+			->method('getRoom')
+			->willReturn($this->room);
 
 		$this->messageParser->expects($this->once())
 			->method('createMessage')