fix(threads): pass subscribed flag for ThreadAttendee

lib/Controller/ThreadController.php

@@ -303,6 +303,7 @@ protected function prepareListOfThreads(array $threads, ?array $attendees = null
 			$firstMessage = $lastMessage = null;
 			$attendee = $attendees[$thread->getId()] ?? null;
 			if ($attendee === null) {
+				// subscribed is set to false here, so clients know that attendee has not subscribed yet
 				$attendee = ThreadAttendee::createFromParticipant($thread->getId(), $participant);
 			}
 

lib/Model/ThreadAttendee.php

@@ -26,6 +26,8 @@
  * @method string getActorId()
  * @method void setNotificationLevel(int $notificationLevel)
  * @method int getNotificationLevel()
+ * @method void setSubscribed(bool $subscribed)
+ * @method int getSubscribed()
  *
  * @psalm-import-type TalkThreadAttendee from ResponseDefinitions
  */
@@ -36,6 +38,7 @@ class ThreadAttendee extends Entity implements \JsonSerializable {
 	protected string $actorType = '';
 	protected string $actorId = '';
 	protected int $notificationLevel = 0;
+	protected bool $subscribed = true;
 
 	public function __construct() {
 		$this->addType('roomId', Types::BIGINT);
@@ -44,6 +47,7 @@ public function __construct() {
 		$this->addType('actorType', Types::STRING);
 		$this->addType('actorId', Types::STRING);
 		$this->addType('notificationLevel', Types::INTEGER);
+		$this->addType('subscribed', Types::BOOLEAN);
 	}
 
 	public static function createFromRow(array $row): ThreadAttendee {
@@ -65,6 +69,7 @@ public static function createFromParticipant(int $threadId, Participant $partici
 		$attendee->setNotificationLevel(Participant::NOTIFY_DEFAULT);
 		$attendee->setActorType($participant->getAttendee()->getActorType());
 		$attendee->setActorId($participant->getAttendee()->getActorId());
+		$attendee->setSubscribed(false);
 		return $attendee;
 	}
 
@@ -75,6 +80,7 @@ public static function createFromParticipant(int $threadId, Participant $partici
 	public function jsonSerialize(): array {
 		return [
 			'notificationLevel' => min(3, max(0, $this->getNotificationLevel())),
+			'subscribed' => $this->getSubscribed() && $this->getNotificationLevel() !== Participant::NOTIFY_NEVER,
 		];
 	}
 }

lib/ResponseDefinitions.php

@@ -462,6 +462,7 @@
  *
  * @psalm-type TalkThreadAttendee = array{
  *      notificationLevel: 0|1|2|3,
+ *      subscribed: bool,
  * }
  *
  * @psalm-type TalkThreadInfo = array{

openapi-full.json

@@ -2100,7 +2100,8 @@
             "ThreadAttendee": {
                 "type": "object",
                 "required": [
-                    "notificationLevel"
+                    "notificationLevel",
+                    "subscribed"
                 ],
                 "properties": {
                     "notificationLevel": {
@@ -2112,6 +2113,9 @@
                             2,
                             3
                         ]
+                    },
+                    "subscribed": {
+                        "type": "boolean"
                     }
                 }
             },

openapi.json

@@ -2005,7 +2005,8 @@
             "ThreadAttendee": {
                 "type": "object",
                 "required": [
-                    "notificationLevel"
+                    "notificationLevel",
+                    "subscribed"
                 ],
                 "properties": {
                     "notificationLevel": {
@@ -2017,6 +2018,9 @@
                             2,
                             3
                         ]
+                    },
+                    "subscribed": {
+                        "type": "boolean"
                     }
                 }
             },

src/types/openapi/openapi-full.ts

@@ -2942,6 +2942,7 @@ export type components = {
              * @enum {integer}
              */
             notificationLevel: 0 | 1 | 2 | 3;
+            subscribed: boolean;
         };
         ThreadInfo: {
             thread: components["schemas"]["Thread"];

src/types/openapi/openapi.ts

@@ -2404,6 +2404,7 @@ export type components = {
              * @enum {integer}
              */
             notificationLevel: 0 | 1 | 2 | 3;
+            subscribed: boolean;
         };
         ThreadInfo: {
             thread: components["schemas"]["Thread"];