Skip to content

Commit 1465f8d

Browse files
Taaku18Taaku18
authored
Merge pull request #373 from kyb3r/development v3.2.0
Development
2 parents af4e149 + cd06360 commit 1465f8d

16 files changed

+678
-207
lines changed

‎.dockerignore

+155
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,155 @@
1+
# Byte-compiled / optimized / DLL files
2+
__pycache__/
3+
*.py[cod]
4+
*$py.class
5+
6+
# C extensions
7+
*.so
8+
9+
# Distribution / packaging
10+
.Python
11+
build/
12+
develop-eggs/
13+
dist/
14+
downloads/
15+
eggs/
16+
.eggs/
17+
lib/
18+
lib64/
19+
parts/
20+
sdist/
21+
var/
22+
wheels/
23+
pip-wheel-metadata/
24+
share/python-wheels/
25+
*.egg-info/
26+
.installed.cfg
27+
*.egg
28+
MANIFEST
29+
30+
# PyInstaller
31+
# Usually these files are written by a python script from a template
32+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
33+
*.manifest
34+
*.spec
35+
36+
# Installer logs
37+
pip-log.txt
38+
pip-delete-this-directory.txt
39+
40+
# Unit test / coverage reports
41+
htmlcov/
42+
.tox/
43+
.nox/
44+
.coverage
45+
.coverage.*
46+
.cache
47+
nosetests.xml
48+
coverage.xml
49+
*.cover
50+
.hypothesis/
51+
.pytest_cache/
52+
53+
# Translations
54+
*.mo
55+
*.pot
56+
57+
# Django stuff:
58+
*.log
59+
local_settings.py
60+
db.sqlite3
61+
62+
# Flask stuff:
63+
instance/
64+
.webassets-cache
65+
66+
# Scrapy stuff:
67+
.scrapy
68+
69+
# Sphinx documentation
70+
docs/_build/
71+
72+
# PyBuilder
73+
target/
74+
75+
# Jupyter Notebook
76+
.ipynb_checkpoints
77+
78+
# IPython
79+
profile_default/
80+
ipython_config.py
81+
82+
# pyenv
83+
.python-version
84+
85+
# celery beat schedule file
86+
celerybeat-schedule
87+
88+
# SageMath parsed files
89+
*.sage.py
90+
91+
# Environments
92+
.env
93+
.venv
94+
env/
95+
venv/
96+
ENV/
97+
env.bak/
98+
venv.bak/
99+
100+
# Spyder project settings
101+
.spyderproject
102+
.spyproject
103+
104+
# Rope project settings
105+
.ropeproject
106+
107+
# mkdocs documentation
108+
/site
109+
110+
# mypy
111+
.mypy_cache/
112+
.dmypy.json
113+
dmypy.json
114+
115+
# Pyre type checker
116+
.pyre/
117+
118+
# PyCharm
119+
.idea/
120+
121+
# MacOS
122+
.DS_Store
123+
124+
# VS Code
125+
.vscode/
126+
127+
# Node
128+
package-lock.json
129+
node_modules/
130+
131+
# Modmail
132+
config.json
133+
plugins/
134+
!plugins/registry.json
135+
temp/
136+
test.py
137+
138+
# Other stuff
139+
.env.example
140+
.gitignore
141+
.lint.py
142+
.pylintrc
143+
.travis.yml
144+
app.json
145+
CHANGELOG.md
146+
CODE_OF_CONDUCT.md
147+
CONTRIBUTING.md
148+
Pipfile
149+
Pipfile.lock
150+
Procfile
151+
pyproject.toml
152+
README.md
153+
runtime.txt
154+
SPONSORS.json
155+
stack.yml

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -134,3 +134,4 @@ plugins/
134134
!plugins/registry.json
135135
temp/
136136
test.py
137+
stack.yml

‎CHANGELOG.md

+22
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,32 @@
11
# Changelog
2+
23
All notable changes to this project will be documented in this file.
34

45
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
56
This project mostly adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html);
67
however, insignificant breaking changes does not guarantee a major version bump, see the reasoning [here](https://github.com/kyb3r/modmail/issues/319).
78

9+
# v3.2.0
10+
11+
### Added
12+
13+
- Ability to change permission levels of individual commands.
14+
- See `?permissions override` for more information.
15+
- `thread_move_notify` and `thread_move_response` to notify recipients if a thread is moved. (Thanks to Flufster PR#360)
16+
- IDs of messages sent to Modmail are now viewable. (Thanks to Flufster PR#360)
17+
18+
### Fixed
19+
20+
- `?help <some sub command>`, will return `Perhaps you meant: <some sub command>`, now its fixed.
21+
- For example, `?help add` used to return `Perhaps you meant: add`, now it wouldn't do this.
22+
- Aliases and Permissions command names are always saved lowercase now.
23+
- An improved Dockerfile.
24+
25+
### Internal
26+
27+
- Use regex to parse Changes, Added, Fixed, etc and description.
28+
- Adds `PermissionLevel.INVALID` when commands doesn't have a permission level.
29+
830
# v3.1.1
931

1032
### Fixed

‎Dockerfile

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
FROM library/python:latest
2-
RUN apt update && apt install -y pipenv
3-
RUN mkdir -p /bot && cd /bot && git clone https://github.com/kyb3r/modmail .
4-
WORKDIR /bot
5-
RUN pipenv install
6-
7-
CMD ["pipenv", "run", "bot"]
1+
FROM python:3.7.4-alpine
2+
RUN apk add --no-cache git
3+
WORKDIR /modmailbot
4+
COPY . /modmailbot
5+
RUN pip install --no-cache-dir -r requirements.min.txt
6+
CMD ["python", "bot.py"]

‎Pipfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dnspython = "~=1.16.0"
1919
parsedatetime = "==2.4"
2020
aiohttp = "<3.6.0,>=3.3.0"
2121
python-dotenv = ">=0.10.3"
22-
pipenv = "==2018.11.26"
22+
pipenv = "*"
2323
"discord.py" = "==1.2.3"
2424

2525
[requires]

‎Pipfile.lock

+64-68
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)