Stated incompatability with new versions of decompress in disml.opam and made some small fixes to add compatability with new OCaml versions

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/models/event_models.ml b/lib/models/event_models.ml
index 603f2c3..40ff299 100644
--- a/lib/models/event_models.ml
+++ b/lib/models/event_models.ml
@@ -319,7 +319,7 @@ module GuildMemberRemove = struct
         if Cache.GuildMap.mem cache.guilds t.guild_id then

             let guilds = match Cache.GuildMap.find cache.guilds t.guild_id with

             | Some g ->

-                let members = List.filter g.members ~f:(fun m -> m.user.id <> t.user.id) in

+                let members = List.filter g.members ~f:(fun m -> User_id.compare m.user.id t.user.id <> 0) in

                 let data = { g with members } in

                 Cache.GuildMap.set cache.guilds ~key:t.guild_id ~data

             | None -> cache.guilds in

@@ -342,7 +342,7 @@ module GuildMemberUpdate = struct
             let guilds = match Cache.GuildMap.find cache.guilds t.guild_id with

             | Some g ->

                 let members = List.map g.members ~f:(fun m ->

-                    if m.user.id = t.user.id then

+                    if User_id.compare m.user.id t.user.id = 0 then

                         { m with nick = t.nick; roles = t.roles }

                     else m) in

                 let data = { g with members } in

@@ -367,7 +367,7 @@ module GuildMembersChunk = struct
             let `Guild_id guild_id = t.guild_id in

             let users = List.map t.members ~f:(fun m -> m.user.id, m.user) in

             let members = List.filter_map t.members ~f:(fun m ->

-                if List.exists g.members ~f:(fun m' -> m'.user.id <> m.user.id) then

+                if List.exists g.members ~f:(fun m' -> User_id.compare m'.user.id m.user.id <> 0) then

                     Some (Member_t.wrap ~guild_id m)

                 else None) in

             let guilds = Cache.GuildMap.set cache.guilds ~key:t.guild_id ~data:{ g with members } in

@@ -415,7 +415,7 @@ module GuildRoleDelete = struct
         if Cache.GuildMap.mem cache.guilds t.guild_id then

             let guilds = match Cache.GuildMap.find cache.guilds t.guild_id with

             | Some g ->

-                let roles = List.filter g.roles ~f:(fun r -> r.id <> t.role_id) in

+                let roles = List.filter g.roles ~f:(fun r -> Role_id.get_id r.id <> Role_id.get_id t.role_id) in

                 let data = { g with roles } in

                 Cache.GuildMap.set cache.guilds ~key:t.guild_id ~data

             | None -> cache.guilds in

@@ -437,7 +437,7 @@ module GuildRoleUpdate = struct
             | Some g ->

                 let `Guild_id guild_id = t.guild_id in

                 let roles = List.map g.roles ~f:(fun r ->

-                    if r.id = t.role.id then Role_t.wrap ~guild_id t.role else r) in

+                    if Role_id.get_id r.id = Role_id.get_id t.role.id then Role_t.wrap ~guild_id t.role else r) in

                 let data = { g with roles } in

                 Cache.GuildMap.set cache.guilds ~key:t.guild_id ~data

             | None -> cache.guilds in