Merge pull request #11408 from nextcloud/bugfix/11206/capability

feat(chat): Add capability for editing messages
nextcloud · Jan 19, 2024 · 256d440 · 256d440
2 parents 3fc00f1 + 54b5928
commit 256d440
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/docs/capabilities.md b/docs/capabilities.md
@@ -138,3 +138,7 @@
 * `config => call => sip-enabled` - Whether SIP is configured on the server allowing for SIP dial-in
 * `config => call => sip-dialout-enabled` - Whether SIP dial-out is configured on the server, additionally requires `config => call => sip-enabled`
 * `config => call => can-enable-sip` - Whether the current user is a member of the groups that are allowed to enable SIP dial-in on a conversation or use SIP dial-out
+
+## 19
+* `delete-messages-unlimited` - Whether messages can be deleted at any time (used to be restricted to 6 hours after posting)
+* `edit-messages` - Whether messages can be edited (restricted to 24 hours after posting)
diff --git a/lib/Capabilities.php b/lib/Capabilities.php
@@ -170,6 +170,8 @@ public function getCapabilities(): array {
 				'note-to-self',
 				'recording-consent',
 				'sip-support-dialout',
+				'delete-messages-unlimited',
+				'edit-messages',
 			],
 			'config' => [
 				'attachments' => [

diff --git a/lib/Controller/ChatController.php b/lib/Controller/ChatController.php
@@ -713,13 +713,6 @@ public function deleteMessage(int $messageId): DataResponse {
 			return new DataResponse([], Http::STATUS_METHOD_NOT_ALLOWED);
 		}
 
-		$maxDeleteAge = $this->timeFactory->getDateTime();
-		$maxDeleteAge->sub(new \DateInterval('PT6H'));
-		if ($message->getCreationDateTime() < $maxDeleteAge) {
-			// Message is too old
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
 		try {
 			$systemMessageComment = $this->chatManager->deleteMessage(
 				$this->room,

diff --git a/tests/php/CapabilitiesTest.php b/tests/php/CapabilitiesTest.php
@@ -144,6 +144,8 @@ public function setUp(): void {
 			'note-to-self',
 			'recording-consent',
 			'sip-support-dialout',
+			'delete-messages-unlimited',
+			'edit-messages',
 			'message-expiration',
 			'reactions',
 		];