More type abstraction stuff

12 files changed, 60 insertions, 9 deletions

diff --git a/disml.opam b/disml.opam
index 448cbcf..a1564d7 100644
--- a/disml.opam
+++ b/disml.opam
@@ -11,5 +11,5 @@ build: [
   ["dune" "subst"] {pinned}
   ["dune" "build" "-p" name "-j" jobs]
 ]
-install: [dune install disml]
+install: []
 dev-repo: "git+https://gitlab.com/Mishio595/disml"
\ No newline at end of file
diff --git a/dune-project b/dune-project
index 31a7429..67d26c0 100644
--- a/dune-project
+++ b/dune-project
@@ -1 +1,2 @@
 (lang dune 1.3)
+(name disml)
diff --git a/lib/models/activity.ml b/lib/models/activity.ml
index 36b7d4b..6fe69b8 100644
--- a/lib/models/activity.ml
+++ b/lib/models/activity.ml
@@ -1,2 +1,3 @@
 module Make(Http : S.Http) = struct
+    type t = Activity_t.t
 end
\ No newline at end of file
diff --git a/lib/models/attachment.ml b/lib/models/attachment.ml
index 36b7d4b..cd04da8 100644
--- a/lib/models/attachment.ml
+++ b/lib/models/attachment.ml
@@ -1,2 +1,3 @@
 module Make(Http : S.Http) = struct
+    type t = Attachment_t.t
 end
\ No newline at end of file
diff --git a/lib/models/ban.ml b/lib/models/ban.ml
index 36b7d4b..f84fe62 100644
--- a/lib/models/ban.ml
+++ b/lib/models/ban.ml
@@ -1,2 +1,3 @@
 module Make(Http : S.Http) = struct
+    type t = Ban_t.t
 end
\ No newline at end of file
diff --git a/lib/models/channel.ml b/lib/models/channel.ml
index 36b7d4b..328cc94 100644
--- a/lib/models/channel.ml
+++ b/lib/models/channel.ml
@@ -1,2 +1,3 @@
 module Make(Http : S.Http) = struct
+    type t = Channel_t.t
 end
\ No newline at end of file
diff --git a/lib/models/embed.ml b/lib/models/embed.ml
index 36b7d4b..ce25e78 100644
--- a/lib/models/embed.ml
+++ b/lib/models/embed.ml
@@ -1,2 +1,8 @@
 module Make(Http : S.Http) = struct
+    type footer = Embed_t.footer
+    type image = Embed_t.image
+    type video = Embed_t.video
+    type provider = Embed_t.provider
+    type field = Embed_t.field
+    type t = Embed_t.t
 end
\ No newline at end of file
diff --git a/lib/models/emoji.ml b/lib/models/emoji.ml
index 36b7d4b..ece5bcd 100644
--- a/lib/models/emoji.ml
+++ b/lib/models/emoji.ml
@@ -1,2 +1,3 @@
 module Make(Http : S.Http) = struct
+    type t = Emoji_t.t
 end
\ No newline at end of file
diff --git a/lib/models/member.ml b/lib/models/member.ml
index 6617d23..7fa9c03 100644
--- a/lib/models/member.ml
+++ b/lib/models/member.ml
@@ -1,4 +1,5 @@
 module Make(Http : S.Http) = struct
+	type t = Member_t.t
 	(* val add_role : Member_t.t -> Role_t.t -> Yojson.Safe.json Deferred.t
 	val remove_role : Member_t.t -> Role_t.t -> Yojson.Safe.json Deferred.t
 	val ban : ?reason:string -> ?days:int -> Member_t.t -> Yojson.Safe.json Deferred.t
diff --git a/lib/models/presence.ml b/lib/models/presence.ml
index 36b7d4b..2ce9a51 100644
--- a/lib/models/presence.ml
+++ b/lib/models/presence.ml
@@ -1,2 +1,3 @@
 module Make(Http : S.Http) = struct
+    type t = Presence_t.t
 end
\ No newline at end of file
diff --git a/lib/models/reaction.ml b/lib/models/reaction.ml
index 36b7d4b..23de12f 100644
--- a/lib/models/reaction.ml
+++ b/lib/models/reaction.ml
@@ -1,2 +1,8 @@
 module Make(Http : S.Http) = struct
+    (* open Reaction_t *)
+
+    type t = Reaction_t.t
+
+    (* let delete reaction user =
+        Http.delete_reaction *)
 end
\ No newline at end of file
diff --git a/lib/s.ml b/lib/s.ml
index fa7e02d..a1b1699 100644
--- a/lib/s.ml
+++ b/lib/s.ml
@@ -4,19 +4,37 @@ module type Token = sig
     val token : string
 end
 
-module type Activity = sig end
+module type Activity = sig
+    type t = Activity_t.t
+end
 
-module type Attachment = sig end
+module type Attachment = sig
+    type t = Attachment_t.t
+end
 
-module type Ban = sig end
+module type Ban = sig
+    type t = Ban_t.t
+end
 
-module type Channel = sig end
+module type Channel = sig
+    type t = Channel_t.t
+end
 
-module type Embed = sig end
+module type Embed = sig
+    type footer = Embed_t.footer
+    type image = Embed_t.image
+    type video = Embed_t.video
+    type provider = Embed_t.provider
+    type field = Embed_t.field
+    type t = Embed_t.t
+end
 
-module type Emoji = sig end
+module type Emoji = sig
+    type t = Emoji_t.t
+end
 
 module type Guild = sig
+    type t = Guild_t.t
     val ban_user : id:Snowflake_t.t -> ?reason:string -> ?days:int -> Guild_t.t -> string Deferred.Or_error.t
     val create_emoji : name:string -> image:string -> Guild_t.t -> string Deferred.Or_error.t
     val create_role :
@@ -51,6 +69,7 @@ module type Guild = sig
 end
 
 module type Member = sig
+    type t = Member_t.t
     (* val add_role : Member_t.t -> Role_t.t -> string Deferred.Or_error.t
     val remove_role : Member_t.t -> Role_t.t -> string Deferred.Or_error.t
     val ban : ?reason:string -> ?days:int -> Member_t.t -> string Deferred.Or_error.t
@@ -63,6 +82,7 @@ module type Member = sig
 end
 
 module type Message = sig
+    type t = Message_t.t
     val add_reaction : Message_t.t -> Emoji_t.t -> string Deferred.Or_error.t
     val remove_reaction : Message_t.t -> Emoji_t.t -> User_t.t -> string Deferred.Or_error.t
     val clear_reactions : Message_t.t -> string Deferred.Or_error.t
@@ -74,11 +94,20 @@ module type Message = sig
     val set_embed : Message_t.t -> Embed_t.t -> string Deferred.Or_error.t
 end
 
-module type Presence = sig end
+module type Presence = sig
+    type t = Presence_t.t
+end
 
-module type Reaction = sig end
+module type Reaction = sig
+    type t = Reaction_t.t
+    (* val delete : Reaction_t.t -> string Deferred.Or_error.t
+    val get_users : Reaction_t.t -> int -> User_t.t list Deferred.Or_error.t
+    val get_users_after : Reaction_t.t -> Snowflake_t.t -> int -> User_t.t list Deferred.Or_error.t
+    val get_users_before : Reaction_t.t -> Snowflake_t.t -> int -> User_t.t list Deferred.Or_error.t *)
+end
 
 module type Role = sig
+    type t = Role_t.t
     val allow_mention : Role_t.t -> string Deferred.Or_error.t
     val delete : Role_t.t -> string Deferred.Or_error.t
     val disallow_mention : Role_t.t -> string Deferred.Or_error.t
@@ -89,11 +118,13 @@ module type Role = sig
 end
 
 module type Snowflake = sig
+    type t = Snowflake_t.t
     val timestamp : Snowflake_t.t -> int
     val timestamp_iso : Snowflake_t.t -> string
 end
 
 module type User = sig
+    type t = User_t.t
     val tag : User_t.t -> string
     val mention : User_t.t -> string
     val default_avatar : User_t.t -> string