magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: first steps towards joining rooms over federation

Browse source
This commit is contained in:
Timo 2020-08-14 11:31:31 +02:00
parent f40f1d9f75
commit 04eee089e0
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
10 changed files with 291 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/main.rs
View file

@ -1,13 +1,13 @@
#![warn(rust_2018_idioms)]
pub mod push_rules;
pub mod server_server;
pub mod client_server;
mod client_server;
mod push_rules;
mod database;
mod error;
mod pdu;
mod ruma_wrapper;
//mod server_server;
mod utils;
pub use database::Database;
@ -110,10 +110,10 @@ fn setup_rocket() -> rocket::Rocket {
client_server::get_key_changes_route,
client_server::get_pushers_route,
client_server::set_pushers_route,
//server_server::well_known_server,
//server_server::get_server_version,
//server_server::get_server_keys,
//server_server::get_server_keys_deprecated,
server_server::well_known_server,
server_server::get_server_version,
server_server::get_server_keys,
server_server::get_server_keys_deprecated,
],
)
.attach(AdHoc::on_attach("Config", |mut rocket| async {