Commit Graph

231 Commits (fa2da9e04849ccf2c37e3769d7fc776599186e2e)
 

Author SHA1 Message Date
CapsizeGlimmer fa2da9e048
Implement max_request_size config option 4 years ago
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
4 years ago
timokoesters 2765071201
Fix CI 4 years ago
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
4 years ago
timokoesters 808a7deae3
cargo fmt 4 years ago
timokoesters dc5fb7e33a
feat: encryption_disabled config option
Can be used with ROCKET_ENCRYPTION_DISABLED=true
4 years ago
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>
4 years ago
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
4 years ago
timokoesters b7df8fe83c
fix: stop /messages at `to`
Fixes #150
4 years ago
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>
4 years ago
Jonas Platte 09561ccea3
Upgrade ruma 4 years ago
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
4 years ago
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)
4 years ago
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>
4 years ago
Devin Ragotzy 87fd432527 Refactor account_data to be more similar to other endpoints 4 years ago
Devin Ragotzy 60381ddcf4 Update to latest ruma/master rev 4 years ago
Devin Ragotzy 61458536ab Merge branch 'master' of https://git.koesters.xyz/timo/conduit into ruma-mono 4 years ago
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>
4 years ago
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
4 years ago
timokoesters d8e1248df6
improvement: switch to stable rust 4 years ago
Devin R 84d47da392 Simplify deserialization and deconstruction for Responses 4 years ago
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>.
4 years ago
Devin R 9a993fa7c1 Convert Pdu to a validated ruma type when calling to_*_event 4 years ago
Devin R 75959cdc10 Resolve stying review issues 4 years ago
Devin R 029c60be78 Replace to_string into_boxed_str with into 4 years ago
Devin R 59cbf202e4 Cargo.lock updated while rebasing 4 years ago
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...
4 years ago
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)
4 years ago
Devin R 84dcb885a7 Return correct Errors and replace panic, fix misc review issues
Remove EventJson todo comments, clean up Cargo.toml commented ruma deps.
4 years ago
Devin R ddc7598870 Use ruma/ruma master 4 years ago
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.
4 years ago
Devin R 7c38e53839 Move to depend on ruma monorepo and ruma-events0.22 4 years ago
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
4 years ago
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
4 years ago
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>
4 years ago
Timo Kösters b03d030b71 Merge pull request 'Improve README' (#145) from readme into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/145
4 years ago
timokoesters f361cb3d39
Improve README 4 years ago
Timo Kösters 8409146415 Merge pull request 'Implement /logout/all' (#141) from CapsizeGlimmer/conduit:logout-all into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/141
Reviewed-by: Timo Kösters <timo@koesters.xyz>
4 years ago
CapsizeGlimmer 3a8efaeafa Whitelist logout all 4 years ago
CapsizeGlimmer 76aa44ead3 Add logout/all route to main 4 years ago
CapsizeGlimmer 7c2144c6d7 Implement /logout/all 4 years ago
the0 b81939841b feat: account deactivation (#137)
Deactivation: swap unwrap_or(false) to .ok()?

feat: implement deactivate account route

Implement error code on login to deactivated account

Deactivation: Changes requested

Add missing .clone()

Deactivation: Requested changes

Remove unneeded .filter()

Deactivation: badly named signature leads to confusion

Co-authored-by: the0 <theo@localhost>
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/137
Reviewed-by: Timo Kösters <timo@koesters.xyz>
4 years ago
the0 67a1f21f5d feat: implement password changing (#138)
Password: Fixes

Password: Implement logging out all devices except current

Password: Implement password changing

Co-authored-by: the0 <theo@localhost>
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/138
Reviewed-by: Timo Kösters <timo@koesters.xyz>
4 years ago
Timo Kösters e809d819ac Merge pull request 'Key backups and cross signing' (#132) from cross-signing into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/132
4 years ago
timokoesters b83fba5c44
chore: update dependencies 4 years ago
timokoesters 54ad1fbed9
fix: CI 4 years ago
timokoesters 05f1f73e10
improvement: upgrade to sled 0.32
BREAKING CHANGE: old databases are not compatible anymore
4 years ago
timokoesters 24c544f650
fix: DMs show up as rooms 4 years ago
Guillem Nieto 8f06d0258a
Remove `is_direct` flag from Join event
When I was investigating the DM issue, I found that join event contained
the `is_direct` flag. According to the spec, this flag should only be
set on "invite" events, but not on join.

Other homeservers do not have this flag on join.
4 years ago
timokoesters a49a572d76
feat: cross-signing 4 years ago