Merge pull request #224 from entertainyou/master

Fix crash of put_in/update_in
BlakeWilliams · May 27, 2020 · a288ef6 · a288ef6
2 parents a43c7b7 + 0d67523
commit a288ef6
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ def application do
 end
 
 def deps do
-  [{:slack, "~> 0.23.3"}]
+  [{:slack, "~> 0.23.4"}]
 end
 ```
 

diff --git a/lib/slack/state.ex b/lib/slack/state.ex
@@ -27,6 +27,14 @@ defmodule Slack.State do
     ims: %{}
   ]
 
+  defp safe_map_getter(key) do
+    Access.key(key, %{})
+  end
+
+  defp safe_list_getter(key) do
+    Access.key(key, [])
+  end
+
   @doc """
   Pattern matches against messages and returns updated Slack state.
   """
@@ -45,35 +53,6 @@ defmodule Slack.State do
     put_in(slack, [:groups, channel.id], channel)
   end
 
-  def update(%{type: "message", subtype: "channel_join", channel: channel, user: user}, slack) do
-    put_in(slack, [:channels, channel, :members], [user | slack[:channels][channel][:members]])
-  end
-
-  def update(%{type: "message", subtype: "group_join", channel: channel, user: user}, slack) do
-    update_in(slack, [:groups, channel, :members], &Enum.uniq([user | &1]))
-  end
-
-  def update(
-        %{type: "message", subtype: "channel_topic", channel: channel, user: user, topic: topic},
-        slack
-      ) do
-    put_in(slack, [:channels, channel, :topic], %{
-      creator: user,
-      last_set: System.system_time(:second),
-      value: topic
-    })
-  end
-
-  def update(
-        %{type: "message", subtype: "group_topic", channel: channel, user: user, topic: topic},
-        slack
-      ) do
-    put_in(slack, [:groups, channel, :topic], %{
-      creator: user,
-      last_set: System.system_time(:second),
-      value: topic
-    })
-  end
 
   def update(%{type: "channel_left", channel: channel_id}, slack) do
     put_in(slack, [:channels, channel_id, :is_member], false)
@@ -87,22 +66,40 @@ defmodule Slack.State do
     plural_atom = String.to_atom(type <> "s")
 
     def update(%{type: unquote(type <> "_rename"), channel: channel}, slack) do
-      put_in(slack, [unquote(plural_atom), channel.id, :name], channel.name)
+      put_in(slack, [unquote(plural_atom), safe_map_getter(channel.id), :name], channel.name)
     end
 
     def update(%{type: unquote(type <> "_archive"), channel: channel}, slack) do
-      put_in(slack, [unquote(plural_atom), channel, :is_archived], true)
+      put_in(slack, [unquote(plural_atom), safe_map_getter(channel), :is_archived], true)
     end
 
     def update(%{type: unquote(type <> "_unarchive"), channel: channel}, slack) do
-      put_in(slack, [unquote(plural_atom), channel, :is_archived], false)
+      put_in(slack, [unquote(plural_atom), safe_map_getter(channel), :is_archived], false)
+    end
+
+    def update(
+          %{type: "message", subtype: unquote(type <> "_topic"), channel: channel, user: user, topic: topic},
+          slack
+        ) do
+      put_in(slack, [unquote(plural_atom), safe_map_getter(channel), :topic], %{
+        creator: user,
+        last_set: System.system_time(:second),
+        value: topic
+      })
+    end
+
+    def update(
+          %{type: "message", subtype: unquote(type <> "_join"), channel: channel, user: user},
+          slack
+        ) do
+      update_in(slack, [unquote(plural_atom), safe_map_getter(channel), safe_list_getter(:members)], &Enum.uniq([user | &1]))
     end
 
     def update(
           %{type: "message", subtype: unquote(type <> "_leave"), channel: channel, user: user},
           slack
         ) do
-      update_in(slack, [unquote(plural_atom), channel, :members], &(&1 -- [user]))
+      update_in(slack, [unquote(plural_atom), safe_map_getter(channel), safe_list_getter(:members)], &(&1 -- [user]))
     end
   end)
 

diff --git a/mix.exs b/mix.exs
@@ -4,7 +4,7 @@ defmodule Slack.Mixfile do
   def project do
     [
       app: :slack,
-      version: "0.23.3",
+      version: "0.23.4",
       elixir: "~> 1.7",
       elixirc_paths: elixirc_paths(Mix.env()),
       name: "Slack",