Stable merge 18/7/2022

.env.example

@@ -6,5 +6,7 @@ CATAPI_TOKEN=12345678-1234-1234-1234-123456789012
 EXEC_GROUP=123456789123456789
 MODERATOR_GROUP=321654987321654987
 SUPERUSER_GROUP=147258369147258369
+SERVER_ID=314159265358979323
 ALLOW_GIT_UPDATE=False
+EMOJI_SERVERS=[121213131414151516]
 # NOTE: YOU MUST HAVE A NEWLINE AT THE END OF THE FILE

.gitignore

@@ -6,3 +6,4 @@ database*
 *.cabal
 stack.yaml.lock
 .gitattributes
+.vscode

CONTRIBUTING.md

@@ -4,24 +4,44 @@ Welcome to the [University of Warwick Tabletop and Roleplaying Society](https://
 
 Please feel free to contribute to the code in whatever way you are able. We're more than happy to accept new code, bug fixes, documentation, issues, and anything else you think will improve the bot! If you do start work on an issue, please first let us know in the issue's thread or in our Discord server to avoid competing pull requests.
 
-## Code of Conduct
+**Our society has a [Code of Conduct](https://www.warwicktabletop.co.uk/page/codeofconduct/). We expect it to be upheld by contributors in all our online spaces the same way we'd expect it to be upheld by attendees of our events.**
 
-Our society has a [Code of Conduct](https://www.warwicktabletop.co.uk/page/codeofconduct/). We expect it to be upheld by contributors in all our online spaces the same way we'd expect it to be upheld by attendees of our events.
+## What can I contribute?
 
-## Good Practice Recommendations
+We're happy to accept any contribution, big or small. You can find our list of issues [here](https://github.com/WarwickTabletop/tablebot/issues), which details bugs and feature requests. Both code (with documentation) and documentation alone is accepted - we want this project to be as accessible as possible, so any contributions must come with documentation or add documentation.
 
-Here are some good practice tips for git and this project.
+If you think of a feature you'd like added or find a bug in the current implementation please do create a new ticket! There's no obligation to implement the issue. If you don't have any ideas but do want to get involved with programming you can check the issues page for new features and fixes to work on. If you're not too familiar with Haskell or our codebase, look out for the "good first issue" label. We put this on issues that we think would be good for newcomers to the language/project to get started on.
 
-* Whenever a new feature is being worked on, create a new branch on your forked repo
-* When a feature is ready to be merged into the bot, make a pull request from the feature branch to the main repo
-* Before making a pull request, make sure your branch is up to date with main (and that it compiles and complies with `ormolu` - see below for details) so that it can be merged without hassle
-* Write comments! This project will be maintained by many people, and it can be difficult to work out what others' code does
-* To communicate with the maintainers, please join the [Tabletop Discord server](https://warwicktabletop.co.uk/discord) and give yourself the @computer_person role to join the developer channel
-* If you need help finding a function to do a particular task, you can search on [Hoogle](https://hoogle.haskell.org/). The two libraries that deal with parsing are `Text.Megaparsec` and `Control.Monad.Combinators`, and `Discord` is the package that deals with Discord itself. You can filter by package if that helps to find certain functions
+If you have trouble at any time, please do ask for help in an issue thread or on our Discord. The maintainers generally communicate in the [Tabletop Discord server](https://warwicktabletop.co.uk/discord). The channel we use, #computers-were-a-mistake, is opt-in so you'll need to give yourself the @computer_person role in #roles. Finally, you can also check out the [tutorials](tutorials) in the repository and pre-existing solutions in the code for guidance.
 
-You can check out the [README](README.md) for a brief overview on how to set up a local bot for testing. If you've never done something like this before, see the bottom of this document for a walkthrough.
+## How to contribute
 
-## Ormolu
+### The basics
+
+If you'd like to contribute code, these are the steps you'll need to follow along with some tips. (If you've contributed to an open-source Haskell project before, you likely know all of this.)
+
+* You'll need to fork this repo if you haven't already, and then create a branch for the feature you're implementing. Please split up features into different branches where you can.
+* When a feature is ready to be merged into the bot, make a pull request from the feature branch to the main repo. In the next section we'll talk about pull requests.
+* Before making a pull request (PR), **make sure your branch is up to date with main**. The CI must also not complain, so the code must compile and not throw any formatting errors. We use `ormolu` to check for the latter, which is detailed later.
+* If you need help finding a function to do a particular task, you can search on [Hoogle](https://hoogle.haskell.org/). The two libraries that deal with parsing are `Text.Megaparsec` and `Control.Monad.Combinators`, and `Discord` is the package that deals with Discord itself. You can filter by package if that helps to find certain functions.
+
+You can check out the [README](README.md) for a brief overview on how to set up a local bot for testing. If you've never done something like this before, see [SETUP.md](SETUP.md).
+
+### Writing good Pull Requests (PRs)
+
+Writing good PRs is hard. As such, here are some important points to consider when writing your PR to make it easier for the reviewer.
+
+* **Ask yourself: what does this PR contribute?** It is very important that you're clear about all of the features being added, because they justify the changes you have made and point out what exactly needs testing. Mention _everything_ even if it is just cleaning up a file - this makes it clear what the point is of each change and doesn't leave the reviewer guessing why you've added a certain change.
+* **Documentation is key.** PRs without documentation will be rejected. A few points to consider about documentation:
+    * Functions should have top-level documentation explaining what they do (even if it is very brief) unless they are self-evident. Classes should be justified in the same way. Use Haddock style.
+    * In larger implementations, it may help to talk about the high-level structure of your implementation - e.g. you might have a section of your plugin that deals with parsing messages, another which deals with some specific case, another which deals with the general case and so on. Make it clear how these parts interact. Splitting your implementation into multiple files may help here, with a base file that imports each auxiliary file and puts the results within those files together.
+    * Haskell code has a habit of being extremely abstract, and talking about it in the abstract does not aid understanding. Give concrete examples of how the abstract is used to justify its existence - instead of solely saying "we have a parser that doesn't look at `t`", back it up with an example like "this is used within a Discord interaction, so doesn't necessarily have an associated message".
+* **Remember the plugin writer as well as the end user.** If you've written something that changes how plugins are written, update existing tutorials or add new ones. Make sure that the API you're defining is clear and easy to use, so doesn't put too much burden on someone writing a plugin.
+* **Try to keep your PR small.** If you can split your work into multiple PRs, please do - the smaller a PR is, the more likely your reviewer will be able to understand it and thus accept it.
+
+If you follow these steps, it becomes much easier for the reviewer to understand your code and thus feel confident about accepting it. This also allows the reviewer to make more helpful suggestions about the code itself - both allowing them to verify that the code does what you say it does, and that you've implemented it in a helpful way. The review process should help you write better code as well as making Tablebot as a whole better.
+
+### Ormolu
 
 To maintain consistent formatting you must use Ormolu, which can be installed via stack:
 
@@ -33,7 +53,7 @@ Then you can run it on every file via:
 
 You can see full documentation on the [Ormolu repo](https://github.com/tweag/ormolu#usage).
 
-### Running Ormolu automatically with git
+#### Running Ormolu automatically with git
 
 You may also wish to set up Ormolu to run when you stage a file (get ready to commit it) - this can be done using `.gitattributes` and `.gitconfig` as follows.
 
@@ -55,52 +75,3 @@ You may also wish to set up Ormolu to run when you stage a file (get ready to co
 
 That's it! (With thanks to Sam Coy for explaining this process)
 
-## What can I work on?
-
-We're happy to accept any contribution, big or small. You can find our list of issues [here](https://github.com/WarwickTabletop/tablebot/issues). If you think of a feature you'd like added or a bug in the current implementation please do create a new ticket! There's no obligation to implement the issue. If you don't have any ideas but do want to get involved with programming you can check the issues page for new features and fixes to work on. If you're not too familiar with Haskell or our codebase, look out for the "good first issue" label. We put this on issues that we think would be good for newcomers to the language/project to get started on.
-
-If you have trouble at any time, please do ask for help in an issue thread or on our Discord. You can also check out the [tutorials](tutorials) in the repository and pre-existing solutions in the code for guidance.
-
-## Setup from Scratch
-
-If at any point something doesn't work, restart your computer first and try it again. If the problem persists please feel free to ask for help in the [Discord server](https://www.warwicktabletop.co.uk/discord/). Sections are marked depending on what OS they rely on, if any.
-
-1. git, wsl, and vscode setup
-    1. github
-        1. Create a GitHub account
-        2. Go to <https://github.com/WarwickTabletop/tablebot>
-        3. Click fork on the repo (should be top right) (this creates your own version of the repo)
-        4. Take note of the url that your forked repo is on
-    2. wsl and git (Windows)
-        1. Install wsl by going to <https://docs.microsoft.com/en-us/windows/wsl/install>, and make sure it's in the right click context menu of folders
-        2. Navigate to an empty folder on your computer that you want to do your programming from (the project folder)
-        3. Shift-right click in the project folder, and click "open linux shell here"
-        4. Type `git clone <your repo url>` into the terminal
-        5. The folder should be filled with a bunch of files and folders
-    3. terminal and git (Linux)
-        1. Navigate to an empty folder on your computer that you want to do your programming from (the project folder)
-        2. Shift-right click in the project folder and press "open in terminal"
-        3. Type `git clone <your repo url>` into the terminal
-        4. The folder should be filled with a bunch of files and folders
-    4. vscode
-        1. Install vscode from <https://code.visualstudio.com/>
-        2. Install this <https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.vscode-remote-extensionpack>
-        3. From a terminal opened in the project folder, type `code .`
-        4. There should soon be a window which has all the folders and files open on the left hand side
-2. Haskell setup
-    1. In any linux terminal window (wsl or the linux terminal itself), type `curl -sSL https://get.haskellstack.org/ | sh`, allowing sudo access and providing passwords as needed
-    2. In the linux terminal window opened from the project folder (or the terminal open in the vscode window) run `stack build`, and then wait until it's done
-    3. This will take a long time
-    4. Make some tea, or maybe some coffee or hot chocolate
-    5. If it didn't work, reopen all terminal windows and try again. if that doesn't work, restart your computer and try again
-    6. Install this <https://marketplace.visualstudio.com/items?itemName=haskell.haskell>
-    7. Open a file and marvel at the colours, and the fact you can hover over things and see values and stuff
-3. Discord and Environment variables
-    1. Create a file in the top level of the project folder called `.env`, based on the template in `.env.example`
-    2. Follow the instructions in [Environment File Setup](README.md#environment-file-setup) to fill in the `.env`. Make sure to get a `DISCORD_TOKEN` and a `SQLITE_FILENAME` (which can be named anything, but use something like `database.db`)
-    3. To run the bot, type `stack run` into the terminal, and the bot will start to run
-    4. Make sure to invite the bot to a server so you can test it out!
-
-Congratulations, you now know the very basics needed to set up your own tablebot!
-
-To learn more about git, you should look up a tutorial or watch this video: <https://youtu.be/HOIC804Berc>

ChangeLog.md

@@ -1,3 +1,4 @@
 # Changelog for tablebot
 
 ## Unreleased changes
+- Allow configuration of which servers are allowed to provide emoji

README.md

@@ -4,7 +4,7 @@
 
 An extendable Discord bot framework written on top of [`discord-haskell`](https://github.com/aquarial/discord-haskell).
 
-If you're new to this project, or completely new to git, and Haskell, you might be interested in looking at the [Setup from Scratch](CONTRIBUTING.md#setup-from-scratch) section in the [contributor's guide](CONTRIBUTING.md). If you want tutorials on making your first plugin or how exceptions work, checkout the tutorials in the [tutorials](tutorials) folder.
+If you're new to this project, or completely new to git, and Haskell, you might be interested in looking at the [Setup from Scratch](SETUP.md) guide. If you want to contribute, please consult the [contributor's guide](CONTRIBUTING.md). If you want tutorials on making your first plugin or how exceptions work, checkout the tutorials in the [tutorials](tutorials) folder.
 
 ## Environment file setup
 
@@ -23,9 +23,18 @@ Create a `.env` file containing the following keys. Consult `.env.example` if yo
 * `EXEC_GROUP` (optional) - the group ID assigned to exec members.
 * `MODERATOR_GROUP` (optional) - the group ID assigned to moderator members.
 * `SUPERUSER_GROUP` (optional) - the group ID assigned to the superuser. Strongly recommended
+* `SERVER_ID` (optional) - either `global` or the id of the server the bot will mainly be deployed in. Application commands will be
+  registered here. If absent, application commands won't be registered.
+* `EMOJI_SERVERS` (optional) - a list of server IDs that the bot will search for emoji within.
+* `ALLOW_GIT_UPDATE` (optional) - a `true` or `false` value that determines whether the bot can automatically load data from the repository.
+  **Warning!** Be very careful with setting this to true; if you haven't set up permissions properly on your repo and your discord servers then things can go wrong!
 
 The three Group settings are optional, but without them any commands that require elevated permissions will not be able
-to be called when DEBUG is false. Users with the superuser group are able to run every command (including some dangerous
+to be called when `DEBUG` is false. Users with the superuser group are able to run every command (including some dangerous
 ones), so caution should be used when setting these up.
 
-If you have any difficulties setting it up, see the [contributor's guide](CONTRIBUTING.md) for a walkthrough.
+If you have any difficulties setting it up, see the [setup guide](SETUP.md) for a walkthrough.
+
+## Importing this bot and running it yourself.
+
+If you like, rather than directly running this bot you can run it yourself with minor tweaks. An example of this is in `app/Main.hs` - tweak this to your needs and then run `stack run` as per usual.

SETUP.md

@@ -0,0 +1,46 @@
+# Setup from Scratch
+
+This document details the setup process of downloading a development copy of Tablebot.
+This was originally authored by Benji (Git won't reflect this as it was taken out of CONTRIBUTING.md).
+
+If at any point something doesn't work, restart your computer first and try it again. If the problem persists please feel free to ask for help in the [Discord server](https://www.warwicktabletop.co.uk/discord/). Sections are marked depending on what OS they rely on, if any.
+
+1. git, wsl, and vscode setup
+    1. github
+        1. Create a GitHub account
+        2. Go to <https://github.com/WarwickTabletop/tablebot>
+        3. Click fork on the repo (should be top right) (this creates your own version of the repo)
+        4. Take note of the url that your forked repo is on
+    2. wsl and git (Windows)
+        1. Install wsl by going to <https://docs.microsoft.com/en-us/windows/wsl/install>, and make sure it's in the right click context menu of folders
+        2. Navigate to an empty folder on your computer that you want to do your programming from (the project folder)
+        3. Shift-right click in the project folder, and click "open linux shell here"
+        4. Type `git clone <your repo url>` into the terminal
+        5. The folder should be filled with a bunch of files and folders
+    3. terminal and git (Linux)
+        1. Navigate to an empty folder on your computer that you want to do your programming from (the project folder)
+        2. Shift-right click in the project folder and press "open in terminal"
+        3. Type `git clone <your repo url>` into the terminal
+        4. The folder should be filled with a bunch of files and folders
+    4. vscode
+        1. Install vscode from <https://code.visualstudio.com/>
+        2. Install this <https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.vscode-remote-extensionpack>
+        3. From a terminal opened in the project folder, type `code .`
+        4. There should soon be a window which has all the folders and files open on the left hand side
+2. Haskell setup
+    1. In any linux terminal window (wsl or the linux terminal itself), type `curl -sSL https://get.haskellstack.org/ | sh`, allowing sudo access and providing passwords as needed
+    2. In the linux terminal window opened from the project folder (or the terminal open in the vscode window) run `stack build`, and then wait until it's done
+    3. This will take a long time
+    4. Make some tea, or maybe some coffee or hot chocolate
+    5. If it didn't work, reopen all terminal windows and try again. if that doesn't work, restart your computer and try again
+    6. Install this <https://marketplace.visualstudio.com/items?itemName=haskell.haskell>
+    7. Open a file and marvel at the colours, and the fact you can hover over things and see values and stuff
+3. Discord and Environment variables
+    1. Create a file in the top level of the project folder called `.env`, based on the template in `.env.example`
+    2. Follow the instructions in [Environment File Setup](README.md#environment-file-setup) to fill in the `.env`. Make sure to get a `DISCORD_TOKEN` and a `SQLITE_FILENAME` (which can be named anything, but use something like `database.db`)
+    3. To run the bot, type `stack run` into the terminal, and the bot will start to run
+    4. Make sure to invite the bot to a server so you can test it out!
+
+Congratulations, you now know the very basics needed to set up your own tablebot!
+
+To learn more about git, you should look up a tutorial or watch this video: <https://youtu.be/HOIC804Berc>