From bd11271621bd3759cfd194ed0119c0dc28155fd0 Mon Sep 17 00:00:00 2001 From: Daniel Weipert Date: Thu, 5 Mar 2026 14:57:28 +0100 Subject: update --- matrix-specification/Data/Room/AllowCondition.php | 24 +++++++++++++++++++ matrix-specification/Data/Room/AvatarInfo.php | 28 ++++++++++++++++++++++ matrix-specification/Data/Room/JoinedRoom.php | 4 ++-- matrix-specification/Data/Room/PreviousRoom.php | 20 ++++++++++++++++ matrix-specification/Data/Room/Rooms.php | 10 ++++---- .../Data/Room/TextualRepresentation.php | 20 ++++++++++++++++ matrix-specification/Data/Room/ThumbnailInfo.php | 24 +++++++++++++++++++ .../Data/Room/TopicContentBlock.php | 21 ++++++++++++++++ 8 files changed, 144 insertions(+), 7 deletions(-) create mode 100644 matrix-specification/Data/Room/AllowCondition.php create mode 100644 matrix-specification/Data/Room/AvatarInfo.php create mode 100644 matrix-specification/Data/Room/PreviousRoom.php create mode 100644 matrix-specification/Data/Room/TextualRepresentation.php create mode 100644 matrix-specification/Data/Room/ThumbnailInfo.php create mode 100644 matrix-specification/Data/Room/TopicContentBlock.php (limited to 'matrix-specification/Data/Room') diff --git a/matrix-specification/Data/Room/AllowCondition.php b/matrix-specification/Data/Room/AllowCondition.php new file mode 100644 index 0000000..600c618 --- /dev/null +++ b/matrix-specification/Data/Room/AllowCondition.php @@ -0,0 +1,24 @@ + $this->roomId, + "type" => $this->type, + ], fn ($value) => ! is_null($value)); + } +} diff --git a/matrix-specification/Data/Room/AvatarInfo.php b/matrix-specification/Data/Room/AvatarInfo.php new file mode 100644 index 0000000..473beb9 --- /dev/null +++ b/matrix-specification/Data/Room/AvatarInfo.php @@ -0,0 +1,28 @@ + $this->height, + "mimetype" => $this->mimeType, + "size" => $this->fileSize, + "thumbnail_info" => $this->thumbnailInfo, + "thumbnail_url" => $this->thumbnailUrl, + "w" => $this->width, + ]; + } +} diff --git a/matrix-specification/Data/Room/JoinedRoom.php b/matrix-specification/Data/Room/JoinedRoom.php index 0057071..f78eaea 100644 --- a/matrix-specification/Data/Room/JoinedRoom.php +++ b/matrix-specification/Data/Room/JoinedRoom.php @@ -24,14 +24,14 @@ class JoinedRoom implements \JsonSerializable public function jsonSerialize(): array { return array_filter([ - "account_data" => $this->inviteState, + "account_data" => $this->accountData, "ephemeral" => $this->ephemeral, "state" => $this->state, "state_after" => $this->stateAfter, "summary" => $this->summary, "timeline" => $this->timeline, "unread_notifications" => $this->unreadNotifications, - "unreadThreadNotifications" => $this->unreadThreadNotifications, + "unreadThreadNotifications" => empty($this->unreadThreadNotifications) ? new \stdClass() : $this->unreadNotifications, ], fn ($value) => ! is_null($value)); } } diff --git a/matrix-specification/Data/Room/PreviousRoom.php b/matrix-specification/Data/Room/PreviousRoom.php new file mode 100644 index 0000000..ced4172 --- /dev/null +++ b/matrix-specification/Data/Room/PreviousRoom.php @@ -0,0 +1,20 @@ + $this->eventId, + "room_id" => $this->roomId, + ], fn ($value) => ! is_null($value)); + } +} diff --git a/matrix-specification/Data/Room/Rooms.php b/matrix-specification/Data/Room/Rooms.php index 1a84608..4d2cdf6 100644 --- a/matrix-specification/Data/Room/Rooms.php +++ b/matrix-specification/Data/Room/Rooms.php @@ -21,17 +21,17 @@ class Rooms implements \JsonSerializable public function jsonSerialize(): array { return [ - "invite" => $this->invite ?? new \stdClass(), - "join" => $this->join ?? new \stdClass(), - "knock" => $this->knock ?? new \stdClass(), - "leave" => $this->leave ?? new \stdClass(), + "invite" => empty($this->invite) ? new \stdClass() : $this->invite, + "join" => empty($this->join) ? new \stdClass() : $this->join, + "knock" => empty($this->knock) ? new \stdClass() : $this->knock, + "leave" => empty($this->leave) ? new \stdClass() : $this->leave, ]; } /** * @return InvitedRoom[] */ - public function getInvite(): ?array + public function getInvited(): ?array { return $this->invite; } diff --git a/matrix-specification/Data/Room/TextualRepresentation.php b/matrix-specification/Data/Room/TextualRepresentation.php new file mode 100644 index 0000000..9b66f48 --- /dev/null +++ b/matrix-specification/Data/Room/TextualRepresentation.php @@ -0,0 +1,20 @@ + $this->body, + "mimetype" => $this->mimeType, + ], fn ($value) => ! is_null($value)); + } +} diff --git a/matrix-specification/Data/Room/ThumbnailInfo.php b/matrix-specification/Data/Room/ThumbnailInfo.php new file mode 100644 index 0000000..31a264b --- /dev/null +++ b/matrix-specification/Data/Room/ThumbnailInfo.php @@ -0,0 +1,24 @@ + $this->height, + "mimetype" => $this->mimeType, + "size" => $this->fileSize, + "w" => $this->width, + ]; + } +} diff --git a/matrix-specification/Data/Room/TopicContentBlock.php b/matrix-specification/Data/Room/TopicContentBlock.php new file mode 100644 index 0000000..96341d0 --- /dev/null +++ b/matrix-specification/Data/Room/TopicContentBlock.php @@ -0,0 +1,21 @@ + $this->text, + ]; + } +} -- cgit v1.2.3