From 6354dbd89d354e5e2499b4c2bea5d5fa95e020df Mon Sep 17 00:00:00 2001
From: Adelyn Breedlove <tenseiken595@gmail.com>
Date: Wed, 16 Jan 2019 23:36:59 -0700
Subject: eliminate all functors in favour of a simpler approach

---
 lib/client.ml | 41 +++++++++++++++++------------------------
 1 file changed, 17 insertions(+), 24 deletions(-)

(limited to 'lib/client.ml')

diff --git a/lib/client.ml b/lib/client.ml
index 6ee4a3a..a60bf03 100644
--- a/lib/client.ml
+++ b/lib/client.ml
@@ -1,30 +1,23 @@
-module Make(T : S.Token)(H : S.Handler_f) = struct
-    open Async
+open Async
 
-    module Http = Http.Make(T)
-    module Models = Models.Make(Http)
-    module Handler = H.Make(Models)
-    module Dispatch = Dispatch.Make(Handler)
-    module Sharder = Sharder.Make(Http)(Dispatch)
+type t = {
+    sharder: Sharder.t;
+    token: string;
+}
 
-    type t = {
-        sharder: Sharder.t;
-        token: string;
-    }
+let create token =
+    Config.token := token
 
-    let token = T.token
+let start ?count () =
+    Sharder.start ?count ()
+    >>| fun sharder ->
+    { sharder; token = !Config.token; }
 
-    let start ?count () =
-        Sharder.start ?count ()
-        >>| fun sharder ->
-        { sharder; token; }
+let set_status ~status client =
+    Sharder.set_status ~status client.sharder
 
-    let set_status ~status client =
-        Sharder.set_status ~status client.sharder
+let set_status_with ~f client =
+    Sharder.set_status_with ~f client.sharder
 
-    let set_status_with ~f client =
-        Sharder.set_status_with ~f client.sharder
-
-    let request_guild_members ~guild ?query ?limit client =
-        Sharder.request_guild_members ~guild ?query ?limit client.sharder
-end
\ No newline at end of file
+let request_guild_members ~guild ?query ?limit client =
+    Sharder.request_guild_members ~guild ?query ?limit client.sharder
\ No newline at end of file
-- 
cgit v1.2.3


From 2d023e5cf9d880349686c137e530581765e65891 Mon Sep 17 00:00:00 2001
From: Adelyn Breedlove <tenseiken595@gmail.com>
Date: Thu, 17 Jan 2019 00:01:54 -0700
Subject: more mlis

---
 lib/client.ml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib/client.ml')

diff --git a/lib/client.ml b/lib/client.ml
index a60bf03..7504604 100644
--- a/lib/client.ml
+++ b/lib/client.ml
@@ -5,10 +5,8 @@ type t = {
     token: string;
 }
 
-let create token =
-    Config.token := token
-
-let start ?count () =
+let start ?count token =
+    Config.token := token;
     Sharder.start ?count ()
     >>| fun sharder ->
     { sharder; token = !Config.token; }
-- 
cgit v1.2.3


From c22cea2e99dff9ff45057ef33553dac8adebf0c1 Mon Sep 17 00:00:00 2001
From: Adelyn Breelove <tenseiken595@gmail.com>
Date: Thu, 17 Jan 2019 09:03:52 -0700
Subject: new event dispatching

---
 lib/client.ml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/client.ml')

diff --git a/lib/client.ml b/lib/client.ml
index 7504604..49d01dc 100644
--- a/lib/client.ml
+++ b/lib/client.ml
@@ -1,4 +1,5 @@
 open Async
+include Config
 
 type t = {
     sharder: Sharder.t;
-- 
cgit v1.2.3