Handle Nostrum ApiError

Author: L-e-x-o-n

lib/teiserver/bridge/bridge_server.ex

@@ -4,7 +4,6 @@ defmodule Teiserver.Bridge.BridgeServer do
   """
 
   alias Nostrum.Api.Channel
-  alias Nostrum.Api.Message
   alias Nostrum.Api.Thread
   alias Phoenix.PubSub
   alias Teiserver.Account
@@ -57,7 +56,7 @@ defmodule Teiserver.Bridge.BridgeServer do
       nil
     else
       channel_id = user.discord_dm_channel_id || user.discord_dm_channel
-      Message.create(channel_id, message)
+      Communication.new_discord_message(channel_id, message)
     end
   end
 
@@ -228,14 +227,20 @@ defmodule Teiserver.Bridge.BridgeServer do
       channel_id = Config.get_site_config_cache("teiserver.Discord channel #main")
 
       if channel_id do
-        Message.create(channel_id, "Teiserver startup for node #{Teiserver.node_name()}")
+        Communication.new_discord_message(
+          channel_id,
+          "Teiserver startup for node #{Teiserver.node_name()}"
+        )
       end
 
       # Server
       channel_id = Config.get_site_config_cache("teiserver.Discord channel #server-updates")
 
       if channel_id do
-        Message.create(channel_id, "Teiserver startup for node #{Teiserver.node_name()}")
+        Communication.new_discord_message(
+          channel_id,
+          "Teiserver startup for node #{Teiserver.node_name()}"
+        )
       end
     end
 
@@ -247,7 +252,10 @@ defmodule Teiserver.Bridge.BridgeServer do
       channel_id = Config.get_site_config_cache("teiserver.Discord channel #server-updates")
 
       if channel_id do
-        Message.create(channel_id, "Teiserver shutdown for node #{Teiserver.node_name()}")
+        Communication.new_discord_message(
+          channel_id,
+          "Teiserver shutdown for node #{Teiserver.node_name()}"
+        )
       end
     end
 
@@ -401,7 +409,7 @@ defmodule Teiserver.Bridge.BridgeServer do
       message
       |> convert_emoticons()
 
-    Message.create(channel, "**#{author}**: #{new_message}")
+    Communication.new_discord_message(channel, "**#{author}**: #{new_message}")
   end
 
   defp convert_emoticons(message) do

lib/teiserver/bridge/chat_commands.ex

@@ -1,14 +1,10 @@
 defmodule Teiserver.Bridge.ChatCommands do
   @moduledoc false
-  alias Nostrum.Api.Channel
-  alias Nostrum.Api.Message
-  alias Nostrum.Api.Thread
   alias Teiserver.Account
   alias Teiserver.Account.Auth
   alias Teiserver.Bridge.UnitNames
   alias Teiserver.CacheUser
   alias Teiserver.Communication
-  alias Teiserver.Config
   alias Teiserver.Data.Types, as: T
   alias Teiserver.Logging
   require Logger
@@ -41,58 +37,6 @@ defmodule Teiserver.Bridge.ChatCommands do
     reply(channel_id, "Echoing <@!#{discord_id}> (aka #{user.name}), #{remaining}")
   end
 
-  def handle_command({_user, _discord_id, message_id}, "gdt", _remaining, channel_id) do
-    gdt_discussion_channel_id =
-      Config.get_site_config_cache("teiserver.Discord forum #gdt-discussion")
-
-    if gdt_discussion_channel_id do
-      # Post message to channel
-      Message.create(
-        channel_id,
-        "Thank you for your suggestion, the game design team will be discussing it. Once they have finished discussing it they will vote on it and post an update to this thread."
-      )
-
-      # Delete the message that was posted
-      Message.delete(channel_id, message_id)
-
-      # channel_id = 1071140326644920353
-      {:ok, channel} = Channel.get(channel_id)
-
-      # Create new thread in gdt-discussion
-      {:ok, thread} =
-        Thread.create_in_forum(gdt_discussion_channel_id, %{
-          name: "Discussion for #{channel.name}",
-          message: %{
-            content: "Thread to discuss #{channel.name} - <##{channel_id}>"
-          },
-          type: 11
-        })
-
-      {:ok, message} =
-        Message.create(thread.id, %{
-          content: "Thread to discuss #{channel.name} - <##{channel_id}>"
-        })
-
-      # Pin message
-      Channel.pin_message(thread.id, message.id)
-
-      # Add GDTs to thread
-      Account.list_users(
-        search: [
-          gdt_member: "GDT"
-        ],
-        select: [:data]
-      )
-      |> Enum.map(fn %{data: data} -> data["discord_id"] end)
-      |> Enum.reject(&(&1 == nil))
-      |> Enum.each(fn user_discord_id ->
-        Thread.add_member(thread.id, user_discord_id)
-      end)
-    end
-
-    :ignore
-  end
-
   def handle_command({_user, _discord_id, _message_id}, "whatwas", remaining, channel) do
     name =
       remaining
@@ -178,7 +122,7 @@ defmodule Teiserver.Bridge.ChatCommands do
           })
 
           if text_callback.rules["delete_trigger"] == "true" do
-            Message.delete(channel_id, message_id)
+            Communication.delete_discord_message(channel_id, message_id)
           end
 
           Communication.set_last_triggered_time(text_callback, channel_id)
@@ -209,7 +153,7 @@ defmodule Teiserver.Bridge.ChatCommands do
   end
 
   defp reply(channel, msg) do
-    Message.create(channel, msg)
+    Communication.new_discord_message(channel, msg)
     :ignore
   end
 end

lib/teiserver/bridge/discord_bridge_bot.ex

@@ -450,8 +450,19 @@ defmodule Teiserver.Bridge.DiscordBridgeBot do
           if msg.content != new_content,
             do: Communication.edit_discord_message(channel, msg.id, new_content)
 
+        {:error, %{status_code: 404}} ->
+          Logger.warning("Report message #{report.discord_message_id} was not found")
+          :error
+
+        {:error, %Nostrum.Error.ApiError{}} ->
+          Logger.warning(
+            "Report message #{report.discord_message_id} was couldn't be sent due to Nostrum API error"
+          )
+
+          :error
+
         {:error, reason} ->
-          Logger.warning("Report message #{report.discord_message_id} was not found: #{reason}")
+          Logger.warning("Error getting report message #{report.discord_message_id} #{reason}")
           :error
       end
     end

lib/teiserver/communication.ex

@@ -243,22 +243,22 @@ defmodule Teiserver.Communication do
   defdelegate get_discord_message(channel_id, message_id), to: DiscordChannelLib
 
   @spec edit_discord_message(non_neg_integer | String.t(), non_neg_integer, String.t()) ::
-          map | nil | {:error, String.t()}
+          map | nil | {:error, any()}
   defdelegate edit_discord_message(channel_id, message_id, new_message), to: DiscordChannelLib
 
   @spec delete_discord_message(non_neg_integer | String.t(), non_neg_integer) ::
-          map | nil | {:error, String.t()}
+          map | nil | {:error, any()}
   defdelegate delete_discord_message(channel_id, message_id), to: DiscordChannelLib
 
-  @spec send_discord_dm(T.userid(), String.t()) :: map | nil | {:error, String.t()}
+  @spec send_discord_dm(T.userid(), String.t()) :: map | nil | {:error, any()}
   defdelegate send_discord_dm(userid, message), to: DiscordChannelLib
 
   @spec create_discord_reaction(non_neg_integer | String.t(), non_neg_integer, String.t()) ::
-          map | nil | {:error, String.t()}
+          map | nil | {:error, any()}
   defdelegate create_discord_reaction(channel_id, message_id, emoji), to: DiscordChannelLib
 
   @spec delete_discord_reaction(non_neg_integer | String.t(), non_neg_integer, String.t()) ::
-          map | nil | {:error, String.t()}
+          map | nil | {:error, any()}
   defdelegate delete_discord_reaction(channel_id, message_id, emoji), to: DiscordChannelLib
 
   @doc """

lib/teiserver_web/live/microblog/admin/post/post_form_component.ex

@@ -13,6 +13,8 @@ defmodule TeiserverWeb.Microblog.PostFormComponent do
 
   import Teiserver.Helper.ColourHelper, only: [rgba_css: 2]
 
+  require Logger
+
   @default_channel_name "Dev updates"
 
   @impl Phoenix.LiveComponent
@@ -525,6 +527,10 @@ defmodule TeiserverWeb.Microblog.PostFormComponent do
 
       {:error, :discord_disabled} ->
         :ok
+
+      {:error, %Nostrum.Error.ApiError{}} ->
+        Logger.warning("Updating post #{post.discord_post_id} failed due to Nostrum API error")
+        :error
     end
   end