Dice extensions - many

docs/Roll.md

@@ -2,15 +2,14 @@
 
 The roll command has a staggering amount of flexibility, as well as additional features.
 
-Below are listed the current full capabilities of the bot for rolling dice and evaluation expressions. All operations (currently) result in integers.
+Below are listed the current full capabilities of the bot for rolling dice and evaluation expressions. All operations (currently) result in integers or a list. A list of functions is available in the [functions section](#Functions).
 
 ## Basic Operators
 
 - Addition
 - Subtraction
 - Multiplication
 - Division
-- Single input function application (currently for `id`,`abs`, `neg`, and `fact` (factorial) up to some number determined by the bot owner, 50 by default)
 - Negation using `-`
 - Exponentiation
 - Parentheses
@@ -56,3 +55,31 @@ There is additional notation for evaluating dice in different ways, detailed bel
 - `10d{1d4,1d4+5}!rr<(2d4)` - when evaluation begins, the values for the custom die are calculated. Every time a die value is potentially rerolled, the value that it is being checked against is evaluated.
 
 With the introduction of this notation, it is worth noting that the normal (without exclamation mark) operation of dice means that the values are evaluated once, at the beginning, and then those values are used for the rest of the operation of the program. Additionally, lazily evaluating will often lead to excessive amounts of RNG calls, which can easily exceed the maximum.
+
+## Lists
+
+As well as simple expressions, basic list expressions can be formed. You can form a basic list using `{e,f,g}`, where `e`, `f`, and `g` are expressions as seen before. Additionally, by using `N#YdX` syntax, you can roll `N` amount of dice following `YdX`.
+
+As an addendum to custom dice, if a list value is bracketed then it can be used in custom dice. For example, `5d(4#4d6)` rolls five dice, whose sides are determined by rolling 4d6 4 times. Do note that laziness still applies here, meaning that the RNG cap can be very quickly reached.
+
+## Functions
+
+Here are all the functions, what they take, and what they return.
+
+### Returns an Integer
+- abs (integer) - the absolute value of an integer
+- fact (integer < 50) - the factorial of an integer
+- id (integer) - the integer
+- maximum (list) - get the maximum item in a list
+- minimum (list) - get the minimum item in a list
+- mod (two integers, second /= 0) - get the modulo of two integers
+- neg (integer) - the negation of an integer
+- sum (list) - the summation of all values in a list
+- length (list) - the length of the list
+- index (integer (within list bounds), list) - get the item at a given index in the list, 0 indexed
+
+### Returns a List
+- drop (integer, list) - drop the first `n` values from a list, where `n` is the integer given
+- reverse (list) - reverse the list
+- sort (list) - sort the list in ascending order
+- take (integer, list) - take the first `n` values from a list, where `n` is the integer given

package.yaml

@@ -84,6 +84,8 @@ library:
   - ConstraintKinds
   - ImportQualifiedPost
   - RecordWildCards
+  - TypeOperators
+  - RankNTypes
   ghc-options:
   - -Wall
 

src/Tablebot/Internal/Handler/Command.hs

@@ -29,6 +29,7 @@ import Tablebot.Utility.Exception (BotException (ParserException), embedError)
 import Tablebot.Utility.Parser (skipSpace1, space, word)
 import Tablebot.Utility.Types (Parser)
 import Text.Megaparsec
+import qualified UnliftIO.Exception as UIOE (tryAny)
 
 -- | @parseNewMessage@ parses a new message, first by attempting to match the
 -- bot's prefix to the start of the message, then (if that fails) by attempting
@@ -119,12 +120,10 @@ makeReadable (TrivialError i _ good) =
 makeReadable e = (mapParseError (const UnknownError) e, Nothing)
 
 -- | Given a list of 'InlineCommand' @cs@ and a message @m@, run each inline
--- command's parser on the message text until one succeeds. Errors are not sent
--- to the user, and do not halt command attempts (achieved using 'try').
+-- command's parser on the message text. Errors are not sent to the user, and do
+-- not halt command attempts (achieved using 'tryAny').
 parseInlineCommands :: [CompiledInlineCommand] -> Message -> CompiledDatabaseDiscord ()
-parseInlineCommands cs m = case parse (parser cs) "" (messageText m) of
-  Right p -> p m
-  Left _ -> pure ()
+parseInlineCommands cs m = mapM_ (fromResult . (\cic -> parse (inlineCommandParser cic) "" (messageText m))) cs
   where
-    parser :: [CompiledInlineCommand] -> Parser (Message -> CompiledDatabaseDiscord ())
-    parser cs' = choice $ map (try . inlineCommandParser) cs'
+    fromResult (Right p) = UIOE.tryAny (p m)
+    fromResult _ = return $ return ()

src/Tablebot/Plugins/Netrunner/Plugin.hs

@@ -95,8 +95,7 @@ nrFindInline = InlineCommand nrInlineComm
     nrInlineComm :: Parser (Message -> EnvDatabaseDiscord NrApi ())
     nrInlineComm = do
       queries <- netrunnerQuery
-      let limitedQs = if length queries > 5 then take 5 queries else queries
-      return $ \m -> mapM_ (\q -> sendEmbed q m) limitedQs
+      return $ \m -> mapM_ (`sendEmbed` m) (take 5 queries)
     sendEmbed :: NrQuery -> Message -> EnvDatabaseDiscord NrApi ()
     sendEmbed query m = do
       api <- ask
@@ -123,7 +122,7 @@ nrSearch = Command "search" searchPars []
             embedCards
               ("Query: `" <> pairsToNrdb pairs <> "`\n")
               res
-              ("_[..." <> (pack $ show $ length res - 10) <> " more](" <> pairsToQuery pairs <> ")_")
+              ("_[..." <> pack (show $ length res - 10) <> " more](" <> pairsToQuery pairs <> ")_")
               m
 
 -- | @nrCustom@ is a command that lets users generate a card embed out of custom