commit bbe67cc867e261487b94d043351d4d89793a0be9
parent 402778e6c7421fc7f68bc91f2e10b995849f7485
Author: Marcel <mtrnord1@gmail.com>
Date: Tue, 7 Feb 2017 07:52:22 +0100
fix deps
Diffstat:
2 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,6 +39,10 @@ travis-ci = { repository = "https://github.com/Nordgdanken/TG_sync-rs", branch =
[dependencies]
telebot = "0.1.1"
-slack = "0.16.0"
+slack = "*"
futures = "0.1.7"
tokio-core = "0.1.2"
+
+[replace]
+"openssl-sys:0.9.6" = { git = 'https://github.com/sfackler/rust-openssl' }
+"openssl-sys:0.6.7" = { git = 'https://github.com/sfackler/rust-openssl' }
diff --git a/src/main.rs b/src/main.rs
@@ -1,5 +1,5 @@
-extern crate telebot;
-extern crate slack;
+extern crate telebot;
+extern crate slack;
extern crate tokio_core;
extern crate futures;
@@ -8,10 +8,10 @@ use tokio_core::reactor::Core;
use futures::stream::Stream;
// import all available functions
-use telebot::functions::*;
-
-struct MyHandler;
-
+use telebot::functions::*;
+
+struct MyHandler;
+
#[allow(unused_variables)]
impl slack::EventHandler for MyHandler {
fn on_event(&mut self, cli: &mut slack::RtmClient, event: Result<slack::Event, slack::Error>, raw_json: &str) {
@@ -34,16 +34,16 @@ impl slack::EventHandler for MyHandler {
// post a message as a user to the web api
let _ = cli.post_message("#testing_syncotronic", "hello world! (postMessage)", None);
// set a channel topic via the web api
- // let _ = cli.set_topic("#general", "bots rule!");
- }
-}
-
-fn main() {
- slack();
- tg();
+ // let _ = cli.set_topic("#general", "bots rule!");
+ }
+}
+
+fn main() {
+ slack();
+ tg();
}
-
-fn slack() {
+
+fn slack() {
let args: Vec<String> = std::env::args().collect();
let api_key = match args.len() {
0 | 1 => panic!("No api-key in args! Usage: cargo run --example slack_example -- <api-key>"),
@@ -60,7 +60,7 @@ fn slack() {
}
println!("{}", cli.get_name().unwrap());
println!("{}", cli.get_team().unwrap().name);
-}
+}
fn tg() {
let mut lp = Core::new().unwrap();
@@ -80,4 +80,4 @@ fn tg() {
bot.register(handle);
bot.run(&mut lp).unwrap();
-}
+}