From 7be9fa68bef82a7576344a6e8cc1e51154c6b3bf Mon Sep 17 00:00:00 2001 From: Matias Linares Date: Mon, 11 Jan 2021 22:20:09 -0300 Subject: Response & Exception refactor --- META6.json | 12 +- lib/Matrix/Client.pm6 | 371 ----------------------------------- lib/Matrix/Client.rakumod | 371 +++++++++++++++++++++++++++++++++++ lib/Matrix/Client/Common.pm6 | 3 - lib/Matrix/Client/Common.rakumod | 3 + lib/Matrix/Client/Exception.pm6 | 16 -- lib/Matrix/Client/Exception.rakumod | 17 ++ lib/Matrix/Client/MediaStore.rakumod | 6 +- lib/Matrix/Client/Requester.pm6 | 115 ----------- lib/Matrix/Client/Requester.rakumod | 115 +++++++++++ lib/Matrix/Client/Response.rakumod | 156 +++++++++++++++ lib/Matrix/Client/Room.pm6 | 190 ------------------ lib/Matrix/Client/Room.rakumod | 190 ++++++++++++++++++ lib/Matrix/Response.pm6 | 156 --------------- t/10-use.t | 2 +- t/60-media.t | 4 +- 16 files changed, 864 insertions(+), 863 deletions(-) delete mode 100644 lib/Matrix/Client.pm6 create mode 100644 lib/Matrix/Client.rakumod delete mode 100644 lib/Matrix/Client/Common.pm6 create mode 100644 lib/Matrix/Client/Common.rakumod delete mode 100644 lib/Matrix/Client/Exception.pm6 create mode 100644 lib/Matrix/Client/Exception.rakumod delete mode 100644 lib/Matrix/Client/Requester.pm6 create mode 100644 lib/Matrix/Client/Requester.rakumod create mode 100644 lib/Matrix/Client/Response.rakumod delete mode 100644 lib/Matrix/Client/Room.pm6 create mode 100644 lib/Matrix/Client/Room.rakumod delete mode 100644 lib/Matrix/Response.pm6 diff --git a/META6.json b/META6.json index 1ce78d4..4c88485 100644 --- a/META6.json +++ b/META6.json @@ -14,13 +14,13 @@ "name" : "Matrix::Client", "perl" : "6.c", "provides" : { - "Matrix::Client" : "lib/Matrix/Client.pm6", - "Matrix::Client::Common" : "lib/Matrix/Client/Common.pm6", - "Matrix::Client::Exception" : "lib/Matrix/Client/Exception.pm6", - "Matrix::Client::Requester" : "lib/Matrix/Client/Requester.pm6", + "Matrix::Client" : "lib/Matrix/Client.rakumod", + "Matrix::Client::Common" : "lib/Matrix/Client/Common.rakumod", + "Matrix::Client::Exception" : "lib/Matrix/Client/Exception.rakumod", + "Matrix::Client::Requester" : "lib/Matrix/Client/Requester.rakumod", "Matrix::Client::MediaStore": "lib/Matrix/Client/MediaStore.rakumod", - "Matrix::Client::Room" : "lib/Matrix/Client/Room.pm6", - "Matrix::Response" : "lib/Matrix/Response.pm6" + "Matrix::Client::Room" : "lib/Matrix/Client/Room.rakumod", + "Matrix::Client::Response" : "lib/Matrix/Client/Response.rakumod" }, "resources" : [ ], "source-url" : "https://github.com/matiaslina/perl6-matrix-client.git", diff --git a/lib/Matrix/Client.pm6 b/lib/Matrix/Client.pm6 deleted file mode 100644 index 2e26ee7..0000000 --- a/lib/Matrix/Client.pm6 +++ /dev/null @@ -1,371 +0,0 @@ -use HTTP::Request::Common; -use URI::Encode; -use JSON::Fast; -use Matrix::Response; -use Matrix::Client::Common; -use Matrix::Client::Room; -use Matrix::Client::Requester; -use Matrix::Client::MediaStore; - -unit class Matrix::Client does Matrix::Client::Requester; - -has Str $.device-id; -has Str $!user-id; -has @!rooms; -has @!users; - -submethod TWEAK { - $Matrix::Client::Common::TXN-ID = now.Int; -} - -#| POST - /_matrix/client/r0/login -multi method login(Str $username, Str $password) { - $.login(:$username, :$password); -} - -#| POST - /_matrix/client/r0/login -multi method login(Str :$username, Str :$password) { - my $post-data = { - type => "m.login.password", - user => $username, - password => $password - }; - - if $!device-id { - $post-data = $!device-id; - } - - my $res = $.post("/login", to-json($post-data)); - my $data = from-json($res.content); - - $!access-token = $data; - $!user-id = $data; - $!device-id = $data; -} - -#| POST - /_matrix/client/r0/logout -method logout() { - $.post("/logout") -} - -#| POST - /_matrix/client/r0/register -method register($username, $password, Bool :$bind-email? = False) { - my $res = $.post("/register", - username => $username, password => $password, - bind_email => $bind-email, - auth => { - type => "m.login.dummy" - }); - my $data = from-json $res.content; - $!access-token = $data; - $!user-id = $data; -} - -# User Data - -#| GET - /_matrix/client/r0/profile/{userId} -method profile(Str :$user-id?) { - my $id = $user-id // $.whoami; - from-json($.get("/profile/" ~ $id).content); -} - -#| GET - /_matrix/client/r0/profile/{userId}/displayname -method display-name(Str :$user-id?) { - my $id = $user-id // $.whoami; - my $res = $.get("/profile/" ~ $id ~ "/displayname"); - - my $data = from-json($res.content); - - $data // "" -} - -#| PUT - /_matrix/client/r0/profile/{userId}/displayname -method change-display-name(Str:D $display-name!) { - so $.put("/profile/" ~ $.whoami ~ "/displayname", - displayname => $display-name) -} - -#| GET - /_matrix/client/r0/profile/{userId}/avatar_url -method avatar-url(Str :$user-id?) { - my $id = $user-id // $.whoami; - my $res = $.get("/profile/" ~ $id ~ "/avatar_url"); - my $data = from-json($res.content); - - $data // "" -} - -#| PUT - /_matrix/client/r0/profile/{userId}/avatar_url -multi method change-avatar(IO::Path $avatar) { - my $mxc-url = $.upload($avatar.IO); - samewith($mxc-url); -} - -#| PUT - /_matrix/client/r0/profile/{userId}/avatar_url -multi method change-avatar(Str:D $mxc-url!) { - $.put("/profile/" ~ $.whoami ~ "/avatar_url", - avatar_url => $mxc-url); -} - -#| GET - /_matrix/client/r0/account/whoami -method whoami { - unless $!user-id { - my $res = $.get('/account/whoami'); - my $data = from-json($res.content); - $!user-id = $data; - } - - $!user-id -} - -## Device management - -#| GET - /_matrix/client/r0/devices -method devices(Matrix::Client:D: --> Seq) { - my $data = from-json($.get("/devices").content); - $data.map(-> $device-data { - Matrix::Response::Device.new(|$device-data) - }) -} - -#| GET - /_matrix/client/r0/devices/{deviceId} -method device(Matrix::Client:D: Str $device-id where *.chars > 0 --> Matrix::Response::Device) { - my $device-data = from-json($.get("/devices/$device-id").content); - Matrix::Response::Device.new(|$device-data) -} - -#| PUT - /_matrix/client/r0/devices/{deviceId} -method update-device(Matrix::Client:D: - Str $device-id where *.chars > 0, - Str $display-name) { - $.put("/devices/$device-id", :display_name($display-name)); -} - -## Presence - -#| GET - /_matrix/client/r0/presence/{userId}/status -method presence(Matrix::Client:D: $user-id? --> Matrix::Response::Presence) { - my $id = $user-id // $.whoami; - my $data = from-json($.get("/presence/$id/status").content); - Matrix::Response::Presence.new(|$data) -} - -#| PUT - /_matrix/client/r0/presence/{userId}/status -method set-presence(Matrix::Client:D: Str $presence, Str :$status-message = "") { - $.put("/presence/$.whoami/status", - :$presence, :status_msg($status-message)); -} - -#| PUT - /_matrix/client/r0/user/{userId}/rooms/{roomId}/tags/{tag} -multi method tags(Str $room-id, Str:D $tag, $order) { - my $id = $.whoami; - from-json($.put("/user/$id/rooms/$room-id/tags/$tag", :$order).content) -} - -#| GET - /_matrix/client/r0/user/{userId}/rooms/{roomId}/tags -multi method tags(Str $room-id) { - my $id = $.whoami; - Matrix::Response::Tag.new(from-json($.get("/user/$id/rooms/$room-id/tags").content)) -} - -#| DELETE - /_matrix/client/r0/user/{userId}/rooms/{roomId}/tags/{tag} -method remove-tag(Str $room-id, Str:D $tag) { - my $id = $.whoami; - $.delete("/user/$id/rooms/$room-id/tags/$tag") -} - -# Syncronization - -#| GET - /_matrix/client/r0/sync -multi method sync(Hash :$sync-filter is copy, :$since = "") { - $.sync(sync-filter => to-json($sync-filter), since => $since) -} - -#| GET - /_matrix/client/r0/sync -multi method sync(Str:D :$sync-filter, Str :$since = "") { - my $res = $.get("/sync", - timeout => 30000, - :$sync-filter, - :$since - ); - - Matrix::Response::Sync.new($res.content) -} - -#| GET - /_matrix/client/r0/sync -multi method sync(:$since = "") { - my $res = $.get("/sync", timeout => 30000, since => $since); - Matrix::Response::Sync.new($res.content) -} - -# Rooms - -#| POST - /_matrix/client/r0/createRoom -method create-room( - Bool :$public = False, - *%args --> Matrix::Client::Room -) { - my %params; - - for %args.kv -> $key, $value { - %params{$key.subst('-', '_')} = $value; - } - - if 'visibility' ~~ %params { - %params = $public; - } - - my $res = from-json($.post('/createRoom', |%params).content); - - Matrix::Client::Room.new( - id => $res, - access-token => self.access-token, - home-server => self.home-server - ) -} - -#| POST - /_matrix/client/r0/join/{roomIdOrAlias} -method join-room($room-id!) { - $.post("/join/$room-id") -} - -#| POST - /_matrix/client/r0/rooms/{roomId}/ban -method ban(Str $room-id, Str $user-id, $reason = "") { - $.post( - "/rooms/$room-id/ban", - :$user-id, - :$reason - ); -} - -#| POST - /_matrix/client/r0/rooms/{roomId}/unban -method unban(Str $room-id, Str $user-id) { - $.post( - "/rooms/$room-id/unban", - :$user-id - ); -} - -#| POST - /_matrix/client/r0/rooms/{roomId}/invite -method invite(Str $room-id, Str $user-id) { - $.post( - "/rooms/$room-id/invite", - :$user-id - ) -} - -#| POST - /_matrix/client/r0/rooms/{roomId}/forget -method forget(Str $room-id) { - $.post("/rooms/$room-id/forget") -} - -#| POST - /_matrix/client/r0/rooms/{roomId}/kick -method kick(Str $room-id, Str $user-id, $reason = "") { - $.post( - "/rooms/$room-id/kick", - :$user-id, - :$reason - ); -} - -#| POST - /_matrix/client/r0/rooms/{roomId}/leave -method leave-room($room-id) { - $.post("/rooms/$room-id/leave"); -} - -#| GET - /_matrix/client/r0/joined_rooms -method joined-rooms(--> Seq) { - my $res = $.get('/joined_rooms'); - my $data = from-json($res.content); - return $data.Seq.map(-> $room-id { - Matrix::Client::Room.new( - id => $room-id, - home-server => $!home-server, - access-token => $!access-token - ) - }); -} - -#| GET - /_matrix/client/r0/publicRooms -method public-rooms() { - $.get('/publicRooms') -} - -#| PUT - /_matrix/client/r0/rooms/{roomId}/send/{eventType}/{txnId} -method send(Str $room-id, Str $body, :$type? = "m.text") { - $Matrix::Client::Common::TXN-ID++; - my $res = $.put( - "/rooms/$room-id/send/m.room.message/{$Matrix::Client::Common::TXN-ID}", - msgtype => $type, body => $body - ); - - from-json($res.content) -} - -#| PUT - /_matrix/client/r0/rooms/{roomId}/send/{eventType}/{txnId} -method send-event(Str $room-id, Str :$event-type, :$content, :$txn-id? is copy, :$timestamp?) { - unless $txn-id.defined { - $txn-id = $Matrix::Client::Common::TXN-ID++; - } - - my $path = "/rooms/$room-id/send/$event-type/$txn-id"; - my $res = $.put($path, |$content); - from-json($res.content) -} - -#| GET - /_matrix/client/r0/directory/room/{roomAlias} -method get-room-id($room-alias) { - my $res = $.get("/directory/room/$room-alias"); - - from-json($res.content) -} - -#| PUT - /_matrix/client/r0/directory/room/{roomAlias} -method add-room-alias($room-id, $room-alias) { - $.put("/directory/room/$room-alias", - room_id => $room-id); -} - -#| DELETE - /_matrix/client/r0/directory/room/{roomAlias} -method remove-room-alias($room-alias) { - $.delete("/directory/room/$room-alias"); -} - -# Media - -method media(--> Matrix::Client::MediaStore) { - return Matrix::Client::MediaStore.new( - home-server => $!home-server, - access-token => $!access-token - ) -} - -method upload(IO::Path $path, Str $filename?) is DEPRECATED('media.upload') { - self.media.upload($path, $filename) -} - -# Misc - -method run(Int :$sleep = 10, :$sync-filter?, :$start-since? --> Supply) { - my $s = Supplier.new; - my $supply = $s.Supply; - my $since = $start-since // ""; - - start { - loop { - my $sync = $.sync(:$since, :$sync-filter); - $since = $sync.next-batch; - - for $sync.invited-rooms -> $info { - $s.emit($info); - } - - for $sync.joined-rooms -> $room { - for $room.timeline.events -> $event { - $s.emit($event) - } - } - sleep $sleep; - } - } - $supply -} diff --git a/lib/Matrix/Client.rakumod b/lib/Matrix/Client.rakumod new file mode 100644 index 0000000..01babe5 --- /dev/null +++ b/lib/Matrix/Client.rakumod @@ -0,0 +1,371 @@ +use HTTP::Request::Common; +use URI::Encode; +use JSON::Fast; +use Matrix::Client::Response; +use Matrix::Client::Common; +use Matrix::Client::Room; +use Matrix::Client::Requester; +use Matrix::Client::MediaStore; + +unit class Matrix::Client does Matrix::Client::Requester; + +has Str $.device-id; +has Str $!user-id; +has @!rooms; +has @!users; + +submethod TWEAK { + $Matrix::Client::Common::TXN-ID = now.Int; +} + +#| POST - /_matrix/client/r0/login +multi method login(Str $username, Str $password) { + $.login(:$username, :$password); +} + +#| POST - /_matrix/client/r0/login +multi method login(Str :$username, Str :$password) { + my $post-data = { + type => "m.login.password", + user => $username, + password => $password + }; + + if $!device-id { + $post-data = $!device-id; + } + + my $res = $.post("/login", to-json($post-data)); + my $data = from-json($res.content); + + $!access-token = $data; + $!user-id = $data; + $!device-id = $data; +} + +#| POST - /_matrix/client/r0/logout +method logout() { + $.post("/logout") +} + +#| POST - /_matrix/client/r0/register +method register($username, $password, Bool :$bind-email? = False) { + my $res = $.post("/register", + username => $username, password => $password, + bind_email => $bind-email, + auth => { + type => "m.login.dummy" + }); + my $data = from-json $res.content; + $!access-token = $data; + $!user-id = $data; +} + +# User Data + +#| GET - /_matrix/client/r0/profile/{userId} +method profile(Str :$user-id?) { + my $id = $user-id // $.whoami; + from-json($.get("/profile/" ~ $id).content); +} + +#| GET - /_matrix/client/r0/profile/{userId}/displayname +method display-name(Str :$user-id?) { + my $id = $user-id // $.whoami; + my $res = $.get("/profile/" ~ $id ~ "/displayname"); + + my $data = from-json($res.content); + + $data // "" +} + +#| PUT - /_matrix/client/r0/profile/{userId}/displayname +method change-display-name(Str:D $display-name!) { + so $.put("/profile/" ~ $.whoami ~ "/displayname", + displayname => $display-name) +} + +#| GET - /_matrix/client/r0/profile/{userId}/avatar_url +method avatar-url(Str :$user-id?) { + my $id = $user-id // $.whoami; + my $res = $.get("/profile/" ~ $id ~ "/avatar_url"); + my $data = from-json($res.content); + + $data // "" +} + +#| PUT - /_matrix/client/r0/profile/{userId}/avatar_url +multi method change-avatar(IO::Path $avatar) { + my $mxc-url = $.upload($avatar.IO); + samewith($mxc-url); +} + +#| PUT - /_matrix/client/r0/profile/{userId}/avatar_url +multi method change-avatar(Str:D $mxc-url!) { + $.put("/profile/" ~ $.whoami ~ "/avatar_url", + avatar_url => $mxc-url); +} + +#| GET - /_matrix/client/r0/account/whoami +method whoami { + unless $!user-id { + my $res = $.get('/account/whoami'); + my $data = from-json($res.content); + $!user-id = $data; + } + + $!user-id +} + +## Device management + +#| GET - /_matrix/client/r0/devices +method devices(Matrix::Client:D: --> Seq) { + my $data = from-json($.get("/devices").content); + $data.map(-> $device-data { + Matrix::Client::Response::Device.new(|$device-data) + }) +} + +#| GET - /_matrix/client/r0/devices/{deviceId} +method device(Matrix::Client:D: Str $device-id where *.chars > 0 --> Matrix::Client::Response::Device) { + my $device-data = from-json($.get("/devices/$device-id").content); + Matrix::Client::Response::Device.new(|$device-data) +} + +#| PUT - /_matrix/client/r0/devices/{deviceId} +method update-device(Matrix::Client:D: + Str $device-id where *.chars > 0, + Str $display-name) { + $.put("/devices/$device-id", :display_name($display-name)); +} + +## Presence + +#| GET - /_matrix/client/r0/presence/{userId}/status +method presence(Matrix::Client:D: $user-id? --> Matrix::Client::Response::Presence) { + my $id = $user-id // $.whoami; + my $data = from-json($.get("/presence/$id/status").content); + Matrix::Client::Response::Presence.new(|$data) +} + +#| PUT - /_matrix/client/r0/presence/{userId}/status +method set-presence(Matrix::Client:D: Str $presence, Str :$status-message = "") { + $.put("/presence/$.whoami/status", + :$presence, :status_msg($status-message)); +} + +#| PUT - /_matrix/client/r0/user/{userId}/rooms/{roomId}/tags/{tag} +multi method tags(Str $room-id, Str:D $tag, $order) { + my $id = $.whoami; + from-json($.put("/user/$id/rooms/$room-id/tags/$tag", :$order).content) +} + +#| GET - /_matrix/client/r0/user/{userId}/rooms/{roomId}/tags +multi method tags(Str $room-id) { + my $id = $.whoami; + Matrix::Client::Response::Tag.new(from-json($.get("/user/$id/rooms/$room-id/tags").content)) +} + +#| DELETE - /_matrix/client/r0/user/{userId}/rooms/{roomId}/tags/{tag} +method remove-tag(Str $room-id, Str:D $tag) { + my $id = $.whoami; + $.delete("/user/$id/rooms/$room-id/tags/$tag") +} + +# Syncronization + +#| GET - /_matrix/client/r0/sync +multi method sync(Hash :$sync-filter is copy, :$since = "") { + $.sync(sync-filter => to-json($sync-filter), since => $since) +} + +#| GET - /_matrix/client/r0/sync +multi method sync(Str:D :$sync-filter, Str :$since = "") { + my $res = $.get("/sync", + timeout => 30000, + :$sync-filter, + :$since + ); + + Matrix::Client::Response::Sync.new($res.content) +} + +#| GET - /_matrix/client/r0/sync +multi method sync(:$since = "") { + my $res = $.get("/sync", timeout => 30000, since => $since); + Matrix::Client::Response::Sync.new($res.content) +} + +# Rooms + +#| POST - /_matrix/client/r0/createRoom +method create-room( + Bool :$public = False, + *%args --> Matrix::Client::Room +) { + my %params; + + for %args.kv -> $key, $value { + %params{$key.subst('-', '_')} = $value; + } + + if 'visibility' ~~ %params { + %params = $public; + } + + my $res = from-json($.post('/createRoom', |%params).content); + + Matrix::Client::Room.new( + id => $res, + access-token => self.access-token, + home-server => self.home-server + ) +} + +#| POST - /_matrix/client/r0/join/{roomIdOrAlias} +method join-room($room-id!) { + $.post("/join/$room-id") +} + +#| POST - /_matrix/client/r0/rooms/{roomId}/ban +method ban(Str $room-id, Str $user-id, $reason = "") { + $.post( + "/rooms/$room-id/ban", + :$user-id, + :$reason + ); +} + +#| POST - /_matrix/client/r0/rooms/{roomId}/unban +method unban(Str $room-id, Str $user-id) { + $.post( + "/rooms/$room-id/unban", + :$user-id + ); +} + +#| POST - /_matrix/client/r0/rooms/{roomId}/invite +method invite(Str $room-id, Str $user-id) { + $.post( + "/rooms/$room-id/invite", + :$user-id + ) +} + +#| POST - /_matrix/client/r0/rooms/{roomId}/forget +method forget(Str $room-id) { + $.post("/rooms/$room-id/forget") +} + +#| POST - /_matrix/client/r0/rooms/{roomId}/kick +method kick(Str $room-id, Str $user-id, $reason = "") { + $.post( + "/rooms/$room-id/kick", + :$user-id, + :$reason + ); +} + +#| POST - /_matrix/client/r0/rooms/{roomId}/leave +method leave-room($room-id) { + $.post("/rooms/$room-id/leave"); +} + +#| GET - /_matrix/client/r0/joined_rooms +method joined-rooms(--> Seq) { + my $res = $.get('/joined_rooms'); + my $data = from-json($res.content); + return $data.Seq.map(-> $room-id { + Matrix::Client::Room.new( + id => $room-id, + home-server => $!home-server, + access-token => $!access-token + ) + }); +} + +#| GET - /_matrix/client/r0/publicRooms +method public-rooms() { + $.get('/publicRooms') +} + +#| PUT - /_matrix/client/r0/rooms/{roomId}/send/{eventType}/{txnId} +method send(Str $room-id, Str $body, :$type? = "m.text") { + $Matrix::Client::Common::TXN-ID++; + my $res = $.put( + "/rooms/$room-id/send/m.room.message/{$Matrix::Client::Common::TXN-ID}", + msgtype => $type, body => $body + ); + + from-json($res.content) +} + +#| PUT - /_matrix/client/r0/rooms/{roomId}/send/{eventType}/{txnId} +method send-event(Str $room-id, Str :$event-type, :$content, :$txn-id? is copy, :$timestamp?) { + unless $txn-id.defined { + $txn-id = $Matrix::Client::Common::TXN-ID++; + } + + my $path = "/rooms/$room-id/send/$event-type/$txn-id"; + my $res = $.put($path, |$content); + from-json($res.content) +} + +#| GET - /_matrix/client/r0/directory/room/{roomAlias} +method get-room-id($room-alias) { + my $res = $.get("/directory/room/$room-alias"); + + from-json($res.content) +} + +#| PUT - /_matrix/client/r0/directory/room/{roomAlias} +method add-room-alias($room-id, $room-alias) { + $.put("/directory/room/$room-alias", + room_id => $room-id); +} + +#| DELETE - /_matrix/client/r0/directory/room/{roomAlias} +method remove-room-alias($room-alias) { + $.delete("/directory/room/$room-alias"); +} + +# Media + +method media(--> Matrix::Client::MediaStore) { + return Matrix::Client::MediaStore.new( + home-server => $!home-server, + access-token => $!access-token + ) +} + +method upload(IO::Path $path, Str $filename?) is DEPRECATED('media.upload') { + self.media.upload($path, $filename) +} + +# Misc + +method run(Int :$sleep = 10, :$sync-filter?, :$start-since? --> Supply) { + my $s = Supplier.new; + my $supply = $s.Supply; + my $since = $start-since // ""; + + start { + loop { + my $sync = $.sync(:$since, :$sync-filter); + $since = $sync.next-batch; + + for $sync.invited-rooms -> $info { + $s.emit($info); + } + + for $sync.joined-rooms -> $room { + for $room.timeline.events -> $event { + $s.emit($event) + } + } + sleep $sleep; + } + } + $supply +} diff --git a/lib/Matrix/Client/Common.pm6 b/lib/Matrix/Client/Common.pm6 deleted file mode 100644 index 83cf65d..0000000 --- a/lib/Matrix/Client/Common.pm6 +++ /dev/null @@ -1,3 +0,0 @@ -unit module Matrix::Client::Common; - -our $TXN-ID; diff --git a/lib/Matrix/Client/Common.rakumod b/lib/Matrix/Client/Common.rakumod new file mode 100644 index 0000000..83cf65d --- /dev/null +++ b/lib/Matrix/Client/Common.rakumod @@ -0,0 +1,3 @@ +unit module Matrix::Client::Common; + +our $TXN-ID; diff --git a/lib/Matrix/Client/Exception.pm6 b/lib/Matrix/Client/Exception.pm6 deleted file mode 100644 index e02f572..0000000 --- a/lib/Matrix/Client/Exception.pm6 +++ /dev/null @@ -1,16 +0,0 @@ -package X::Matrix { - class Response is Exception { - has $.code; - has $.error; - - method message { - "$!code: $!error" - } - } - - class MXCParse is Exception { - has $.uri; - - method message { "Cannot parse '$!uri'" } - } -} diff --git a/lib/Matrix/Client/Exception.rakumod b/lib/Matrix/Client/Exception.rakumod new file mode 100644 index 0000000..6fb4c75 --- /dev/null +++ b/lib/Matrix/Client/Exception.rakumod @@ -0,0 +1,17 @@ +module Matrix::Client::Exception { + + class X::Matrix::Response is Exception { + has $.code; + has $.error; + + method message(--> Str) { + "$!code: $!error" + } + } + + class X::Matrix::MXCParse is Exception { + has $.uri; + + method message { "Cannot parse '$!uri'" } + } +} diff --git a/lib/Matrix/Client/MediaStore.rakumod b/lib/Matrix/Client/MediaStore.rakumod index 9779db2..afea9e5 100644 --- a/lib/Matrix/Client/MediaStore.rakumod +++ b/lib/Matrix/Client/MediaStore.rakumod @@ -3,7 +3,7 @@ use URI::Escape; use Matrix::Client::Requester; use Matrix::Client::Exception; -use Matrix::Response; +use Matrix::Client::Response; unit class Matrix::Client::MediaStore does Matrix::Client::Requester; @@ -110,7 +110,7 @@ multi method thumbnail(Str $server-name, Str $media-id, } #| GET - /_matrix/media/r0/config -method config(--> Matrix::Response::MediaStore::Config) { +method config(--> Matrix::Client::Response::MediaStore::Config) { my $response = $.get("/config"); - Matrix::Response::MediaStore::Config.new(from-json($response.content)) + Matrix::Client::Response::MediaStore::Config.new(from-json($response.content)) } diff --git a/lib/Matrix/Client/Requester.pm6 b/lib/Matrix/Client/Requester.pm6 deleted file mode 100644 index 36a9f69..0000000 --- a/lib/Matrix/Client/Requester.pm6 +++ /dev/null @@ -1,115 +0,0 @@ -use HTTP::UserAgent; -use HTTP::Request::Common; -use URI::Encode; -use JSON::Fast; -use Matrix::Client::Exception; - -unit role Matrix::Client::Requester; - -has $.home-server is required; -has $.access-token = ""; - -has $!ua = HTTP::UserAgent.new; -has $!client-endpoint = "/_matrix/client/r0"; -has $!url-prefix = ""; -has $!sync-since = ""; - -method !handle-error($response) is hidden-from-backtrace { - unless $response.is-success { - my $data = from-json($response.content); - X::Matrix::Response.new(:code($data), :error($data)).throw; - } - $response -} - -method !access-token-arg { - $!access-token ?? "access_token=$!access-token" !! '' -} - -method get(Str $path, :$media = False, *%data) { - my $query = "?"; - for %data.kv -> $k,$v { - $query ~= "&$k=$v" if $v.so; - } - my $encoded-path = $path.subst('#', '%23'); - my $uri = $.base-url(:$media) ~ $encoded-path ~ uri_encode($query); - - my $req = HTTP::Request.new(GET => $uri); - - if $!access-token.so { - $req.header.field(Authorization => "Bearer {$!access-token}"); - } - - return self!handle-error( - $!ua.request($req) - ); -} - -method base-url(Bool :$media? = False --> Str) { - if !$media { - "$.home-server$!client-endpoint$!url-prefix" - } else { - "$.home-server/_matrix/media/r0" - } -} - -multi method post(Str $path, Str $json, :$media = False) { - my $encoded-path = $path.subst('#', '%23'); - my $url = $.base-url(:$media) ~ $encoded-path; - my $req = HTTP::Request.new(POST => $url, - Content-Type => 'application/json'); - if $!access-token.so { - $req.header.field(Authorization => "Bearer {$!access-token}"); - } - $req.add-content($json); - return self!handle-error($!ua.request($req)); -} - -multi method post(Str $path, :$media = False, *%params) { - my $json = to-json(%params); - $.post($path, $json, :$media) -} - -method post-bin(Str $path, Buf $buf, :$content-type) { - my $encoded-path = $path.subst('#', '%23'); - my $req = POST( - $.base-url() ~ $encoded-path, - content => $buf, - Content-Type => $content-type - ); - - if $!access-token.so { - $req.header.field(Authorization => "Bearer {$!access-token}"); - } - - return self!handle-error($!ua.request($req)); -} - -multi method put(Str $path, Str $json) { - my $encoded-path = $path.subst('#', '%23'); - my $req = HTTP::Request.new(PUT => $.base-url() ~ $encoded-path, - Content-Type => 'application/json'); - if $!access-token.so { - $req.header.field(Authorization => "Bearer {$!access-token}"); - } - - $req.add-content($json); - return self!handle-error($!ua.request($req)) -} - -multi method put(Str $path, *%params) { - self.put($path, to-json(%params)) -} - -method delete(Str $path) { - my $encoded-path = $path.subst('#', '%23'); - my $req = HTTP::Request.new( - DELETE => $.base-url ~ $encoded-path, - Content-Type => 'application/json'); - if $!access-token.so { - $req.header.field( - Authorization => "Bearer $!access-token" - ); - } - return self!handle-error($!ua.request($req)) -} diff --git a/lib/Matrix/Client/Requester.rakumod b/lib/Matrix/Client/Requester.rakumod new file mode 100644 index 0000000..36a9f69 --- /dev/null +++ b/lib/Matrix/Client/Requester.rakumod @@ -0,0 +1,115 @@ +use HTTP::UserAgent; +use HTTP::Request::Common; +use URI::Encode; +use JSON::Fast; +use Matrix::Client::Exception; + +unit role Matrix::Client::Requester; + +has $.home-server is required; +has $.access-token = ""; + +has $!ua = HTTP::UserAgent.new; +has $!client-endpoint = "/_matrix/client/r0"; +has $!url-prefix = ""; +has $!sync-since = ""; + +method !handle-error($response) is hidden-from-backtrace { + unless $response.is-success { + my $data = from-json($response.content); + X::Matrix::Response.new(:code($data), :error($data)).throw; + } + $response +} + +method !access-token-arg { + $!access-token ?? "access_token=$!access-token" !! '' +} + +method get(Str $path, :$media = False, *%data) { + my $query = "?"; + for %data.kv -> $k,$v { + $query ~= "&$k=$v" if $v.so; + } + my $encoded-path = $path.subst('#', '%23'); + my $uri = $.base-url(:$media) ~ $encoded-path ~ uri_encode($query); + + my $req = HTTP::Request.new(GET => $uri); + + if $!access-token.so { + $req.header.field(Authorization => "Bearer {$!access-token}"); + } + + return self!handle-error( + $!ua.request($req) + ); +} + +method base-url(Bool :$media? = False --> Str) { + if !$media { + "$.home-server$!client-endpoint$!url-prefix" + } else { + "$.home-server/_matrix/media/r0" + } +} + +multi method post(Str $path, Str $json, :$media = False) { + my $encoded-path = $path.subst('#', '%23'); + my $url = $.base-url(:$media) ~ $encoded-path; + my $req = HTTP::Request.new(POST => $url, + Content-Type => 'application/json'); + if $!access-token.so { + $req.header.field(Authorization => "Bearer {$!access-token}"); + } + $req.add-content($json); + return self!handle-error($!ua.request($req)); +} + +multi method post(Str $path, :$media = False, *%params) { + my $json = to-json(%params); + $.post($path, $json, :$media) +} + +method post-bin(Str $path, Buf $buf, :$content-type) { + my $encoded-path = $path.subst('#', '%23'); + my $req = POST( + $.base-url() ~ $encoded-path, + content => $buf, + Content-Type => $content-type + ); + + if $!access-token.so { + $req.header.field(Authorization => "Bearer {$!access-token}"); + } + + return self!handle-error($!ua.request($req)); +} + +multi method put(Str $path, Str $json) { + my $encoded-path = $path.subst('#', '%23'); + my $req = HTTP::Request.new(PUT => $.base-url() ~ $encoded-path, + Content-Type => 'application/json'); + if $!access-token.so { + $req.header.field(Authorization => "Bearer {$!access-token}"); + } + + $req.add-content($json); + return self!handle-error($!ua.request($req)) +} + +multi method put(Str $path, *%params) { + self.put($path, to-json(%params)) +} + +method delete(Str $path) { + my $encoded-path = $path.subst('#', '%23'); + my $req = HTTP::Request.new( + DELETE => $.base-url ~ $encoded-path, + Content-Type => 'application/json'); + if $!access-token.so { + $req.header.field( + Authorization => "Bearer $!access-token" + ); + } + return self!handle-error($!ua.request($req)) +} diff --git a/lib/Matrix/Client/Response.rakumod b/lib/Matrix/Client/Response.rakumod new file mode 100644 index 0000000..3836a20 --- /dev/null +++ b/lib/Matrix/Client/Response.rakumod @@ -0,0 +1,156 @@ +use JSON::Fast; + +unit module Matrix::Client::Response; + +class Event { + has %.content; + has $.type is required; +} + +class RoomEvent is Event { + has Str $.sender; + has Int $.origin_server_ts; + has $.event_id; + has Str $.room_id; + + method id { $.event_id } + method timestamp { $!origin_server_ts } + method room-id { $.room_id } +} + +class StateEvent is RoomEvent { + has $.prev_content; + has $.state_key; +} + +class MemberEvent is StateEvent { + has $.type is required where 'm.room.member'; +} + +class Timeline { + has Event @.events; + has Bool $limited; + has Str $prev-batch; +} + +class RoomInfo { + has $.room-id is required; + has Event @.state; + has Timeline $.timeline; + + method gist(--> Str) { + "" + } +} + +class InviteInfo { + has $.room-id is required; + has Event @.events; + + method gist(--> Str) { + "" + } +} + +sub gather-events($room-id, $from) { + gather for $from.List -> $ev { + take StateEvent.new(:room_id($room-id), |$ev); + } +} + +class Messages { + has $.start; + has $.end; + has RoomEvent @.messages; +} + +class Sync { + has Str $.next-batch; + has Event @.presence; + has RoomInfo @.joined-rooms; + has InviteInfo @.invited-rooms; + + multi method new(Str $json) { + return self.new(from-json($json)); + } + + multi method new(Hash $json) { + my $next-batch = $json; + my Event @presence; + my RoomInfo @joined-rooms; + my InviteInfo @invited-rooms; + + for $json.List -> $ev { + @presence.push(Event.new(|$ev)); + } + + for $json.kv -> $room-id, $data { + my @state = gather-events($room-id, $data); + + my $timeline = Timeline.new( + limited => $data, + prev-batch => $data, + events => gather-events($room-id, $data) + ); + + @joined-rooms.push(RoomInfo.new( + :$room-id, :$timeline, :@state + )); + } + + for $json.kv -> $room-id, $data { + my @events = gather-events($room-id, $data); + @invited-rooms.push(InviteInfo.new( + :$room-id, :@events + )); + } + + return self.bless(:$next-batch, :@presence, + :@joined-rooms, :@invited-rooms); + } +} + +class Presence { + has Str $.presence is required; + has Int $.last-active-ago; + has Str $.status-message; + has Bool $.currently-active; + + submethod BUILD( + Str :$!presence, + :last_active_ago(:$!last-active-ago) = 0, + :status_message(:$!status-message) = "", + :currently_active(:$!currently-active) = False + ) { } +} + +class Tag { + has @.tags; + + method new(%json) { + my @tags = %json.keys; + self.bless(:@tags) + } +} + +class Device { + has Str $.device-id; + has $.display-name; + has $.last-seen-ip; + has $.last-seen-ts; + + submethod BUILD( + Str :device_id(:$!device-id), + :display_name(:$!display-name)?, + :last_seen_ip(:$!last-seen-ip)?, + :last_seen_ts(:$!last-seen-ts)? + ) { } +} + +class MediaStore::Config { + has Int $.upload-size; + + method new(%config) { + self.bless(:upload-size(%config // Int)); + } +} diff --git a/lib/Matrix/Client/Room.pm6 b/lib/Matrix/Client/Room.pm6 deleted file mode 100644 index 3d6ecaa..0000000 --- a/lib/Matrix/Client/Room.pm6 +++ /dev/null @@ -1,190 +0,0 @@ -use JSON::Fast; -use Matrix::Client::Common; -use Matrix::Client::Requester; -use Matrix::Response; - -unit class Matrix::Client::Room does Matrix::Client::Requester; - -has $!name; -has $.id; - -submethod TWEAK { - $!url-prefix = "/rooms/$!id"; -} - -method !get-name() { - CATCH { - when X::Matrix::Response { - .code ~~ /M_NOT_FOUND/ - ?? ($!name = '') - !! fail - } - default { fail } - } - my $data = $.state('m.room.name'); - $!name = $data; -} - -method name(--> Str) { - self!get-name; - $!name -} - -method fallback-name(--> Str) { - my @members = $.joined-members.kv.map( - -> $k, %v { - %v // $k - } - ); - - $!name = do given @members.elems { - when 1 { @members.first } - when 2 { @members[0] ~ " and " ~ @members[1] } - when * > 2 { @members.first ~ " and {@members.elems - 1} others" } - default { "Empty room" } - }; -} - -#| GET - /_matrix/client/r0/rooms/{roomId}/aliases -method aliases(--> List) { - my %data = from-json($.get('/aliases').content); - %data.List -} - -# Events - -## Getting events for a room - -#| GET - /_matrix/client/r0/rooms/{roomId}/event/{eventId} -method event(Str $event-id --> Matrix::Response::RoomEvent) { - my %data = from-json($.get("/event/$event-id").content); - Matrix::Response::RoomEvent.new(|%data) -} - -#| GET - /_matrix/client/r0/rooms/{roomId}/state -multi method state(--> Seq) { - my $data = from-json($.get('/state').content); - - gather for $data.List -> $event { - take Matrix::Response::StateEvent.new(:room-id($.id), |$event) - } -} - -#| GET - /_matrix/client/r0/rooms/{roomId}/state/{eventType}/{stateKey} -multi method state(Str $event-type, Str $state-key = "") { - from-json($.get("/state/$event-type/$state-key").content) -} - -#| GET - /_matrix/client/r0/rooms/{roomId}/joined_members -method joined-members { - my %data = from-json($.get("/joined_members").content); - %data -} - -#| GET - /_matrix/client/r0/rooms/{roomId}/messages -method messages( - Str:D :$from!, Str :$to, - Str :$dir where * eq 'f'|'b' = 'f', - Int :$limit = 10, :%filter, - --> Matrix::Response::Messages -) { - my $res = $.get( - "/messages", :$from, :$to, :$dir, :$limit, :%filter - ); - my $data = from-json($res.content); - - - my @messages = $data.map(-> $ev { - Matrix::Response::RoomEvent.new(|$ev) - }); - - Matrix::Response::Messages.new( - start => $data, - end => $data, - messages => @messages - ) -} - -#| GET - /_matrix/client/r0/rooms/{roomId}/members -method members(:$at, Str :$membership, Str :$not-membership --> Seq) { - my %query; - - %query = $at with $at; - %query = $membership with $membership; - %query = $not-membership with $not-membership; - - my %data = from-json($.get('/members', |%query).content); - - gather for %data.List -> $ev { - take Matrix::Response::MemberEvent.new(|$ev) - } -} - -## Sending events to a room - -#| PUT - /_matrix/client/r0/rooms/{roomId}/send/{eventType}/{txnId} -method send(Str $body!, Str :$type? = "m.text") { - $Matrix::Client::Common::TXN-ID++; - my $res = $.put( - "/send/m.room.message/{$Matrix::Client::Common::TXN-ID}", - msgtype => $type, body => $body - ); - - from-json($res.content) -} - -#| PUT - /_matrix/client/r0/rooms/{roomId}/state/{eventType}/{stateKey} -method send-state(Str:D $event-type, :$state-key = "", *%args --> Str) { - my $res = $.put( - "/state/$event-type/$state-key", - |%args - ); - from-json($res.content) -} - -# Room membership! - -## Joining rooms - -#| POST - /_matrix/client/r0/rooms/{roomId}/invite -method invite(Str $user-id) { - $.post('/invite', :$user-id) -} - -#| POST - /_matrix/client/r0/rooms/{roomId}/join -method join { - $.post('/join') -} - -## Leaving rooms - -#| POST - /_matrix/client/r0/rooms/{roomId}/leave -method leave { - $.post('/leave') -} - -#| POST - /_matrix/client/r0/rooms/{roomId}/forget -method forget { - $.post('/forget') -} - -#| POST - /_matrix/client/r0/rooms/{roomId}/kick -method kick(Str $user-id, Str $reason = "") { - $.post('/kick', :$user-id, :$reason) -} - -## Banning users - -#| POST - /_matrix/client/r0/rooms/{roomId}/ban -method ban(Str $user-id, $reason = "") { - $.post('/ban', :$user-id, :$reason) -} - -#| POST - /_matrix/client/r0/rooms/{roomId}/unban -method unban(Str $user-id) { - $.post('/unban', :$user-id) -} - -method Str(--> Str) { - "Room" -} diff --git a/lib/Matrix/Client/Room.rakumod b/lib/Matrix/Client/Room.rakumod new file mode 100644 index 0000000..1e8c582 --- /dev/null +++ b/lib/Matrix/Client/Room.rakumod @@ -0,0 +1,190 @@ +use JSON::Fast; +use Matrix::Client::Common; +use Matrix::Client::Requester; +use Matrix::Client::Response; + +unit class Matrix::Client::Room does Matrix::Client::Requester; + +has $!name; +has $.id; + +submethod TWEAK { + $!url-prefix = "/rooms/$!id"; +} + +method !get-name() { + CATCH { + when X::Matrix::Response { + .code ~~ /M_NOT_FOUND/ + ?? ($!name = '') + !! fail + } + default { fail } + } + my $data = $.state('m.room.name'); + $!name = $data; +} + +method name(--> Str) { + self!get-name; + $!name +} + +method fallback-name(--> Str) { + my @members = $.joined-members.kv.map( + -> $k, %v { + %v // $k + } + ); + + $!name = do given @members.elems { + when 1 { @members.first } + when 2 { @members[0] ~ " and " ~ @members[1] } + when * > 2 { @members.first ~ " and {@members.elems - 1} others" } + default { "Empty room" } + }; +} + +#| GET - /_matrix/client/r0/rooms/{roomId}/aliases +method aliases(--> List) { + my %data = from-json($.get('/aliases').content); + %data.List +} + +# Events + +## Getting events for a room + +#| GET - /_matrix/client/r0/rooms/{roomId}/event/{eventId} +method event(Str $event-id --> Matrix::Client::Response::RoomEvent) { + my %data = from-json($.get("/event/$event-id").content); + Matrix::Client::Response::RoomEvent.new(|%data) +} + +#| GET - /_matrix/client/r0/rooms/{roomId}/state +multi method state(--> Seq) { + my $data = from-json($.get('/state').content); + + gather for $data.List -> $event { + take Matrix::Client::Response::StateEvent.new(:room-id($.id), |$event) + } +} + +#| GET - /_matrix/client/r0/rooms/{roomId}/state/{eventType}/{stateKey} +multi method state(Str $event-type, Str $state-key = "") { + from-json($.get("/state/$event-type/$state-key").content) +} + +#| GET - /_matrix/client/r0/rooms/{roomId}/joined_members +method joined-members { + my %data = from-json($.get("/joined_members").content); + %data +} + +#| GET - /_matrix/client/r0/rooms/{roomId}/messages +method messages( + Str:D :$from!, Str :$to, + Str :$dir where * eq 'f'|'b' = 'f', + Int :$limit = 10, :%filter, + --> Matrix::Client::Response::Messages +) { + my $res = $.get( + "/messages", :$from, :$to, :$dir, :$limit, :%filter + ); + my $data = from-json($res.content); + + + my @messages = $data.map(-> $ev { + Matrix::Client::Response::RoomEvent.new(|$ev) + }); + + Matrix::Client::Response::Messages.new( + start => $data, + end => $data, + messages => @messages + ) +} + +#| GET - /_matrix/client/r0/rooms/{roomId}/members +method members(:$at, Str :$membership, Str :$not-membership --> Seq) { + my %query; + + %query = $at with $at; + %query = $membership with $membership; + %query = $not-membership with $not-membership; + + my %data = from-json($.get('/members', |%query).content); + + gather for %data.List -> $ev { + take Matrix::Client::Response::MemberEvent.new(|$ev) + } +} + +## Sending events to a room + +#| PUT - /_matrix/client/r0/rooms/{roomId}/send/{eventType}/{txnId} +method send(Str $body!, Str :$type? = "m.text") { + $Matrix::Client::Common::TXN-ID++; + my $res = $.put( + "/send/m.room.message/{$Matrix::Client::Common::TXN-ID}", + msgtype => $type, body => $body + ); + + from-json($res.content) +} + +#| PUT - /_matrix/client/r0/rooms/{roomId}/state/{eventType}/{stateKey} +method send-state(Str:D $event-type, :$state-key = "", *%args --> Str) { + my $res = $.put( + "/state/$event-type/$state-key", + |%args + ); + from-json($res.content) +} + +# Room membership! + +## Joining rooms + +#| POST - /_matrix/client/r0/rooms/{roomId}/invite +method invite(Str $user-id) { + $.post('/invite', :$user-id) +} + +#| POST - /_matrix/client/r0/rooms/{roomId}/join +method join { + $.post('/join') +} + +## Leaving rooms + +#| POST - /_matrix/client/r0/rooms/{roomId}/leave +method leave { + $.post('/leave') +} + +#| POST - /_matrix/client/r0/rooms/{roomId}/forget +method forget { + $.post('/forget') +} + +#| POST - /_matrix/client/r0/rooms/{roomId}/kick +method kick(Str $user-id, Str $reason = "") { + $.post('/kick', :$user-id, :$reason) +} + +## Banning users + +#| POST - /_matrix/client/r0/rooms/{roomId}/ban +method ban(Str $user-id, $reason = "") { + $.post('/ban', :$user-id, :$reason) +} + +#| POST - /_matrix/client/r0/rooms/{roomId}/unban +method unban(Str $user-id) { + $.post('/unban', :$user-id) +} + +method Str(--> Str) { + "Room" +} diff --git a/lib/Matrix/Response.pm6 b/lib/Matrix/Response.pm6 deleted file mode 100644 index a0b2896..0000000 --- a/lib/Matrix/Response.pm6 +++ /dev/null @@ -1,156 +0,0 @@ -use JSON::Fast; - -unit module Matrix::Response; - -class Matrix::Response::Event { - has %.content; - has $.type is required; -} - -class Matrix::Response::RoomEvent is Matrix::Response::Event { - has Str $.sender; - has Int $.origin_server_ts; - has $.event_id; - has Str $.room_id; - - method id { $.event_id } - method timestamp { $!origin_server_ts } - method room-id { $.room_id } -} - -class Matrix::Response::StateEvent is Matrix::Response::RoomEvent { - has $.prev_content; - has $.state_key; -} - -class Matrix::Response::MemberEvent is Matrix::Response::StateEvent { - has $.type is required where 'm.room.member'; -} - -class Matrix::Response::Timeline { - has Matrix::Response::Event @.events; - has Bool $limited; - has Str $prev-batch; -} - -class Matrix::Response::RoomInfo { - has $.room-id is required; - has Matrix::Response::Event @.state; - has Matrix::Response::Timeline $.timeline; - - method gist(--> Str) { - "" - } -} - -class Matrix::Response::InviteInfo { - has $.room-id is required; - has Matrix::Response::Event @.events; - - method gist(--> Str) { - "" - } -} - -sub gather-events($room-id, $from) { - gather for $from.List -> $ev { - take Matrix::Response::StateEvent.new(:room_id($room-id), |$ev); - } -} - -class Matrix::Response::Messages { - has $.start; - has $.end; - has Matrix::Response::RoomEvent @.messages; -} - -class Matrix::Response::Sync { - has Str $.next-batch; - has Matrix::Response::Event @.presence; - has Matrix::Response::RoomInfo @.joined-rooms; - has Matrix::Response::InviteInfo @.invited-rooms; - - multi method new(Str $json) { - return self.new(from-json($json)); - } - - multi method new(Hash $json) { - my $next-batch = $json; - my Matrix::Response::Event @presence; - my Matrix::Response::RoomInfo @joined-rooms; - my Matrix::Response::InviteInfo @invited-rooms; - - for $json.List -> $ev { - @presence.push(Matrix::Response::Event.new(|$ev)); - } - - for $json.kv -> $room-id, $data { - my @state = gather-events($room-id, $data); - - my $timeline = Matrix::Response::Timeline.new( - limited => $data, - prev-batch => $data, - events => gather-events($room-id, $data) - ); - - @joined-rooms.push(Matrix::Response::RoomInfo.new( - :$room-id, :$timeline, :@state - )); - } - - for $json.kv -> $room-id, $data { - my @events = gather-events($room-id, $data); - @invited-rooms.push(Matrix::Response::InviteInfo.new( - :$room-id, :@events - )); - } - - return self.bless(:$next-batch, :@presence, - :@joined-rooms, :@invited-rooms); - } -} - -class Presence { - has Str $.presence is required; - has Int $.last-active-ago; - has Str $.status-message; - has Bool $.currently-active; - - submethod BUILD( - Str :$!presence, - :last_active_ago(:$!last-active-ago) = 0, - :status_message(:$!status-message) = "", - :currently_active(:$!currently-active) = False - ) { } -} - -class Tag { - has @.tags; - - method new(%json) { - my @tags = %json.keys; - self.bless(:@tags) - } -} - -class Matrix::Response::Device { - has Str $.device-id; - has $.display-name; - has $.last-seen-ip; - has $.last-seen-ts; - - submethod BUILD( - Str :device_id(:$!device-id), - :display_name(:$!display-name)?, - :last_seen_ip(:$!last-seen-ip)?, - :last_seen_ts(:$!last-seen-ts)? - ) { } -} - -class Matrix::Response::MediaStore::Config { - has Int $.upload-size; - - method new(%config) { - self.bless(:upload-size(%config // Int)); - } -} diff --git a/t/10-use.t b/t/10-use.t index 1c6f97e..7bce568 100644 --- a/t/10-use.t +++ b/t/10-use.t @@ -4,7 +4,7 @@ use Test; use-ok 'Matrix::Client'; use-ok 'Matrix::Client::Room'; use-ok 'Matrix::Client::Requester'; -use-ok 'Matrix::Response'; +use-ok 'Matrix::Client::Response'; use-ok 'Matrix::Client::Exception'; use-ok 'Matrix::Client::MediaStore'; diff --git a/t/60-media.t b/t/60-media.t index 2417cb1..618e2c2 100644 --- a/t/60-media.t +++ b/t/60-media.t @@ -60,7 +60,7 @@ subtest 'config', { } } - isa-ok $media.config, Matrix::Response::MediaStore::Config, 'Can load Associative'; + isa-ok $media.config, Matrix::Client::Response::MediaStore::Config, 'Can load Associative'; is $media.config.upload-size, 5000, 'correct upload size'; my $empty-media = Matrix::Client::MediaStore.new(:home-server("1234")) but role { @@ -69,7 +69,7 @@ subtest 'config', { } } - isa-ok $empty-media.config, Matrix::Response::MediaStore::Config, 'Can load empty configuration'; + isa-ok $empty-media.config, Matrix::Client::Response::MediaStore::Config, 'Can load empty configuration'; is $empty-media.config.upload-size, Int, 'Unknown upload-size'; nok $empty-media.config.upload-size.defined, 'upload-size not defined'; -- cgit v1.2.3-70-g09d2