char/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
427 commits 1 branch 0 tags 2.6 MiB
Commit graph

427 commits

This branch
This branch
All branches
Author SHA1 Message Date
Devin Ragotzy
da1c53aaef Make State struct constructable by lib user 2020-08-03 20:56:14 -04:00
Timo Kösters
4a8bc93b1a Merge pull request 'Send invites only if invited during the sync request' (#176) from gnieto/conduit:fix/send-invite-when-needed into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/176
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-08-02 10:41:05 +02:00
Guillem Nieto
b575593647 Do not ignore db errors 2020-08-02 09:38:20 +02:00
Guillem Nieto
47abe6686e Send invites only if invited during the sync request 
Fixes: https://git.koesters.xyz/timo/conduit/issues/175
 2020-08-02 09:24:47 +02:00
Timo Kösters
935f0e6185 Merge pull request 'feat: handle /publicRooms pagination' (#174) from publicrooms-pagination into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/174
 2020-07-30 22:52:23 +02:00
timokoesters
98f37302a6
feat: handle /publicRooms pagination 2020-07-30 22:51:02 +02:00
Timo Kösters
5cfda2f5d3 Merge pull request 'feat: handle inhibit_login in /register' (#173) from inhibit-login into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/173
 2020-07-30 22:21:09 +02:00
timokoesters
0616acbde6
feat: handle inhibit_login in /register 2020-07-30 20:52:37 +02:00
Timo Kösters
acc7b15981 Merge pull request 'refactor: put endpoints into modules' (#172) from route-files into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/172
 2020-07-30 19:09:43 +02:00
timokoesters
c1c62b7eb4
refactor: put endpoints into modules 2020-07-30 18:34:03 +02:00
Timo Kösters
485a24398b Merge pull request 'Implement ignore invite when inviting user is ignored' (#164) from DevinR528/conduit:ignored-list-invite into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/164
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-07-30 15:27:08 +02:00
Devin Ragotzy
7a70d8488f Rebase with master and update append_pdu call 2020-07-30 09:22:51 -04:00
Devin Ragotzy
c8d7d80eb2 Fix start/end token swap left from dropped commits 2020-07-30 09:22:51 -04:00
Devin Ragotzy
99220565d4 Fix invite leave auth error by moving update_membership 2020-07-30 09:22:51 -04:00
Devin Ragotzy
25c0e75f29 Cargo fmt 2020-07-30 09:22:51 -04:00
Devin Ragotzy
8aac332b3a Move ignore invite logic into update_member 2020-07-30 09:22:51 -04:00
Devin Ragotzy
f2fab27d81 Implement filtering invites if sender is ignored by receiver 2020-07-30 09:22:51 -04:00
Timo Kösters
100e3d6d6d Merge pull request 'improvement: handle limit and set limited in /user_directory/search' (#169) from user-dir-limit into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/169
 2020-07-30 15:19:21 +02:00
timokoesters
52b1df6fd2
improvement: handle limit and set limited in /user_directory/search 2020-07-30 15:17:34 +02:00
Timo Kösters
18dcf44aa4 Merge pull request 'fix: send device list updates when user is in no rooms' (#170) from fix-set-up-encryption into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/170
 2020-07-30 14:46:27 +02:00
timokoesters
ce460ea159
fix: send device list updates when user is in no rooms 2020-07-30 14:09:05 +02:00
Timo Kösters
c824652de6 Merge pull request 'Fix clippy warnings and run rustfmt' (#163) from DevinR528/conduit:clippy-fix2 into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/163
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-07-30 08:20:31 +02:00
timokoesters
b67372b11b
refactor: make all mods in database pub 
Now they can easily export their own structs
 2020-07-29 21:48:31 +02:00
Devin Ragotzy
d948f896c0
Turn append_pdu args into struct PduBuilder 2020-07-29 21:47:09 +02:00
Devin Ragotzy
1c6f211933
Create media::FileMeta to represent a file and meta data 2020-07-29 21:33:48 +02:00
Devin Ragotzy
2da48b941d
Convert all map_err -> expect when deserializing to Raw 2020-07-29 21:33:47 +02:00
Devin Ragotzy
62df9ca580
Fix all clippy warnings, shorten line len in client_server 2020-07-29 21:32:35 +02:00
Timo Kösters
3ccbd02081 Merge pull request 'Long polling and more' (#162) from longpoll into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/162
 2020-07-29 21:17:58 +02:00
timokoesters
e0d0fb4703
fix: only send device_one_time_keys_count when there are updates 2020-07-29 20:44:06 +02:00
timokoesters
66bc25fcd3
feat: implement /keys/changes 2020-07-29 18:05:16 +02:00
timokoesters
0693387769
improvement: more efficient /sync and only send device updates when sharing a room 2020-07-29 17:03:04 +02:00
timokoesters
310b0fcd86
fix ci 2020-07-29 13:05:38 +02:00
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