MirrorHub/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-11-09 23:21:04 +01:00
Code Issues Releases Activity
518 commits 50 branches 6 tags 12 MiB
Commit graph

518 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
timokoesters
f361cb3d39
Improve README 2020-07-11 09:55:44 +02:00
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>
 2020-07-09 19:21:12 +02:00
CapsizeGlimmer
3a8efaeafa Whitelist logout all 2020-07-07 23:09:29 -04:00
CapsizeGlimmer
76aa44ead3 Add logout/all route to main 2020-07-05 15:35:03 -04:00
CapsizeGlimmer
7c2144c6d7 Implement /logout/all 2020-07-05 15:35:03 -04:00
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>
 2020-07-05 07:48:19 +02:00
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>
 2020-07-02 20:38:25 +02:00
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
 2020-06-26 19:01:32 +02:00
timokoesters
b83fba5c44
chore: update dependencies 2020-06-26 18:04:08 +02:00
timokoesters
54ad1fbed9
fix: CI 2020-06-26 16:26:29 +02:00
timokoesters
05f1f73e10
improvement: upgrade to sled 0.32 
BREAKING CHANGE: old databases are not compatible anymore
 2020-06-26 16:26:28 +02:00
timokoesters
24c544f650
fix: DMs show up as rooms 2020-06-26 15:16:15 +02:00
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.
 2020-06-26 15:16:15 +02:00
timokoesters
a49a572d76
feat: cross-signing 2020-06-26 15:16:15 +02:00
timokoesters
7031240af3
improvement: /members route 2020-06-16 23:25:15 +02:00
timokoesters
02fe030b2a
improvement: better default push rules 2020-06-16 23:25:14 +02:00
Timo Kösters
e7803e310a Merge pull request 'fix: update rocket version' (#127) from fix into master 2020-06-16 13:55:20 +02:00
timokoesters
db685e0cf7
fix: update rocket version 2020-06-16 13:53:15 +02:00
Timo Kösters
0f72bd9f32 Merge pull request 'fix: update ruma version' (#125) from fix into master 2020-06-16 12:21:12 +02:00
timokoesters
13d474f6ee
fix: update ruma version 2020-06-16 12:19:58 +02:00
Timo Kösters
bc959f7634 Merge pull request 'Update 'README.md'' (#123) from timo-patch-1 into master 2020-06-16 08:44:24 +02:00
Timo Kösters
853ccd6fbf Update 'README.md' 2020-06-16 08:43:46 +02:00
Timo Kösters
b0bbc049fa Merge pull request 'Update 'README.md'' (#122) from timo-bitcoin into master 2020-06-16 08:42:13 +02:00
Timo Kösters
c6194b27a3 Update 'README.md' 2020-06-16 08:21:06 +02:00
Timo Kösters
7b23069943 Merge pull request 'Remove unused imports' (#119) from PublicByte/conduit:remove-unused-imports into master 2020-06-11 22:34:49 +02:00
PublicByte
fa7612f069 refactor: remove unused imports 2020-06-11 21:06:43 +02:00
Timo Kösters
4c98079c4c Merge pull request 'refactor: better error handling' (#116) from error-handling into master 2020-06-11 15:21:23 +02:00