fixup! Adjust namespace and dictionary to match Talk

nextcloud · Oct 6, 2023 · 17e75dc · 17e75dc
1 parent e0da807
commit 17e75dc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/lib/Controller/PollController.php b/lib/Controller/PollController.php
@@ -278,7 +278,6 @@ public function closePoll(int $pollId): DataResponse {
 	 */
 	protected function renderPoll(Poll $poll, array $votedSelf = [], array $detailedVotes = []): array {
 		$data = $poll->asArray();
-		unset($data['roomId']);
 
 		$canSeeSummary = !empty($votedSelf) && $poll->getResultMode() === Poll::MODE_PUBLIC;
 

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
@@ -1491,7 +1491,7 @@ public function createGuestByDialIn(): DataResponse {
 	 * Set active state for a session
 	 *
 	 * @param int $state of the room
-	 * @return DataResponse<Http::STATUS_OK, TalkRoom, array{}>|DataResponse<Http::STATUS_BAD_REQUEST, null, array{}>
+	 * @return DataResponse<Http::STATUS_OK, TalkRoom, array{}>|DataResponse<Http::STATUS_BAD_REQUEST, array<empty>, array{}>
 	 *
 	 * 200: Session state set successfully
 	 * 400: The provided new state was invalid

diff --git a/lib/ResponseDefinitions.php b/lib/ResponseDefinitions.php
@@ -104,14 +104,14 @@
  *     user_id: string,
  * }
  *
+ * @psalm-type TalkMatterbridgeConfigFields = array<array<string, mixed>>
+ *
  * @psalm-type TalkMatterbridge = array{
  *     enabled: bool,
  *     parts: TalkMatterbridgeConfigFields,
  *     pid: int,
  * }
  *
- * @psalm-type TalkMatterbridgeConfigFields = array<array<string, mixed>>
- *
  * @psalm-type TalkMatterbridgeProcessState = array{
  *     log: string,
  *     running: bool,
@@ -138,6 +138,13 @@
  *     statusMessage?: ?string,
  * }
  *
+ * @psalm-type TalkPollVote = array{
+ *     actorDisplayName: string,
+ *     actorId: string,
+ *     actorType: string,
+ *     optionId: int,
+ *  }
+ *
  * @psalm-type TalkPoll = array{
  *     actorDisplayName: string,
  *     actorId: string,
@@ -154,13 +161,6 @@
  *     votes?: array<string, int>,
  * }
  *
- * @psalm-type TalkPollVote = array{
- *     actorDisplayName: string,
- *     actorId: string,
- *     actorType: string,
- *     optionId: int,
- * }
- *
  * @psalm-type TalkReaction = array{
  *     actorDisplayName: string,
  *     actorId: string,