Merge pull request #733 from Exairnous/update-discord-api-to-v10

Update Discord API to v10

Author: Exairnous

lib/ret/discord_client.ex

@@ -3,7 +3,7 @@ defmodule Ret.DiscordClient do
   import Bitwise
 
   @oauth_scope "identify email"
-  @discord_api_base "https://discordapp.com/api/v6"
+  @discord_api_base "https://discord.com/api/v10"
 
   def get_oauth_url(hub_sid) do
     authorize_params = %{
@@ -91,7 +91,7 @@ defmodule Ret.DiscordClient do
       }) do
     case Cachex.fetch(:discord_api, "/users/#{provider_account_id}") do
       {status, result} when status in [:commit, :ok] ->
-        "#{result["username"]}##{result["discriminator"]}"
+        "#{result["username"]}"
     end
   end
 
@@ -161,13 +161,18 @@ defmodule Ret.DiscordClient do
         case Cachex.fetch(:discord_api, "/guilds/#{community_id}/roles") do
           {status, result} when status in [:commit, :ok] -> result |> Map.new(&{&1["id"], &1})
         end
+        # Note: Whether the bitfield values in guild_roles are represented as strings or integers is inconsistent (possibly based on what permissions the user has), so every time they're used they need to be checked and, if needed, converted to integers.
 
       role_everyone = guild_roles[community_id]
       permissions = role_everyone["permissions"]
 
       user_permissions = user_roles |> Enum.map(&guild_roles[&1]["permissions"])
 
-      permissions = user_permissions |> Enum.reduce(permissions, &(&1 ||| &2))
+      permissions = user_permissions |>
+      Enum.reduce(permissions, &(
+      if is_binary(&1), do: String.to_integer(&1), else: &1 |||
+      if is_binary(&2), do: String.to_integer(&2), else: &2
+      ))
 
       if (permissions &&& @administrator) == @administrator do
         @all
@@ -190,12 +195,15 @@ defmodule Ret.DiscordClient do
             |> Map.get("permission_overwrites")
             |> Map.new(&{&1["id"], &1})
         end
+        # Note: Whether the bitfield values in channel_overwrites are represented as strings or integers is inconsistent (possibly based on what permissions the user has), so every time they're used they need to be checked and, if needed, converted to integers.
 
       overwrite_everyone = channel_overwrites[community_id]
 
       permissions =
         if overwrite_everyone do
-          (permissions &&& ~~~overwrite_everyone["deny"]) ||| overwrite_everyone["allow"]
+          (permissions &&&
+          ~~~if is_binary(overwrite_everyone["deny"]), do: String.to_integer(overwrite_everyone["deny"]), else: overwrite_everyone["deny"]) |||
+          if is_binary(overwrite_everyone["allow"]), do: String.to_integer(overwrite_everyone["allow"]), else: overwrite_everyone["allow"]
         else
           permissions
         end
@@ -204,8 +212,14 @@ defmodule Ret.DiscordClient do
       user_permissions =
         user_roles |> Enum.map(&channel_overwrites[&1]) |> Enum.filter(&(&1 != nil))
 
-      allow = user_permissions |> Enum.reduce(@none, &(&1["allow"] ||| &2))
-      deny = user_permissions |> Enum.reduce(@none, &(&1["deny"] ||| &2))
+      allow = user_permissions |> Enum.reduce(@none, &(
+      if is_binary(&1["allow"]), do: String.to_integer(&1["allow"]), else: &1["allow"] |||
+      &2
+      ))
+      deny = user_permissions |> Enum.reduce(@none, &(
+      if is_binary(&1["deny"]), do: String.to_integer(&1["deny"]), else: &1["deny"] |||
+      &2
+      ))
 
       permissions = (permissions &&& ~~~deny) ||| allow
 
@@ -214,7 +228,9 @@ defmodule Ret.DiscordClient do
 
       permissions =
         if overwrite_member do
-          (permissions &&& ~~~overwrite_member["deny"]) ||| overwrite_member["allow"]
+          (permissions &&&
+          ~~~if is_binary(overwrite_member["deny"]), do: String.to_integer(overwrite_member["deny"]), else: overwrite_member["deny"]) |||
+          if is_binary(overwrite_member["allow"]), do: String.to_integer(overwrite_member["allow"]), else: overwrite_member["allow"]
         else
           permissions
         end