Merge pull request #2751 from kyb3r/update

Update v3.4.0

Author: Taaku18

.dockerignore

@@ -93,6 +93,7 @@ celerybeat-schedule
 .venv
 env/
 venv/
+venv2/
 ENV/
 env.bak/
 venv.bak/
@@ -145,8 +146,7 @@ app.json
 CHANGELOG.md
 CODE_OF_CONDUCT.md
 CONTRIBUTING.md
-Pipfile
-Pipfile.lock
+requirements.min.txt
 Procfile
 pyproject.toml
 README.md

.github/workflows/lints.yml

@@ -13,21 +13,16 @@ jobs:
 #        python-version: [3.6, 3.7]
 
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: [3.6, 3.7]
-
     steps:
     - uses: actions/checkout@v1
-    - name: Set up Python ${{ matrix.python-version }}
+    - name: Set up Python 3.7
       uses: actions/setup-python@v1
       with:
-        python-version: ${{ matrix.python-version }}
+        python-version: 3.7
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install bandit flake8 pylint black
+        python -m pip install bandit pylint black
       continue-on-error: true
     - name: Bandit syntax check
       run: bandit ./bot.py cogs/*.py core/*.py -b .bandit_baseline.json
@@ -37,4 +32,3 @@ jobs:
     - name: Black and flake8
       run: |
         black . --check
-        flake8 ./bot.py cogs/*.py core/*.py --ignore=E501,E203,W503

.github/workflows/stale.yml

@@ -1,4 +1,5 @@
-name: "Close stale issues"
+name: "Close Stale Issues"
+
 on:
   schedule:
   - cron: "0 0 * * *"
@@ -10,6 +11,7 @@ jobs:
     - uses: actions/stale@v1
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: 'This issue is stale because it has been open for 3 months with no activity. Remove stale label or comment or this will be closed in 5 days'
-        days-before-stale: 90
+        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.'
+        days-before-stale: 100
         days-before-close: 5
+        exempt-issue-label: 'high priority'

.pylintrc

@@ -267,7 +267,7 @@ indent-after-paren=4
 indent-string='    '
 
 # Maximum number of characters on a single line.
-max-line-length=100
+max-line-length=99
 
 # Maximum number of lines in a module.
 max-module-lines=1000

.travis.yml

@@ -7,6 +7,52 @@ This project mostly adheres to [Semantic Versioning](https://semver.org/spec/v2.
 however, insignificant breaking changes does not guarantee a major version bump, see the reasoning [here](https://github.com/kyb3r/modmail/issues/319).
 
 
+# v3.4.0
+
+
+### Added
+
+- Thread cooldown!
+  - Set via the new config var `thread_cooldown`.
+  - Specify a time for the recipient to wait before allowed to create another thread.
+- Fallback Category (thanks to DAzVise PR#636)
+  - Automatically created upon reaching the 50 channels limit.
+  - Manually set fallback category with the config var `fallback_category_id`.
+- "enable" and "disable" support for yes or no config vars.
+- Added "perhaps you meant" section to `?config help`.
+- Multi-command alias is now more stable. With support for a single quote escape `\"`.
+- New command `?freply`, which behaves exactly like `?reply` with the addition that you can substitute `{channel}`, `{recipient}`, and `{author}` to be their respective values. 
+- New command `?repair`, repair any broken Modmail thread (with help from @officialpiyush).
+- Recipient get feedback when they edit message.
+- Chained delete for DMs now comes with a message.
+- poetry (in case someone needs it).
+
+### Changed
+
+- The look of alias and snippet when previewing.
+- Message ID of the thread embed is saved in DB, instead of the original message.
+- Swapped the position of user and category for `?contact`.
+- The log file will no longer grow infinitely large.
+- Hard limit of maximum 25 steps for alias.
+- `?disable` is now `?disable new`.
+
+### Fixed
+
+- Setting config vars using human time wasn't working.
+- Fixed some bugs with aliases.
+- Fixed a lot of issues with `?edit` and `?delete` and recipient message edit.
+- Masked the error: "AttributeError: 'int' object has no attribute 'name'"
+  - Channel delete event will not be checked until discord.py fixes this issue.
+- Chained reaction add / remove.
+- Chained delete for thread channels.
+
+### Internal
+
+- Commit to black format line width max = 99, consistent with pylint.
+- Alias parser is rewritten without shlex.
+- New checks with thread create / find.
+- No more flake8 and travis.
+
 # v3.3.2
 
 ### Fixed

CHANGELOG.md

@@ -1,5 +1,10 @@
-FROM python:3.7.4-alpine
+FROM python:3.7-alpine
 WORKDIR /modmailbot
 COPY . /modmailbot
-RUN pip install --no-cache-dir -r requirements.min.txt
-CMD ["python", "bot.py"]
+RUN  export PIP_NO_CACHE_DIR=false \
+    && apk update \
+    && apk add --update --no-cache --virtual .build-deps alpine-sdk \
+    && pip install pipenv \
+    && pipenv install --deploy --ignore-pipfile \
+    && apk del .build-deps
+CMD ["pipenv", "run", "bot"]

Dockerfile

@@ -7,7 +7,6 @@ verify_ssl = true
 black = "==19.3b0"
 pylint = "*"
 bandit = "==1.6.2"
-flake8 = "==3.7.8"
 
 [packages]
 colorama = ">=0.4.0"
@@ -18,7 +17,7 @@ motor = ">=2.0.0"
 natural = "==0.2.0"
 isodate = ">=0.6.0"
 dnspython = "~=1.16.0"
-parsedatetime = "==2.4"
+parsedatetime = "==2.5"
 aiohttp = "<3.6.0,>=3.3.0"
 python-dotenv = ">=0.10.3"
 pipenv = "*"