From b9ee77f8153090e9d47e73ab195540d10720c7b6 Mon Sep 17 00:00:00 2001
From: Adelyn Breelove <tenseiken595@gmail.com>
Date: Thu, 10 Jan 2019 13:12:49 -0700
Subject: AAAAAAAAAAAAAAAAAAAAAAAA

---
 lib/models/message.ml | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'lib/models/message.ml')

diff --git a/lib/models/message.ml b/lib/models/message.ml
index ffd7583..bce361c 100644
--- a/lib/models/message.ml
+++ b/lib/models/message.ml
@@ -1,46 +1,42 @@
 module Make(Http : S.Http) = struct
     open Async
-    open Message_t
+    include Message_t
 
-    type t = Message_t.t
-
-    let add_reaction msg (emoji:Emoji_t.t) =
+    let add_reaction msg (emoji:Emoji.t) =
         let e = match emoji.id with
         | Some i -> Printf.sprintf "%s:%d" emoji.name i
         | None -> emoji.name
         in
         Http.create_reaction msg.channel_id msg.id e
 
-    let remove_reaction msg (emoji:Emoji_t.t) (user:User_t.t) =
+    let remove_reaction msg (emoji:Emoji.t) (user:User_t.t) =
         let e = match emoji.id with
         | Some i -> Printf.sprintf "%s:%d" emoji.name i
         | None -> emoji.name
         in
         Http.delete_reaction msg.channel_id msg.id e user.id
-    
+
     let clear_reactions msg =
         Http.delete_reactions msg.channel_id msg.id
-    
+
     let delete msg =
         Http.delete_message msg.channel_id msg.id
-    
+
     let pin msg =
         Http.pin_message msg.channel_id msg.id
-    
+
     let unpin msg =
         Http.unpin_message msg.channel_id msg.id
-    
+
     let reply msg cont =
         let rep = `Assoc [("content", `String cont)] in
         Http.create_message msg.channel_id rep
 
     let set_content msg cont =
-        Message_j.string_of_t { msg with content = cont; }
-        |> Yojson.Safe.from_string
+        to_yojson { msg with content = cont; }
         |> Http.edit_message msg.channel_id msg.id
 
     let set_embed msg embed =
-        Message_j.string_of_t { msg with embeds = [embed]; }
-        |> Yojson.Safe.from_string
+        to_yojson { msg with embeds = [embed]; }
         |> Http.edit_message msg.channel_id msg.id
 end
\ No newline at end of file
-- 
cgit v1.2.3