Support for unsubcribing from timebomb emails.

Author: Martin Jambon

slack_ws.ml

@@ -31,8 +31,8 @@ let forward_event slack_teamid event_json =
 let input_handler slack_teamid send event_json =
   forward_event slack_teamid event_json
 
-let connect_team esper_teamid =
-  Slack_ws_conn.get_slack_address esper_teamid >>= function
+let connect_team esper_uid =
+  Slack_ws_conn.get_slack_address esper_uid >>= function
   | None -> return ()
   | Some slack_addr ->
       let slack_teamid = slack_addr.Api_t.slack_teamid in
@@ -51,7 +51,7 @@ let connect_team esper_teamid =
 let connect_all () =
   User_team.iter_active_teams (fun team ->
     Apputil_error.catch_report_ignore "Initiate Slack session" (fun () ->
-      connect_team team.Api_t.teamid
+      connect_team team.Api_t.team_executive
     )
   )
 

slack_ws_conn.ml

@@ -1,3 +1,6 @@
+(*
+   Maintain websocket connections to Slack.
+*)
 
 open Lwt
 open Log
@@ -277,9 +280,8 @@ let check_slack_team_connection slack_teamid =
   | None -> return false
   | Some x -> check_connection x
 
-let get_slack_address esper_teamid =
-  User_team.get esper_teamid >>= fun team ->
-  User_preferences.get team >>= fun p ->
+let get_slack_address esper_uid =
+  User_preferences.get esper_uid >>= fun p ->
   return p.Api_t.pref_slack_address
 
 let interruptible_sleep sleep =

slack_ws_http_serv.ml

@@ -22,7 +22,8 @@ let handle_request path method_ req_body =
       return (`OK, req_body)
   | ["watch"; esper_teamid] ->
       let esper_teamid = blame_client Teamid.of_string esper_teamid in
-      Slack_ws.connect_team esper_teamid >>= fun () ->
+      User_team.get esper_teamid >>= fun team ->
+      Slack_ws.connect_team team.Api_t.team_executive >>= fun () ->
       return (`OK, "OK")
   | _ ->
       return (`Not_found, "Not found")