diff options
author | Teddy Wing | 2017-08-17 00:35:24 +0200 |
---|---|---|
committer | Teddy Wing | 2017-08-17 00:35:24 +0200 |
commit | f4028e21f8a138961927b8e794b349f209b00dc7 (patch) | |
tree | f1099c1cd6ebd511a0a6d52c99c0545238be1a21 /src/Plugin.hs | |
parent | e9278eb0a1c0126e6903f333ed4efa5dd00ff5cc (diff) | |
download | sorbot-f4028e21f8a138961927b8e794b349f209b00dc7.tar.bz2 |
Change `Plugin` and `Message` from `String` to `Data.Text`
Use the `Data.Text` type instead of `String` in most of the places we
use it in `Plugin` and `Message`.
This allows us to more easily pass data between the IRC package. No more
kludgy `pack`s and `unpack`s in our IRC message handler.
The one thing we couldn't convert was our regex. From what I understand
(https://stackoverflow.com/questions/14922579/haskell-regular-expressions-and-data-text#14922626),
the regex library I'm using doesn't support `Data.Text`, so use
`String`s for that instead.
Diffstat (limited to 'src/Plugin.hs')
-rw-r--r-- | src/Plugin.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Plugin.hs b/src/Plugin.hs index 73df169..26432d9 100644 --- a/src/Plugin.hs +++ b/src/Plugin.hs @@ -4,6 +4,8 @@ module Plugin , plugins ) where +import qualified Data.Text as T + import Text.Regex.TDFA import qualified Message as M @@ -20,7 +22,7 @@ matchPlugin message = firstPlugin $ matchPlugins message plugins -- | Filter the list of plugins to those that match the given message. matchPlugins :: M.Message -> [Plugin] -> [Plugin] matchPlugins message plugins = - [p | p <- plugins, M.text message =~ matchRegex p] + [p | p <- plugins, (T.unpack $ M.text message) =~ matchRegex p] -- | Run the action belonging to the plugin, stored in its `perform` field. performPlugin :: Plugin -> PluginAction |