Compare commits
No commits in common. "cc03ba6e727a8559abb7da08404df800568c8212" and "49a44002465ec1d8a3cc316542408f8f8afa35c0" have entirely different histories.
cc03ba6e72
...
49a4400246
@ -26,7 +26,7 @@ bevy_ecs = "0"
|
|||||||
bevy_log = "0"
|
bevy_log = "0"
|
||||||
clap = { version = "4", features = ["derive", "string"] }
|
clap = { version = "4", features = ["derive", "string"] }
|
||||||
console-subscriber = { version = "0", optional = true }
|
console-subscriber = { version = "0", optional = true }
|
||||||
ctrlc = "3"
|
ctrlc = { version = "3", features = ["termination"] }
|
||||||
dirs = { version = "6", optional = true }
|
dirs = { version = "6", optional = true }
|
||||||
futures = "0"
|
futures = "0"
|
||||||
futures-locks = "0"
|
futures-locks = "0"
|
||||||
|
@ -14,7 +14,7 @@ use serde::{Deserialize, Serialize};
|
|||||||
use tokio::fs;
|
use tokio::fs;
|
||||||
use verification::{on_device_key_verification_request, on_room_message_verification_request};
|
use verification::{on_device_key_verification_request, on_room_message_verification_request};
|
||||||
|
|
||||||
use crate::{State, events::call_listeners, lua::matrix::client::Client as LuaClient};
|
use crate::{State, lua::matrix::client::Client as LuaClient};
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
struct Context {
|
struct Context {
|
||||||
@ -62,6 +62,7 @@ pub async fn login(state: &State, options: &Table, globals: &Table, name: String
|
|||||||
options.get::<String>("username")?,
|
options.get::<String>("username")?,
|
||||||
&options.get::<String>("password")?,
|
&options.get::<String>("password")?,
|
||||||
);
|
);
|
||||||
|
|
||||||
let root_dir = dirs::data_dir()
|
let root_dir = dirs::data_dir()
|
||||||
.context("no data directory")?
|
.context("no data directory")?
|
||||||
.join("errornowatcher")
|
.join("errornowatcher")
|
||||||
@ -129,7 +130,6 @@ pub async fn login(state: &State, options: &Table, globals: &Table, name: String
|
|||||||
|
|
||||||
let client = Arc::new(client);
|
let client = Arc::new(client);
|
||||||
globals.set("matrix", LuaClient(client.clone()))?;
|
globals.set("matrix", LuaClient(client.clone()))?;
|
||||||
call_listeners(state, "matrix_init", || Ok(())).await?;
|
|
||||||
|
|
||||||
client
|
client
|
||||||
.sync_with_result_callback(sync_settings, |sync_result| async {
|
.sync_with_result_callback(sync_settings, |sync_result| async {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user