Browse Source

Replace paths with git deps

master
Colin Reeder 1 year ago
parent
commit
4eed19b446
3 changed files with 17 additions and 10 deletions
  1. 11
    5
      Cargo.lock
  2. 3
    3
      Cargo.toml
  3. 3
    2
      src/main.rs

+ 11
- 5
Cargo.lock View File

@@ -30,9 +30,9 @@ version = "0.1.0"
dependencies = [
"futures 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
"futures-stream-select-all-send 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"mstar_core 0.1.0",
"mstar_noob 0.1.0",
"mstar_rix 0.1.0",
"mstar_core 0.1.0 (git+https://git.vpzom.click/vpzom/mstar?rev=32f949b8)",
"mstar_noob 0.1.0 (git+https://git.vpzom.click/vpzom/mstar?rev=32f949b8)",
"mstar_rix 0.1.0 (git+https://git.vpzom.click/vpzom/mstar?rev=32f949b8)",
"serde 1.0.69 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.69 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -380,6 +380,7 @@ dependencies = [
[[package]]
name = "mstar_core"
version = "0.1.0"
source = "git+https://git.vpzom.click/vpzom/mstar?rev=32f949b8#32f949b8a8080e86469e07f045065599449da992"
dependencies = [
"futures 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -387,18 +388,20 @@ dependencies = [
[[package]]
name = "mstar_noob"
version = "0.1.0"
source = "git+https://git.vpzom.click/vpzom/mstar?rev=32f949b8#32f949b8a8080e86469e07f045065599449da992"
dependencies = [
"futures 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
"mstar_core 0.1.0",
"mstar_core 0.1.0 (git+https://git.vpzom.click/vpzom/mstar?rev=32f949b8)",
"noob 1.0.0 (git+https://git.vpzom.click/vpzom/noob?rev=e2995a95)",
]

[[package]]
name = "mstar_rix"
version = "0.1.0"
source = "git+https://git.vpzom.click/vpzom/mstar?rev=32f949b8#32f949b8a8080e86469e07f045065599449da992"
dependencies = [
"futures 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
"mstar_core 0.1.0",
"mstar_core 0.1.0 (git+https://git.vpzom.click/vpzom/mstar?rev=32f949b8)",
"rix 0.3.0 (git+https://git.vpzom.click/vpzom/rix?rev=fcb77d18)",
"serde_json 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1053,6 +1056,9 @@ dependencies = [
"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
"checksum mio 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)" = "4fcfcb32d63961fb6f367bfd5d21e4600b92cd310f71f9dca25acae196eb1560"
"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
"checksum mstar_core 0.1.0 (git+https://git.vpzom.click/vpzom/mstar?rev=32f949b8)" = "<none>"
"checksum mstar_noob 0.1.0 (git+https://git.vpzom.click/vpzom/mstar?rev=32f949b8)" = "<none>"
"checksum mstar_rix 0.1.0 (git+https://git.vpzom.click/vpzom/mstar?rev=32f949b8)" = "<none>"
"checksum native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f74dbadc8b43df7864539cedb7bc91345e532fdd913cfdc23ad94f4d2d40fbc0"
"checksum native-tls 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7530becae57a21b3325685bd5c98559c58cb57b7cc8c53e825cd85459b023ba9"
"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"

+ 3
- 3
Cargo.toml View File

@@ -8,8 +8,8 @@ toml = "0.4.6"
serde_derive = "1.0.69"
serde = "1.0.69"
futures = "0.1.21"
mstar_core = { path = "../mstar/core" }
mstar_noob = { path = "../mstar/noob" }
mstar_rix = { path = "../mstar/rix" }
mstar_core = { git = "https://git.vpzom.click/vpzom/mstar", rev = "32f949b8" }
mstar_rix = { git = "https://git.vpzom.click/vpzom/mstar", rev = "32f949b8" }
mstar_noob = { git = "https://git.vpzom.click/vpzom/mstar", rev = "32f949b8" }
tokio = "0.1.7"
futures-stream-select-all-send = "0.1.2"

+ 3
- 2
src/main.rs View File

@@ -97,7 +97,6 @@ fn main() {
println!("{:?}", evt);
if let Event::IncomingMessage(msg) = evt {
let room_id = msg.get_room();
let msg_content = msg.get_content();
for bridge in &config.bridges {
let mut found = false;
for member in &bridge.members {
@@ -113,8 +112,10 @@ fn main() {
let service = &member.service;
let sender = senders.get(service);
if let Some(sender) = sender {
let author_name = msg.get_author_name_unique();
let msg_content = msg.get_content();
tokio::spawn(sender.send_message(mstar_core::OutgoingMessage {
content: format!("[bridge]: {}", msg_content)
content: format!("{} : {}", author_name, msg_content)
}, &member.room)
.map_err(|e| {
eprintln!("{:?}", e);

Loading…
Cancel
Save