Skip to content

Commit ee7d236

Browse files
committed
oops
1 parent 9569e15 commit ee7d236

21 files changed

+2016
-1009
lines changed

.github/ISSUE_TEMPLATE/command-request.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: Command request
33
about: Request a new command
4-
title: "your title here"
4+
title: "[COMMAND-REQUEST] your title here"
55
labels: command-request
66
assignees: ''
77

.github/ISSUE_TEMPLATE/feature_request.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: Feature request
33
about: Suggest an idea for this project
4-
title: "your title here"
4+
title: "[FEATURE-REQUEST] your title here"
55
labels: feature-request
66
assignees: ''
77

.github/workflows/stale.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ jobs:
1414
stale-issue-message: 'This issue is stale because it has been open for 100 days with no activity. Remove stale label or comment or this will be closed in 5 days. Please do not un-stale this issue unless it carries significant contribution.'
1515
days-before-stale: 100
1616
days-before-close: 5
17-
exempt-issue-label: 'priority: high,approved,security,bug'
17+
exempt-issue-label: 'high priority'

CHANGELOG.md

+126-136
Large diffs are not rendered by default.

CONTRIBUTING.md

+9-8
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,33 @@ We use GitHub to host code, to track issues and feature requests, as well as acc
1515

1616
## We Use [Git Flow](https://atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow)
1717
![Simple Image Of A Git Flow Workflow](https://nvie.com/img/hotfix-branches@2x.png)
18-
When contributing to this project, please make sure you follow this and name your branches appropriately!
18+
When contributing to this project please make sure you follow this and name your branches appropriately!
1919

2020
## All Code Changes Happen Through Pull Requests
2121
Make sure you know how Git Flow works before contributing!
2222
Pull requests are the best way to propose changes to the codebase. We actively welcome your pull requests:
2323

2424
1. Fork the repo and create your branch from `master` or `development` according to Git Flow.
25-
2. Update the CHANGELOG.
26-
3. If you've changed `core/*` or `bot.py`, mark changelog as "BREAKING" since plugins may break.
27-
4. Make sure your code passes the lint checks.
28-
5. Create Issues and pull requests!
25+
2. If you've added code that should be tested, add tests.
26+
3. If you've changed APIs, update the documentation.
27+
4. Ensure the test suite passes.
28+
5. Make sure your code lints.
29+
6. Issue that pull request!
2930

3031
## Any contributions you make will be under the GNU Affero General Public License v3.0
3132
In short, when you submit code changes, your submissions are understood to be under the same [GNU Affero General Public License v3.0](https://www.gnu.org/licenses/agpl-3.0.en.html) that covers the project. Feel free to contact the maintainers if that's a concern.
3233

3334
## Report bugs using [Github Issues](https://github.com/kyb3r/modmail/issues)
34-
We use GitHub issues to track public bugs. Report a bug by [opening a new Issue](https://github.com/kyb3r/modmail/issues/new); it's that easy!
35+
We use GitHub issues to track public bugs. Report a bug by [opening a new issue](https://github.com/kyb3r/modmail/issues/new); it's that easy!
3536

3637
## Write bug reports with detail, background, and sample code
3738
**Great Bug Reports** tend to have:
3839

39-
- A quick summary and background
40+
- A quick summary and/or background
4041
- Steps to reproduce
4142
- Be specific!
4243
- What you expected would happen
43-
- What *actually* happens
44+
- What actually happens
4445
- Notes (possibly including why you think this might be happening, or stuff you tried that didn't work)
4546

4647

README.md

+31-17
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<br>
77

88
<a href="#">
9-
<img src="https://img.shields.io/badge/Latest%20Version-v3.4.1-7289da?style=for-the-badge&logo=data:image/gif;base64,R0lGODlhGAAYAPcAAAAAADQ+Yj5MdThCaEFOekNQfWt5e1lqfEdVhVpriVx1iVtsnFZpll1xlF1znFx5mGNtjGR7hWNzjGd5iWJunGNslmN0lGl1lGN5lWt7lWR0nGp1nWR5nGt8nHJ9l3J9jFxto1xtqlZqqF5zpF15pV10rVx5q1Z2ql1us150s114sV50uVd1smJupGNurGN0pGp1pGR6o2t7o2F0rml0rGR5rGt8q3J9pGNus2Fvu2Bzs2p2smR5s2t7tGF0u2N6vGp7u2l1uXJ+uGJ1wWV7w2l+xWl+yl5zwHWDiWyCmHODnHiGmHSLkW2CpGuEqnSCpHqMo3ODrHWKrXyMq3iHp3yTqGyEtWqFunKDs3uLtHSGvXSMvHuMu3eItnyTs3yTu3iUuW+RsV+ApmuCxG2Dy22LxnSMxHuMxHGGzXSLzXqLzXWFxXyTw3uSy3WSx26E0W+N2m+L1XKG03SL1XmL1HOL2HmL23WF2XiS1m+QyHOK4XmL4XaH4nGM5ImXm4WOlJSjnoOOq4OOpYSUrImXqJOcqYONt4OUtIybtIOUu4ycvImYt5OcuIyiqZekqYyiupOjvJurvJimtp+yvqKruae2ua23trLCucPHvIOMxoOUxIuaw4eYyJKbyISW1YiW0o2kyJWlxJqpxZWkzJury5aoxp6xxZ2zyZio1Jyy2Yuk0aOsyKOyxKOzzKy8zKq2yLO7xqOr1KSz1Ku706W026y73Ki21bK716u75LS95KSu4Zyx6bPDzLjGx63B2LPD1LTE3LvL3brI17/S2bbKzrTE47rF47zM5L3M67bH577R5L7R67zK8rjM8MLM3MPK1sTT3crU3MjW2dLZ2srUy8PN5MTO68nP68jL48TS5MnT5cbR68jS7M3b7Mva5dTb6MTO8srO8szF8MXR8snS8c3a8cnY+NXb9tDL7dnm6dzk8tro99Pq9uTp6+r17fr77eTr/efr+Oz09OXz/Ov0/e37/uj39fX19fX89fz+9vP1/fX9/f7//vr2/ODl4sK75yH5BAEAAAAALAAAAAAYABgAAAj/AAEAmFOnoMGDCAvGmRNHYMKHEOdIhEgRIcGKGDMeTJVO00WNBj194/frFik5IOvgqdaP371N26xpefORYq57/HI+s7Vtmy0eKCmmapcz575FPXt+SfHmociiRae1SroNWIoVTQ2uxAk15yJg1awl7ZSCaUE82uRxhTpt1TNXq0Ip2pSobIqCc0iVoqsI0ipXr1bhywfVXxYdiA3Sourz2dqc8lbNQJz4bDWqix73E7ZjhgrKOjYmvfWLbZcZqCdTPjjHGLdtibi2U5Q6NWiEqqq64ifvVe3at1nX2tTuWQ/QyIMfxHOGi+rkyeMklPMDuvWaBqlbj469IPUU2ykPCOw+53t4AAEBADs=">
9+
<img src="https://img.shields.io/badge/Latest%20Version-v3.5.0-7289da?style=for-the-badge&logo=data:image/gif;base64,R0lGODlhGAAYAPcAAAAAADQ+Yj5MdThCaEFOekNQfWt5e1lqfEdVhVpriVx1iVtsnFZpll1xlF1znFx5mGNtjGR7hWNzjGd5iWJunGNslmN0lGl1lGN5lWt7lWR0nGp1nWR5nGt8nHJ9l3J9jFxto1xtqlZqqF5zpF15pV10rVx5q1Z2ql1us150s114sV50uVd1smJupGNurGN0pGp1pGR6o2t7o2F0rml0rGR5rGt8q3J9pGNus2Fvu2Bzs2p2smR5s2t7tGF0u2N6vGp7u2l1uXJ+uGJ1wWV7w2l+xWl+yl5zwHWDiWyCmHODnHiGmHSLkW2CpGuEqnSCpHqMo3ODrHWKrXyMq3iHp3yTqGyEtWqFunKDs3uLtHSGvXSMvHuMu3eItnyTs3yTu3iUuW+RsV+ApmuCxG2Dy22LxnSMxHuMxHGGzXSLzXqLzXWFxXyTw3uSy3WSx26E0W+N2m+L1XKG03SL1XmL1HOL2HmL23WF2XiS1m+QyHOK4XmL4XaH4nGM5ImXm4WOlJSjnoOOq4OOpYSUrImXqJOcqYONt4OUtIybtIOUu4ycvImYt5OcuIyiqZekqYyiupOjvJurvJimtp+yvqKruae2ua23trLCucPHvIOMxoOUxIuaw4eYyJKbyISW1YiW0o2kyJWlxJqpxZWkzJury5aoxp6xxZ2zyZio1Jyy2Yuk0aOsyKOyxKOzzKy8zKq2yLO7xqOr1KSz1Ku706W026y73Ki21bK716u75LS95KSu4Zyx6bPDzLjGx63B2LPD1LTE3LvL3brI17/S2bbKzrTE47rF47zM5L3M67bH577R5L7R67zK8rjM8MLM3MPK1sTT3crU3MjW2dLZ2srUy8PN5MTO68nP68jL48TS5MnT5cbR68jS7M3b7Mva5dTb6MTO8srO8szF8MXR8snS8c3a8cnY+NXb9tDL7dnm6dzk8tro99Pq9uTp6+r17fr77eTr/efr+Oz09OXz/Ov0/e37/uj39fX19fX89fz+9vP1/fX9/f7//vr2/ODl4sK75yH5BAEAAAAALAAAAAAYABgAAAj/AAEAmFOnoMGDCAvGmRNHYMKHEOdIhEgRIcGKGDMeTJVO00WNBj194/frFik5IOvgqdaP371N26xpefORYq57/HI+s7Vtmy0eKCmmapcz575FPXt+SfHmociiRae1SroNWIoVTQ2uxAk15yJg1awl7ZSCaUE82uRxhTpt1TNXq0Ip2pSobIqCc0iVoqsI0ipXr1bhywfVXxYdiA3Sourz2dqc8lbNQJz4bDWqix73E7ZjhgrKOjYmvfWLbZcZqCdTPjjHGLdtibi2U5Q6NWiEqqq64ifvVe3at1nX2tTuWQ/QyIMfxHOGi+rkyeMklPMDuvWaBqlbj469IPUU2ykPCOw+53t4AAEBADs=">
1010
</a>
1111

1212
<br>
@@ -31,6 +31,10 @@
3131
<img src="https://img.shields.io/badge/Made%20With-Python%203.7-blue.svg?style=for-the-badge&logo=Python" alt="Made with Python 3.7">
3232
</a>
3333

34+
<a href="https://travis-ci.com/kyb3r/modmail">
35+
<img src="https://img.shields.io/travis/com/kyb3r/modmail?style=for-the-badge&logo=Travis">
36+
</a>
37+
3438
<a href="https://github.com/ambv/black">
3539
<img src="https://img.shields.io/badge/Code%20Style-Black-black?style=for-the-badge">
3640
</a>
@@ -46,25 +50,25 @@
4650

4751
## What is Modmail?
4852

49-
Modmail is similar to Reddit's Modmail, both in functionality and purpose. It serves as a shared inbox for server staff to communicate with their users in a seamless way.
53+
Modmail is similar to Reddit's Modmail both in functionality and purpose. It serves as a shared inbox for server staff to communicate with their users in a seamless way.
5054

5155
This bot is free for everyone and always will be. If you like this project and would like to show your appreciation, you can support us on **[Patreon](https://www.patreon.com/kyber)**, cool benefits included!
5256

5357
## How does it work?
5458

55-
When a member sends a direct message to the bot, Modmail will create a channel or "thread" into a designated category. All further DM messages will automatically relay to that channel; any available staff can respond within the channel.
59+
When a member sends a direct message to the bot, Modmail will create a channel or "thread" within an isolated category. All further DM messages will automatically relay to that channel, for any available staff can respond within the channel.
5660

57-
Our Logviewer will save the threads so you can view previous threads through their corresponding log link. Here is an [**example**](https://logs.logviewer.tech/example).
61+
All threads are logged and you can view previous threads through their corresponding log link. Here is an [**example**](https://logs.logviewer.tech/example).
5862

5963
## Features
6064

6165
* **Highly Customisable:**
6266
* Bot activity, prefix, category, log channel, etc.
6367
* Command permission system.
64-
* Interface elements (color, responses, reactions, etc.).
68+
* Interface elements (color, responses, reactions, etc).
6569
* Snippets and *command aliases*.
6670
* Minimum duration for accounts to be created before allowed to contact Modmail (`account_age`).
67-
* Minimum length for members to be in the guild before allowed to contact Modmail (`guild_age`).
71+
* Minimum duration for members to be in the guild before allowed to contact Modmail (`guild_age`).
6872

6973
* **Advanced Logging Functionality:**
7074
* When you close a thread, Modmail will generate a [log link](https://logs.logviewer.tech/example) and post it to your log channel.
@@ -86,11 +90,11 @@ This list is ever-growing thanks to active development and our exceptional contr
8690

8791
Where can I find the Modmail bot invite link?
8892

89-
Unfortunately, due to how this bot functions, it cannot be invited. The lack of an invite link is to ensure an individuality to your server and grant you full control over your bot and data. Nonetheless, you can quickly obtain a free copy of Modmail for your server by following one of the methods listed below (roughly takes 15 minutes of your time).
93+
Unfortunately, due to how this bot functions, it cannot be invited. This is to ensure the individuality to your server and grant you full control over your bot and data. Nonetheless, you can easily obtain a free copy of Modmail for your server by following one of the methods listed below (roughly takes 15 minutes of your time)...
9094

9195
### Heroku
9296

93-
You can host this bot on Heroku.
97+
This bot can be hosted on Heroku.
9498

9599
Installation via Heroku is possible with your web browser alone.
96100
The [**installation guide**](https://github.com/kyb3r/modmail/wiki/Installation) (which includes a video tutorial!) will guide you through the entire installation process. If you run into any problems, join our [Modmail Discord Server](https://discord.gg/etJNHCQ) for help and support.
@@ -104,11 +108,11 @@ To configure automatic updates:
104108

105109
### Hosting for Patreons
106110

107-
If you don't want to go through the trouble of setting up your very own Modmail bot or wish to support this project, we got a solution for you! We offer the complete installation, hosting, and maintenance of your Modmail with [**Patreon**](https://patreon.com/kyber). Join our [Modmail Discord Server](https://discord.gg/etJNHCQ) for more info!
111+
If you don't want to go through the trouble of setting up your very own Modmail bot, and/or want to support this project, we offer the all inclusive installation, hosting and maintenance of your Modmail with [**Patreon**](https://patreon.com/kyber). Join our [Modmail Discord Server](https://discord.gg/etJNHCQ) for more info!
108112

109113
### Locally
110114

111-
Local hosting of Modmail is also possible. First, you will need [`Python 3.7`](https://www.python.org/downloads/release/python-376/).
115+
Local hosting of Modmail is also possible, first you will need [`Python 3.7`](https://www.python.org/downloads/).
112116

113117
Follow the [**installation guide**](https://github.com/kyb3r/modmail/wiki/Installation) and disregard deploying the Heroku bot application. If you run into any problems, join our [Modmail Discord Server](https://discord.gg/etJNHCQ) for help and support.
114118

@@ -143,20 +147,30 @@ You can build your own Docker image:
143147
$ docker build . --tag=modmail
144148
```
145149

146-
Or run directly from a pre-built version from https://hub.docker.com/.
150+
or run directly from a pre-built version from https://hub.docker.com/. Currently there are two community release of Modmail:
147151

148152
- Kyber's:
149153

150154
```console
151155
$ docker pull kyb3rr/modmail
152156
```
153157

158+
- Taku's:
159+
160+
```console
161+
$ docker pull taaku18/modmail
162+
# You can also choose one of the following:
163+
$ docker pull taaku18/modmail:dev
164+
$ docker pull taaku18/modmail:<version> (<version> ex: 3.2.0, 3.2, etc.)
165+
```
166+
154167
And to run your docker image:
155168

156169
```console
157-
$ docker run --env-file .env kyb3rr/modmail
170+
$ docker run --env-file .env user/modmail
158171
```
159-
- `.env` should be the path to your env file; you can also supply a path: `/path/to/.env`.
172+
- Replace `user/modmail` with `kyb3rr/modmail`, `taaku18/modmail`, `taaku18/modmail:3.2`, etc as above.
173+
- `.env` should be the path to your env file, you can also supply a path: `/path/to/.env`.
160174

161175
## Sponsors
162176

@@ -166,7 +180,7 @@ Special thanks to our sponsors for supporting the project.
166180
<img height=150 src='https://i.imgur.com/WyzaPKY.png' style='margin:10px'>
167181
</a>
168182

169-
<a href='https://discord.gg/zaeVCaV'>
183+
<a href='https://discord.gg/PmHHVt9'>
170184
<img height=150 src='https://imgur.com/8F18l3v.png' style='margin:10px'>
171185
</a>
172186

@@ -175,16 +189,16 @@ Become a sponsor on [Patreon](https://patreon.com/kyber).
175189
## Plugins
176190

177191
Modmail supports the use of third-party plugins to extend or add functionalities to the bot.
178-
Plugins allow niche features as well as anything else outside of the scope of the core functionality of Modmail.
192+
This allows niche features as well as anything else outside of the scope of the core functionality of Modmail.
179193

180-
You can find a list of third-party plugins using the `?plugins registry` command or visit the [Unofficial List of Plugins](https://github.com/kyb3r/modmail/wiki/Unofficial-List-of-Plugins) for a list of plugins contributed by the community.
194+
A list of third-party plugins can be found using the `?plugins registry` command or visit the [Unofficial List of Plugins](https://github.com/kyb3r/modmail/wiki/Unofficial-List-of-Plugins) for a list of plugins contributed by the community.
181195

182196
To develop your own, check out the [plugins documentation](https://github.com/kyb3r/modmail/wiki/Plugins).
183197

184198
Plugins requests and support is available in our [Modmail Plugins Server](https://discord.gg/4JE4XSW).
185199

186200
## Contributing
187201

188-
Contributions to Modmail are always welcome, whether it be improvements to the documentation or new functionality, please feel free to make the change. Check out our [contributing guidelines](https://github.com/kyb3r/modmail/blob/master/CONTRIBUTING.md) before you get started.
202+
Contributions to Modmail are always welcome, whether it be improvements to the documentation or new functionality, please feel free to make the change. Check out our contribution [guidelines](https://github.com/kyb3r/modmail/blob/master/CONTRIBUTING.md) before you get started.
189203

190204
If you like this project and would like to show your appreciation, support us on **[Patreon](https://www.patreon.com/kyber)**!

0 commit comments

Comments
 (0)