Do not process commands coming from ourselves (help text)

Quite a few changes involved. Mostly variable renames and a few changes to `await`s.

Not ready yet because bot cannot login due to some arcane error of `expected value at line 1 column 1`.

Co-authored-by: projectmoon <projectmoon@noreply.git.agnos.is>
Reviewed-on: #98

.drone.yml

@@ -0,0 +1,27 @@
+kind: pipeline
+name: build-and-test
+
+steps:
+- name: test
+  image: rust:1.80
+  commands:
+  - apt-get update
+  - apt-get install -y cmake
+  - rustup component add rustfmt
+  - cargo build --verbose --all
+  - cargo test --verbose --all
+
+- name: docker
+  image: plugins/docker
+  when:
+    ref:
+    - refs/tags/v*
+    - refs/heads/master
+  settings:
+    auto_tag: true
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+    repo: ghcr.io/projectmoon/chronicle-dicebot
+    registry: ghcr.io

.env

@@ -0,0 +1,2 @@
+DATABASE_URL="sqlite://test-db/dicebot.sqlite"
+SQLX_OFFLINE="true"

.github/workflows/dicebot-ci.yml

@@ -0,0 +1,68 @@
+name: Dicebot CI
+
+on:
+  push:
+    branches:
+      - master
+
+    # Publish `v1.2.3` tags as releases.
+    tags:
+      - v*
+
+  # Run tests for any PRs.
+  pull_request:
+
+env:
+  IMAGE_NAME: chronicle-dicebot
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build_and_test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build
+      run: cargo build --verbose
+    - name: Run tests
+      run: cargo test --verbose
+
+  # # Push image to GitHub Packages.
+  # # See also https://docs.docker.com/docker-hub/builds/
+  # push:
+  #   # Ensure test job passes before pushing image.
+  #   needs: build_and_test
+
+  #   runs-on: ubuntu-latest
+  #   if: github.event_name == 'push'
+
+  #   steps:
+  #     - uses: actions/checkout@v2
+
+  #     - name: Build image
+  #       run: docker build . --file Dockerfile --tag $IMAGE_NAME
+
+  #     - name: Log into GitHub Container Registry
+  #     # TODO: Create a PAT with `read:packages` and `write:packages` scopes and save it as an Actions secret `CR_PAT`
+  #       run: echo "${{ secrets.CR_PAT }}" | docker login https://ghcr.io -u ${{ github.actor }} --password-stdin
+
+  #     - name: Push image to GitHub Container Registry
+  #       run: |
+  #         IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
+
+  #         # Change all uppercase to lowercase
+  #         IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
+
+  #         # Strip git ref prefix from version
+  #         VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+
+  #         # Strip "v" prefix from tag name
+  #         [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
+
+  #         # Use Docker `latest` tag convention
+  #         [ "$VERSION" == "master" ] && VERSION=latest
+
+  #         echo IMAGE_ID=$IMAGE_ID
+  #         echo VERSION=$VERSION
+
+  #         docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
+  #         docker push $IMAGE_ID:$VERSION

.gitignore

@@ -1,6 +1,14 @@
 target/
 dicebot-config
 todo
+todo.org
 cache
 *.tar
 *.tar.gz
+test-db/
+bot-db*
+# We store a disabled async test in this file
+bigboy
+.#*
+*.sqlite
+.tmp*

Cargo.toml

@@ -1,39 +1,6 @@
-[package]
-name = "chronicle-dicebot"
-version = "0.5.0"
-authors = ["Taylor C. Richberger <taywee@gmx.com>", "projectmoon <projectmoon@agnos.is>"]
-edition = "2018"
-license = 'MIT'
-description = 'A simple async Matrix dicebot'
-readme = 'README.md'
-repository = 'https://github.com/ProjectMoon/matrix-dicebot'
-keywords = ["games", "dice", "matrix", "bot"]
-categories = ["games"]
+[workspace]
 
-[dependencies]
-log = "0.4"
-env_logger = "0.7"
-toml = "0.5"
-nom = "5"
-rand = "0.7"
-thiserror = "1.0"
-itertools = "0.9"
-async-trait = "0.1"
-url = "2.1"
-dirs = "3.0"
-indoc = "1.0"
-
-# The versioning of the matrix SDK follows its Cargo.toml. The SDK and
-# macros are on master, but it imports the common and base from 0.1.0.
-matrix-sdk = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "master" }
-matrix-sdk-common-macros = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "master" }
-matrix-sdk-common = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "0.1.0" }
-matrix-sdk-base = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "0.1.0", default_features = false }
-
-[dependencies.serde]
-version = "1"
-features = ['derive']
-
-[dependencies.tokio]
-version = "0.2"
-features = ["rt-core", "macros", "time", "signal"]
+members = [
+    "dicebot",
+    "rpc"
+]

Dockerfile

@@ -1,21 +1,16 @@
-# Builder image
-FROM bougyman/voidlinux:glibc as builder
-RUN xbps-install -Sy base-devel libressl-devel wget gnupg rustup
+# Builder image with development dependencies.
+FROM ghcr.io/void-linux/void-linux:latest-mini-x86_64 as builder
+RUN xbps-install -S
+RUN xbps-install -yu xbps
+RUN xbps-install -Syu
+RUN xbps-install -Sy base-devel rustup cmake wget gnupg
+RUN xbps-install -Sy openssl-devel libstdc++-devel
 RUN rustup-init -qy
 
 # Install tini for signal processing and zombie killing
-ENV TINI_VERSION v0.18.0
-ENV TINI_SIGN_KEY 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7
-RUN set -eux; \
-  wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini"; \
-  wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc"; \
-  export GNUPGHOME="$(mktemp -d)"; \
-  gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$TINI_SIGN_KEY"; \
-  gpg --batch --verify /usr/local/bin/tini.asc /usr/local/bin/tini; \