From ee5bcaa0fa6deb268e5f304600d38d9a67f93f52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gustav@sornas.net>
Date: Wed, 11 Nov 2020 11:01:43 +0100
Subject: small refactoring

---
 src/main.rs | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 962564a..bcc2bab 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,28 +8,30 @@ use tokio::task::spawn_blocking;
 
 #[tokio::main]
 async fn main() {
+    let slack_token: Option<String> = None;
+    let discord_token: Option<String> = None;
+
     println!("Hello, world!");
 
     join!(
         spawn_blocking(move || {
-            discord_loop();
+            discord_loop(discord_token);
         }),
-        slack_loop(),
+        slack_loop(slack_token),
     );
 }
 
-async fn slack_loop() {
+async fn slack_loop(token: Option<String>) {
     println!("Setting up Slack");
 
-    let slack_token = std::env::var("SLACK_API_TOKEN")
-        .unwrap_or(""
-                   .to_string());
-    let slack_client = slack::default_client().unwrap();
+    let token = std::env::var("SLACK_API_TOKEN")
+        .unwrap_or(token.unwrap());
+    let client = slack::default_client().unwrap();
 
-    let slack_request = slack::rtm::StartRequest::default();
-    let response = slack::rtm::start(&slack_client,
-                                     &slack_token,
-                                     &slack_request).await;
+    let request = slack::rtm::StartRequest::default();
+    let response = slack::rtm::start(&client,
+                                     &token,
+                                     &request).await;
 
     if let Ok(response) = response {
         if let Some(channels) = response.channels {
@@ -52,16 +54,15 @@ async fn slack_loop() {
     }
 }
 
-fn discord_loop() {
+fn discord_loop(token: Option<String>) {
     println!("Setting up Discord");
 
-    let discord_token = std::env::var("DISCORD_API_TOKEN")
-        .unwrap_or(""
-                   .to_string());
-    let discord = Discord::from_bot_token(&discord_token);
+    let token = std::env::var("DISCORD_API_TOKEN")
+        .unwrap_or(token.unwrap());
+    let client = Discord::from_bot_token(&token);
 
-    if let Ok(discord) = discord {
-        let (mut connection, _) = discord.connect() .expect("discord connect failed");
+    if let Ok(client) = client {
+        let (mut connection, _) = client.connect().expect("discord connect failed");
         println!("Discord ready");
         loop {
             match connection.recv_event() {
-- 
cgit v1.2.1