Merge pull request #216 from flytegg/master

Merge upstream changes

README.md

@@ -19,10 +19,10 @@ Contributions are always welcome. If you have no coding knowledge, please create
 
 1. Fork the repository, and then clone it to your local git
 2. Open the project in your IDE of choice
-3. We use environment variables for sensitive data such as Mongo URI's and bot tokens, as well as constants such as channel IDs or role IDs. You will see an .env.example in the root folder. You should rename this to .env, and populate it. We recommend using [this plugin](https://plugins.jetbrains.com/plugin/7861-envfile) to easily bind the env file to your project so they are available for testing locally
-4. Make your changes, and please maintain a similar code style and quality
-5. Create a Pull Request into the master branch of this repository
-
+3. We use environment variables for sensitive data such as Mongo URI's and bot tokens, as well as constants such as channel IDs or role IDs. You will see an .env.example in the root folder. You should rename this to .env, and populate it.
+4. Before making changes, familiarise yourself with [Flyte's Contributing Guidelines](https://docs.flyte.gg/contributing.html)
+5. Make your changes, and please maintain a similar code style and quality
+6. Create a Pull Request into the master branch of this repository
 
 We review pull requests as soon as possible. Please feel free to get in touch if it's urgent.
 

src/main/kotlin/com/learnspigot/bot/help/PingCommand.kt

@@ -39,7 +39,7 @@ class PingCommand {
                     "Paste it @ https://paste.learnspigot.com and send it so we can help.",
                     false
                 )
-                .addField("I figured it out", "Great job! Run ${if (closeId == null) "/close" else "</close$closeId>"} and select contributors.", false)
+                .addField("I figured it out", "Great job! Run ${if (closeId == null) "/close" else "</close:$closeId>"} and select contributors.", false)
                 .build())
             .setContent(channel.owner!!.asMention + " - You haven't responded in a while!")
             .queue()

src/main/kotlin/com/learnspigot/bot/help/ThreadListener.kt

@@ -21,9 +21,9 @@ class ThreadListener : ListenerAdapter() {
                 .setDescription("""
                     Please allow someone to read through your post and answer it!
                     
-                    If you fixed your problem, please run ${if (closeId == null) "/close" else "</close$closeId>"}.
+                    If you fixed your problem, please run ${if (closeId == null) "/close" else "</close:$closeId>"}.
                 """.trimIndent())
                 .build()
         ).queue()
     }
-}
+}