Merge branch 'main' of https://github.com/WarwickTabletop/tablebot in…

…to dice-stats

package.yaml

@@ -1,5 +1,5 @@
 name:                tablebot
-version:             0.1.0.0
+version:             0.3.1
 github:              "WarwickTabletop/tablebot"
 license:             MIT
 author:              "Warwick Tabletop"

src/Tablebot/Plugins/Netrunner/Command/Search.hs

@@ -113,6 +113,7 @@ fixSearch api = mapMaybe fix
     format ("c", sep, v) = Just $ QInt "c" sep cycleIndex $ map fixCycle v
     format ("t", sep, v) = Just $ QText "t" sep typeCode $ map fixType v
     format ("f", sep, v) = Just $ QText "f" sep keywords $ map fixFaction v
+    format ("s", sep, v) = Just $ QText "s" sep keywords v
     format ("d", sep, v) = Just $ QText "d" sep sideCode $ map fixSide v
     format ("i", sep, v) = Just $ QText "i" sep illustrator v
     format ("o", sep, v) = Just $ QInt "o" sep cost v

src/Tablebot/Utility/Discord.hs

@@ -238,8 +238,11 @@ findEmoji ename = fmap msum (liftDiscord readCache >>= cacheToEmoji)
 
 -- | Render an Emoji
 formatEmoji :: Emoji -> Text
-formatEmoji (Emoji (Just eId) eName _ _ _) = "<:" <> eName <> ":" <> pack (show eId) <> ">"
-formatEmoji (Emoji _ eName _ _ _) = eName
+formatEmoji (Emoji (Just eId) eName _ _ _ anim) = prefix anim <> eName <> ":" <> pack (show eId) <> ">"
+  where
+    prefix (Just True) = "<a:"
+    prefix _ = "<:"
+formatEmoji (Emoji _ eName _ _ _ _) = eName
 
 -- | Display an emoji as best as it can from its name
 formatFromEmojiName :: Text -> EnvDatabaseDiscord s Text

stack.yaml

@@ -42,7 +42,7 @@ packages:
 # allow-newer: true
 
 extra-deps:
-- discord-haskell-1.9.2
+- discord-haskell-1.10.0
 - emoji-0.1.0.2
 - load-env-0.2.1.0
 - megaparsec-9.0.1