fixup! feat(talk): Allow apps to specify a related objectfeat/noid/allow-specifying-related-object

2 files changed, 18 insertions, 9 deletions

diff --git a/lib/private/Talk/ConversationOptions.php b/lib/private/Talk/ConversationOptions.php
index f1a9f09fd63..e284f56b14b 100644
--- a/lib/private/Talk/ConversationOptions.php
+++ b/lib/private/Talk/ConversationOptions.php
@@ -15,13 +15,13 @@ class ConversationOptions implements IConversationOptions {
 
 	private function __construct(
 		private bool $isPublic,
-		private string $objectType,
-		private string $objectId,
+		private ?string $objectType = null,
+		private ?string $objectId = null,
 	) {
 	}
 
 	public static function default(): self {
-		return new self(false, '', '');
+		return new self(false);
 	}
 
 	public function setPublic(bool $isPublic = true): IConversationOptions {
@@ -33,15 +33,21 @@ class ConversationOptions implements IConversationOptions {
 		return $this->isPublic;
 	}
 
-	public function getObjectType(): string {
+	public function getObjectType(): ?string {
 		return $this->objectType;
 	}
 
-	public function getObjectId(): string {
+	public function getObjectId(): ?string {
 		return $this->objectId;
 	}
 
+	/**
+	 */
 	public function setObject(string $objectType, string $objectId): self {
+		if ($objectType === '' || $objectId === '') {
+			throw new \InvalidArgumentException();
+		}
+
 		$this->objectType = $objectType;
 		$this->objectId = $objectId;
 		return $this;
diff --git a/lib/public/Talk/IConversationOptions.php b/lib/public/Talk/IConversationOptions.php
index 0b9d338c096..ad8a2a0d4cc 100644
--- a/lib/public/Talk/IConversationOptions.php
+++ b/lib/public/Talk/IConversationOptions.php
@@ -34,23 +34,26 @@ interface IConversationOptions {
 	/**
 	 * Object type this conversation is related to
 	 *
-	 * @return string
+	 * @return ?non-empty-string
 	 * @since 31.0.1
 	 */
-	public function getObjectType(): string;
+	public function getObjectType(): ?string;
 
 	/**
 	 * Object ID this conversation is related to
 	 *
-	 * @return string
+	 * @return ?non-empty-string
 	 * @since 31.0.1
 	 */
-	public function getObjectId(): string;
+	public function getObjectId(): ?string;
 
 	/**
 	 * Give a reference to an object this conversation is related to
 	 *
+	 * @param non-empty-string $objectType
+	 * @param non-empty-string $objectId
 	 * @return $this
+	 * @throws \InvalidArgumentException When either parameter is empty
 	 * @since 31.0.1
 	 */
 	public function setObject(string $objectType, string $objectId): self;