Commit Graph

342 Commits

Author SHA1 Message Date
projectmoon d67328ac6b Cthulhu dice only take one amount now 2021-05-13 20:24:17 +00:00
projectmoon ec66bfa3d6 Add parse_single_amount 2021-05-13 20:06:37 +00:00
projectmoon 8939d6debd Update dependencies. 2021-05-13 19:48:29 +00:00
projectmoon 0f35c1932b Merge pull request 'Update to Rust 1.51' (#57) from rust-1.51 into master
Reviewed-on: projectmoon/matrix-dicebot#57
2021-04-24 19:42:31 +00:00
projectmoon 7a506bdc4f Update drone to 1.51 2021-04-20 21:39:08 +00:00
projectmoon b62359c172 Update to rust 1.51 with rustup, for zeroconf 0.4 which requires const generics. 2021-04-20 21:35:12 +00:00
projectmoon 8d1a1a5ca6 Update dependencies. 2021-04-20 21:19:47 +00:00
projectmoon 119321e01a Update dependencies. 2021-04-02 16:07:15 +00:00
projectmoon ba6a4c9679 Update matrix SDK to latest with Room enum 2.0 2021-03-22 15:01:49 +00:00
projectmoon e5431a587d Support complex expressions on CoC advancement rolls. (#55)
Also remove todo, update some CoC command descriptions.

Fixes #54.
Co-Authored-By: projectmoon <projectmoon@noreply.git.agnos.is>
Co-Committed-By: projectmoon <projectmoon@noreply.git.agnos.is>
2021-03-18 20:54:49 +00:00
projectmoon 0821cf2bf5 Change to OpenSSL from LibreSSL. 2021-03-18 19:40:11 +00:00
projectmoon 85557c0382 Split handling of comand results from execution. 2021-03-15 20:27:57 +00:00
projectmoon d30d39ff1e Only consume max allowed commands + 1 when dealing with multiple commands 2021-03-15 20:13:27 +00:00
projectmoon 8e4eb574d2 Update to latest matrix SDK and other dependencies. 2021-03-15 20:10:42 +00:00
projectmoon 67291e6deb Switch to Duration::from_secs, because we don't need nanos. 2021-02-10 20:30:17 +00:00
projectmoon 7e23f80e42 Get user list: replace format! with direct string conversion. 2021-02-10 20:25:42 +00:00
projectmoon d813198cb0 Reply with executed command as quote (single commands only). 2021-02-09 22:22:09 +00:00
projectmoon 693167a581 Log when we are performing initial sync. 2021-02-09 21:59:32 +00:00
projectmoon 9ab65b8943 Update env_logger, rand, phf, itertools to newer semvers. 2021-02-09 21:56:13 +00:00
projectmoon 8817cae9da Update dependencies. Should partially address rate limiting. 2021-02-09 21:27:14 +00:00
projectmoon ef4f1ef02f Small code cleanup in matrix.rs 2021-02-08 20:14:11 +00:00
projectmoon d42e075c5c Update dependencies. 2021-02-07 21:58:22 +00:00
projectmoon b0707dff05 bot: Move multi-failure response join() call into the format!(). 2021-02-07 21:42:32 +00:00
projectmoon 304c91c69d Rename CommandResult to ExecutionResult 2021-02-07 21:39:21 +00:00
projectmoon 94be4d2578 Avoid key clone when deleting variables. Minor db code cleanup. 2021-02-07 21:16:58 +00:00
projectmoon 14f8bc8b39 Reuse device ID generated by matrix SDK after first login.
Adds new db tree for simple global state values (which also lays
foundation for other stuff), and stores device ID in that tree after
first login. The ID is then reused on subsequent runs of the
application.

This is simpler than storing device ID in config file.

Fixes #9.
2021-02-07 14:21:28 +00:00
projectmoon 7db639f16c Update cargo.lock for 0.9.0 2021-02-07 14:21:21 +00:00
projectmoon b3cd7266e4 Version 0.9.0. Bug fix release.
- Properly reject large numbers outside bounds of i32 when rolling dice.
 - Avoid unnecessary clone of error message when calculating dice amounts.
 - Allow up to 50 commands to be executed per message.
 - Show failed commands with errors when executing multiple commands.
 - Properly format dice plurality when rolling CofD dice pools.
 - Use 'username pills' instead of raw user ID in response messages.
 - Update matrix SDK to latest.
 - General code reorganization for better maintainability.
2021-02-04 19:37:22 +00:00
projectmoon 12b7d355d2 Docker image is 'tiny', not 'glibc-tiny'. Update to 0.8.0. 2021-02-04 18:56:15 +00:00
projectmoon 3c177dc304 Always point to glibc-tiny, not glibc. 2021-02-03 23:33:59 +00:00
projectmoon f6099c657e Always point to glibc image for Docker build. 2021-02-03 23:32:45 +00:00
projectmoon 932e06ad91 Fix database error name. Improve dice number conversion error message. 2021-02-03 23:27:47 +00:00
projectmoon b7ccd4e7ad Refactor dice amount parser to reusable parsers.
This follows the example in the Combine documentation to use impl
trait return types so we can isolate the parsers into their own
functions.
2021-02-03 23:27:14 +00:00
projectmoon b32b761f82 Update combine and dependencies. 2021-02-03 23:23:15 +00:00
projectmoon 9a5a18268c Parsing huge numbers are now errors, not variables.
Fixed the dice amount parsing code to propagate a parsing result
through the parser, while properly handling string to i32 conversion.
We now only attempt to convert to i32 if all characters in the
expression are numeric.

This commit also refactors the dice parsing by moving most of the
parsing closures into separate functions, which makes the parsing
function itself more readable. Some variable names were also changed,
for further clarity.

Fixes #21.
2021-02-03 23:23:03 +00:00
projectmoon f5a8e16ce0 Slight refactor of calculate_dice_amount. Lazy error handling.
Use unwrap_or_else instead of unwrap_or to prevent unnecessary error
string creation. Also some changes to make the code a bit more
readable.
2021-02-02 22:02:43 +00:00
projectmoon 7512ca0694 Allow up to 50 commands per message.
If the amount of commands in a single message is greater, the bot will
now return an error. Includes slight refactoring of command execution
code to make use of streams for async iter-like mapping of the command
list.

Fixes #24.
2021-02-02 21:45:59 +00:00
projectmoon 3faca6a2df Update dependencies. 2021-02-02 20:21:31 +00:00
projectmoon 042ecc40e0 Properly format dice plurality in CofD dice pools.
Fixes #30.
2021-01-31 14:57:18 +00:00
projectmoon df54e6555a Use 'username bubbles' in responses instead of straight user ID. 2021-01-31 14:46:53 +00:00
projectmoon b3c4d8a38c Centralize plain text formatting at point of message sending.
Instead of relying on all parts of the application to construct both
HTML and plain-text responses, we now construct only HTML responses,
and convert the HTML to plain text right before sending the message to
Matrix.

This is a first iteration, because the plain text has a few extra
newlines than it should, created by use of nested <p> tags.
2021-01-31 14:12:09 +00:00
projectmoon a4e66a0ca6 Basic output for multiple command failures.
Also replace newlines with <br/>s in HTML output.
2021-01-31 08:15:22 +00:00
projectmoon d0c6ca3de8 Print out how many commands failed in a multi-command scenario.
The number of failing commands are now printed out when at least one
command in a multi-command execution fails. This commit does not
introduce printing out WHICH commands failed, nor their error
messages.

There was also some minor refactoring to move command response
handling into their own functions (one for single response, one for
multiple) so that the code is more readable.
2021-01-30 22:13:06 +00:00
projectmoon 055bad3a46 Move a type on collect() to variable assignment 2021-01-30 22:12:44 +00:00
projectmoon 16eb87e50f Convert command execution to use results. 2021-01-30 14:28:14 +00:00
projectmoon 1b0003ff1b Upgrade to Matrix SDK latest (Store Rewrite) and Tokio 1.0
This upgrade introduces a handful of breaking changes in the Rust
Matrix SDK.
 - Some types have disappeared and changed name.
 - Some functions are no longer async.
 - Room display name now has a Result type instead of just returning
   the value.
 - Client state store has breaking changes (not really a big deal).

This required introduction of a new type to store room information
that we are interested in on the context struct. This new RoomContext
is required mostly due to unit tests, because it is no longer possible
to instantiate the Room type in the Matrix SDK.
2021-01-30 12:54:47 +00:00
projectmoon a4cdad4936 Update dependencies. 2021-01-04 21:12:55 +00:00
projectmoon 297a8454f6 Avoid cloning when counting successes. 2020-12-18 14:16:22 +00:00
projectmoon c9c80b974c Tests for dice pool formatting. 2020-12-17 21:14:43 +00:00
projectmoon eb42704380 Switch to into_iter instead of a non-consuming iterator. 2020-12-17 21:06:43 +00:00