Remove usage of State.all_channels/0

Deprecating Omnibot.State:

Config.all_channels/1 has the same logic as this, and is better
documented anyway.

Signed-off-by: Alek Ratzloff <alekratz@gmail.com>
This commit is contained in:
2020-08-11 13:30:32 -07:00
parent 2dc7bbd94d
commit 2165167954

View File

@@ -1,6 +1,6 @@
defmodule Omnibot.Core do defmodule Omnibot.Core do
use Omnibot.Plugin use Omnibot.Plugin
alias Omnibot.{Irc, State} alias Omnibot.{Config, Irc}
@default_config channels: :all @default_config channels: :all
@@ -10,7 +10,7 @@ defmodule Omnibot.Core do
if nick == cfg.nick do if nick == cfg.nick do
add_channel(channel) add_channel(channel)
# Sync if we join a channel we shouldn't be in # Sync if we join a channel we shouldn't be in
if !Enum.member?(State.all_channels(), channel), if !Enum.member?(Config.all_channels(cfg), channel),
do: sync_channels(irc) do: sync_channels(irc)
end end
end end
@@ -21,7 +21,7 @@ defmodule Omnibot.Core do
if nick == cfg.nick do if nick == cfg.nick do
remove_channel(channel) remove_channel(channel)
# Sync if we join a channel we forcibly part a channel we shouldn't leave # Sync if we join a channel we forcibly part a channel we shouldn't leave
if Enum.member?(State.all_channels(), channel), if Enum.member?(Config.all_channels(cfg), channel),
do: sync_channels(irc) do: sync_channels(irc)
end end
end end
@@ -51,7 +51,8 @@ defmodule Omnibot.Core do
end end
defp sync_channels(irc) do defp sync_channels(irc) do
desired = MapSet.new(State.all_channels()) cfg = Irc.cfg(irc)
desired = MapSet.new(Config.all_channels(cfg))
present = state() present = state()
to_join = MapSet.difference(desired, present) to_join = MapSet.difference(desired, present)