Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
155 changes: 155 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
pip-wheel-metadata/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
.hypothesis/
.pytest_cache/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
.python-version

# celery beat schedule file
celerybeat-schedule

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# PyCharm
.idea/

# MacOS
.DS_Store

# VS Code
.vscode/

# Node
package-lock.json
node_modules/

# Modmail
config.json
plugins/
!plugins/registry.json
temp/
test.py

# Other stuff
.env.example
.gitignore
.lint.py
.pylintrc
.travis.yml
app.json
CHANGELOG.md
CODE_OF_CONDUCT.md
CONTRIBUTING.md
Pipfile
Pipfile.lock
Procfile
pyproject.toml
README.md
runtime.txt
SPONSORS.json
stack.yml
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,4 @@ plugins/
!plugins/registry.json
temp/
test.py
stack.yml
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,32 @@
# Changelog

All notable changes to this project will be documented in this file.

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

# v3.2.0

### Added

- Ability to change permission levels of individual commands.
- See `?permissions override` for more information.
- `thread_move_notify` and `thread_move_response` to notify recipients if a thread is moved. (Thanks to Flufster PR#360)
- IDs of messages sent to Modmail are now viewable. (Thanks to Flufster PR#360)

### Fixed

- `?help <some sub command>`, will return `Perhaps you meant: <some sub command>`, now its fixed.
- For example, `?help add` used to return `Perhaps you meant: add`, now it wouldn't do this.
- Aliases and Permissions command names are always saved lowercase now.
- An improved Dockerfile.

### Internal

- Use regex to parse Changes, Added, Fixed, etc and description.
- Adds `PermissionLevel.INVALID` when commands doesn't have a permission level.

# v3.1.1

### Fixed
Expand Down
13 changes: 6 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
FROM library/python:latest
RUN apt update && apt install -y pipenv
RUN mkdir -p /bot && cd /bot && git clone https://github.com/kyb3r/modmail .
WORKDIR /bot
RUN pipenv install

CMD ["pipenv", "run", "bot"]
FROM python:3.7.4-alpine
RUN apk add --no-cache git
WORKDIR /modmailbot
COPY . /modmailbot
RUN pip install --no-cache-dir -r requirements.min.txt
CMD ["python", "bot.py"]
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dnspython = "~=1.16.0"
parsedatetime = "==2.4"
aiohttp = "<3.6.0,>=3.3.0"
python-dotenv = ">=0.10.3"
pipenv = "==2018.11.26"
pipenv = "*"
"discord.py" = "==1.2.3"

[requires]
Expand Down
132 changes: 64 additions & 68 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading