intercal/omnibot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WIP: Move Config.all_channels/0 and Config.channel_modules/1 logic into State; add State.add_loaded_module/2

Browse Source 
The problem:

When we're going through the list of modules to send messages to based
on the channels they're a part of, it was being done so through the
config. Since the config doesn't (and shouldn't) list all of the core
modules that get included, any core modules that were loaded and running
under the ModuleSupervisor would not get included in the router's
attempt to send messages to a module.

Now, the Config.all_channels and Config.channel_modules functions live
in State, and State has a new "add_loaded_module" function where loaded
modules are registered. The aforementioned moved functions will use this
as the "source of truth" when deciding where to send messages for
modules to handle.

Signed-off-by: Alek Ratzloff <alekratz@gmail.com>
This commit is contained in:
Alek Ratzloff
2020-06-13 17:13:05 -04:00
parent 590b3ddbec
commit 304a8d4164
12 changed files with 172 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lib/module.ex
View File

@@ -3,19 +3,19 @@ defmodule Omnibot.Module do
defmacro __before_compile__(_env) do
quote generated: true do
@impl true
def on_channel_msg(_channel, _nick, _line), do: nil
def on_channel_msg(_irc, _channel, _nick, _line), do: nil
@impl true
def on_channel_msg(_channel, _nick, _cmd, _params), do: nil
def on_channel_msg(_irc, _channel, _nick, _cmd, _params), do: nil
@impl true
def on_join(_channel, _nick), do: nil
def on_join(_irc, _channel, _nick), do: nil
@impl true
def on_part(_channel, _nick), do: nil
def on_part(_irc, _channel, _nick), do: nil
@impl true
def on_kick(_channel, _nick), do: nil
def on_kick(_irc, _channel, _nick), do: nil
end
end
end
@@ -38,13 +38,13 @@ defmodule Omnibot.Module do
end
@impl Module
def on_msg(msg) do
def on_msg(irc, msg) do
# TODO - instead of using a router for modules, consider using a PubSub with a Registry:
# https://hexdocs.pm/elixir/master/Registry.html#module-using-as-a-pubsub
route_msg(msg)
route_msg(irc, msg)
end
defp route_msg(msg) do
defp route_msg(irc, msg) do
nick = msg.prefix.nick
case String.upcase(msg.command) do
@@ -53,21 +53,21 @@ defmodule Omnibot.Module do
line = Enum.join(params, " ")
case String.split(line, " ") do
[cmd | params] -> on_channel_msg(channel, nick, cmd, params)
_ -> on_channel_msg(channel, nick, line)
[cmd | params] -> on_channel_msg(irc, channel, nick, cmd, params)
_ -> on_channel_msg(irc, channel, nick, line)
end
"JOIN" ->
[channel | _] = msg.params
on_join(channel, nick)
on_join(irc, channel, nick)
"PART" ->
[channel | _] = msg.params
on_part(channel, nick)
on_part(irc, channel, nick)
"KICK" ->
[channel | _] = msg.params
on_kick(channel, nick)
on_kick(irc, channel, nick)
_ ->
nil
@@ -80,22 +80,23 @@ defmodule Omnibot.Module do
end
end
@callback on_msg(msg :: %Omnibot.Irc.Msg{}) :: any
@callback on_channel_msg(channel :: String.t(), nick :: String.t(), line :: String.t()) :: any
@callback on_msg(irc :: pid(), msg :: %Omnibot.Irc.Msg{}) :: any
@callback on_channel_msg(irc :: pid(), channel :: String.t(), nick :: String.t(), line :: String.t()) :: any
@callback on_channel_msg(
irc :: pid(),
channel :: String.t(),
nick :: String.t(),
cmd :: String.t(),
params :: [String.t()]
) :: any
@callback on_join(channel :: String.t(), nick :: String.t()) :: any
@callback on_part(channel :: String.t(), nick :: String.t()) :: any
@callback on_kick(channel :: String.t(), nick :: String.t()) :: any
@callback on_join(irc :: pid(), channel :: String.t(), nick :: String.t()) :: any
@callback on_part(irc :: pid(), channel :: String.t(), nick :: String.t()) :: any
@callback on_kick(irc :: pid(), channel :: String.t(), nick :: String.t()) :: any
defmacro command(cmd, opts) do
quote generated: true do
@impl Omnibot.Module
def on_channel_msg(var!(channel), var!(nick), unquote(cmd), var!(params)) do
def on_channel_msg(var!(irc), var!(channel), var!(nick), unquote(cmd), var!(params)) do
unquote(opts[:do])
end
end
@@ -115,7 +116,7 @@ defmodule Omnibot.Module do
quote generated: true do
@impl Omnibot.Module
def on_channel_msg(var!(channel), var!(nick), unquote(cmd), unquote(params)) do
def on_channel_msg(var!(irc), var!(channel), var!(nick), unquote(cmd), unquote(params)) do
unquote(opts[:do])
end
end