TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2395 commits 50 branches 7 tags 14 MiB
Commit graph

2395 commits

This branch
This branch
All branches
Author SHA1 Message Date
timokoesters
d891bbb5dc
improve: presence 2020-07-29 13:05:38 +02:00
timokoesters
05f9d927b8
fix: account data 2020-07-29 13:05:37 +02:00
timokoesters
21eb8d4fe3
fix: problems with pdu serialization 2020-07-29 12:59:40 +02:00
timokoesters
dd3dab39ae
feat: whoami route 2020-07-29 12:59:40 +02:00
timokoesters
489cbc0a93
refactor: use <_> instead of <_parameter_name> 2020-07-29 12:59:36 +02:00
gnieto
cc411c530b Fix custom account data serialization (#165) 
Stylistic change

Fix custom data serialization

Build a custom event before storing global account data

Co-authored-by: Guillem Nieto <gnieto.talo@gmail.com>
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/165
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-07-29 07:48:34 +02:00
Timo Kösters
c4260bde81 Merge pull request 'Timo's Conditionally emit rocket::http_verb attr macros if lib/bin' (#157) from timo-make-lib into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/157
 2020-07-27 20:40:30 +02:00
Devin Ragotzy
e6a1b0b66f
Add cfg_attr gate to server_server endpoints 2020-07-27 18:54:43 +02:00
Devin Ragotzy
42e0102a2a
Conditionally emit rocket::http_verb attr macros if lib/bin 2020-07-27 18:54:43 +02:00
Timo Kösters
b82fd02ee3 Merge pull request 'Implement /rooms/<room_id>/joined_members' (#143) from joined_members into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/143
 2020-07-27 18:22:04 +02:00
CapsizeGlimmer
4d4969862a
Implement /rooms/<room_id>/joined_members 2020-07-27 18:21:06 +02:00
Timo Kösters
fdb7b8f0f1 Merge pull request 'Implement max_request_size config option' (#153) from media-size-config into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/153
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-07-27 18:08:50 +02:00
timokoesters
5f47cbf7dc
improvement: documentation 2020-07-27 18:06:36 +02:00
CapsizeGlimmer
8fcf8e20b8
fix MR 153 requests; cargo fmt 2020-07-27 17:50:21 +02:00
CapsizeGlimmer
fa2da9e048
Implement max_request_size config option 2020-07-27 17:49:11 +02:00
Timo Kösters
3451b10a4b Merge pull request 'Fix CI' (#161) from fix-ci into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/161
 2020-07-27 08:21:34 +02:00
timokoesters
2765071201
Fix CI 2020-07-27 08:19:14 +02:00
Timo Kösters
75d91b9064 Merge pull request 'feat: encryption_disabled config option' (#160) from disable-encryption-config into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/160
 2020-07-27 08:15:04 +02:00
timokoesters
808a7deae3
cargo fmt 2020-07-26 22:45:10 +02:00
timokoesters
dc5fb7e33a
feat: encryption_disabled config option 
Can be used with ROCKET_ENCRYPTION_DISABLED=true
 2020-07-26 22:41:29 +02:00
gnieto
5a8705bd25 Add room tags (#140) 
Merge branch 'master' into task/add-tags

Add room tagging support

Co-authored-by: Timo Kösters <timo@koesters.xyz>
Co-authored-by: Guillem Nieto <gnieto.talo@gmail.com>
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/140
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-07-26 22:33:20 +02:00
Timo Kösters
c3d142ad28 Merge pull request 'fix: stop /messages at to' (#159) from fix-to into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/159
 2020-07-26 22:21:39 +02:00
timokoesters
b7df8fe83c
fix: stop /messages at to 
Fixes #150
 2020-07-26 22:21:05 +02:00
Timo Kösters
20ab19d828 Merge pull request 'Upgrade ruma' (#158) from jplatte/conduit:up-ruma into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/158
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-07-26 17:20:11 +02:00
Jonas Platte
09561ccea3
Upgrade ruma 2020-07-26 16:52:43 +02:00
Timo Kösters
f8544bf6e3 Merge pull request 'improvement: only remove to-device events when sure the client received them' (#139) from improve-to-device-removal into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/139
 2020-07-26 14:14:08 +02:00
timokoesters
16576d19cd
improvement: only remove to-device events when sure the client received them 
To make this work, I had to remove the recommended limit of 100
to-device events per /sync
(https://matrix.org/docs/spec/client_server/latest#id72)
 2020-07-26 13:59:19 +02:00
Timo Kösters
678f33acf9 Merge pull request 'Moving to ruma-monorepo' (#133) from DevinR528/conduit:ruma-mono into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/133
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-07-25 22:02:45 +02:00
Devin Ragotzy
87fd432527 Refactor account_data to be more similar to other endpoints 2020-07-25 15:48:12 -04:00
Devin Ragotzy
60381ddcf4 Update to latest ruma/master rev 2020-07-25 14:25:24 -04:00
Devin Ragotzy
61458536ab Merge branch 'master' of https://git.koesters.xyz/timo/conduit into ruma-mono 2020-07-25 13:46:28 -04:00
aura
630196f0a3 Implement get_joined_rooms (#155) 
whitelist /joined_rooms in sytest

Signed-off-by: Aurabindo Pillai <mail@aurabindo.in>

style: fmt

feat: implement /joined_rooms (#78)

Signed-off-by: Aurabindo Pillai <mail@aurabindo.in>

Co-authored-by: Aurabindo Pillai <mail@aurabindo.in>
Co-authored-by: timokoesters <timo@koesters.xyz>
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/155
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-07-25 18:35:22 +02:00
Timo Kösters
be43b9557e Merge pull request 'improvement: switch to stable rust' (#151) from stable into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/151
 2020-07-23 10:23:01 +02:00
timokoesters
d8e1248df6
improvement: switch to stable rust 2020-07-22 22:42:01 +02:00
Devin R
84d47da392 Simplify deserialization and deconstruction for Responses 2020-07-21 16:26:01 -04:00
Devin R
33bc666859 Use sync ephemeral events in sync Resposne (remove room_id) 
Bump ruma to latest master which also fixes some server name as String
to now being of type Box<ServerName>.
 2020-07-21 14:04:39 -04:00
Devin R
9a993fa7c1 Convert Pdu to a validated ruma type when calling to_*_event 2020-07-18 08:22:30 -04:00
Devin R
75959cdc10 Resolve stying review issues 2020-07-18 08:21:25 -04:00
Devin R
029c60be78 Replace to_string into_boxed_str with into 2020-07-17 19:52:04 -04:00
Devin R
59cbf202e4 Cargo.lock updated while rebasing 2020-07-17 16:05:53 -04:00
Devin R
d02685a4fd Update to latest ruma/ruma commit 
This will most likely be the API that is released to crates.io so it
should be fairly stable...
 2020-07-17 16:04:05 -04:00
Devin R
63e23154f3 Rebase with key backups and cross signing 
Moved back to a fork of ruma with timo's key-backup and cross-signing
branch. Ephemeral events in sync responses are EphemeralRoomEventStub
(they also have no room_id like all of sync responses events)
 2020-07-17 16:04:05 -04:00
Devin R
84dcb885a7 Return correct Errors and replace panic, fix misc review issues 
Remove EventJson todo comments, clean up Cargo.toml commented ruma deps.
 2020-07-17 16:03:36 -04:00
Devin R
ddc7598870 Use ruma/ruma master 2020-07-17 16:03:36 -04:00
Devin R
24b6702047 Add to_*_event_stub methods to pdu, filter for correct event kind 
When creating some responses (sync) an AnyRoomEventStub is needed for this
PduEvent will deserialize the JSON as a Stub event and a non stub event
when needed. Ephemeral and account events are checked to be the correct
type and filtered out if not. This requires an extra `deserialize` call
which could/should be removed.

TODO: Possibly get rid of EventJson in some places.
 2020-07-17 16:03:33 -04:00
Devin R
7c38e53839 Move to depend on ruma monorepo and ruma-events0.22 2020-07-17 16:03:02 -04:00
Timo Kösters
9c095f1538 Update README, fix CI (#148) 
Update 'README.md'

Update README, fix CI

Co-authored-by: timokoesters <timo@koesters.xyz>
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/148
 2020-07-16 07:50:11 +02:00
Timo Kösters
b9de21949d Update to rocket master (#147) 
Merge branch 'master' into rocket

Update to rocket master

Co-authored-by: timokoesters <timo@koesters.xyz>
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/147
 2020-07-14 18:23:26 +02:00
the0
469071e105 feat: implement /event (#144) 
Merge branch 'master' into event-route

Event: Implement /event

Co-authored-by: the0 <theo@localhost>
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/144
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-07-11 14:08:37 +02:00
Timo Kösters
b03d030b71 Merge pull request 'Improve README' (#145) from readme into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/145
 2020-07-11 09:57:43 +02:00