Merge branch 'master' into restrict_voice_channel

.flake8

@@ -0,0 +1,5 @@
+[flake8]
+ignore = E203, E266, E501, E731, W503, F403, F401
+max-line-length = 99
+max-complexity = 18
+select = B,C,E,F,W,T4,B9

.github/CODEOWNERS

@@ -1 +1,2 @@
-* @jaydenkieran
+* @jaydenkieran
+* @srhinos

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 Please tick all applicable boxes.
 
-- [ ] I am using Python 3.5.3 or higher (run `python --version` on the command line)
+- [ ] I am using Python 3.8.7 or higher (run `python --version` on the command line)
 - [ ] I have followed the [official guides](https://github.com/Just-Some-Bots/MusicBot/wiki) to install the bot for my system
 - [ ] I have updated my dependencies to the latest version using the appropriate `update` script
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,7 @@
 After creating your pull request, tick these boxes if they are applicable to you.
 
 - [ ] I have tested my changes against the `review` branch (the latest developmental version), and this pull request is targeting that branch as a base
-- [ ] I have tested my changes on Python 3.5.3 or higher
+- [ ] I have tested my changes on Python 3.8.7 or higher
 
 ----
 

.travis.yml

@@ -1,15 +1,15 @@
-sudo: required
 language: python
-python: "3.5-dev"
 
 matrix:
   include:
-  - env: TYPE=docker
-    sudo: required
-  - env: TYPE=build
-    os: linux
-    dist: trusty
-    sudo: required
+  - python: "3.8"
+    env: TYPE=docker
+  - python: "3.8"
+    env: TYPE=build
+  - python: "3.9"
+    env: TYPE=docker
+  - python: "3.9"
+    env: TYPE=build
 
 services:
 - docker

Dockerfile

@@ -1,37 +1,34 @@
-FROM alpine:edge
+FROM python:3.8-alpine
 
 # Add project source
-WORKDIR /usr/src/musicbot
+WORKDIR /musicbot
 COPY . ./
+COPY ./config sample_config
+
+# Install build dependencies
+RUN apk update && apk add --no-cache --virtual .build-deps \
+  build-base \
+  libffi-dev \
+  libsodium-dev
 
 # Install dependencies
-RUN apk update \
-&& apk add --no-cache \
+RUN apk update && apk add --no-cache \
   ca-certificates \
   ffmpeg \
-  opus \
-  python3 \
-  libsodium-dev \
-\
-# Install build dependencies
-&& apk add --no-cache --virtual .build-deps \
-  gcc \
-  git \
-  libffi-dev \
-  make \
-  musl-dev \
-  python3-dev \
-\
+  opus-dev \
+  libffi \
+  libsodium \
+  gcc
+
 # Install pip dependencies
-&& pip3 install --no-cache-dir -r requirements.txt \
-&& pip3 install --upgrade --force-reinstall --version websockets==4.0.1 \
-\
+RUN pip3 install --no-cache-dir -r requirements.txt
+
 # Clean up build dependencies
-&& apk del .build-deps
+RUN apk del .build-deps
 
-# Create volume for mapping the config
-VOLUME /usr/src/musicbot/config
+# Create volumes for audio cache, config, data and logs
+VOLUME ["/musicbot/audio_cache", "/musicbot/config", "/musicbot/data", "/musicbot/logs"]
 
 ENV APP_ENV=docker
 
-ENTRYPOINT ["python3", "dockerentry.py"]
+ENTRYPOINT ["/bin/sh", "docker-entrypoint.sh"]

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2015-2019 Just-Some-Bots (https://github.com/Just-Some-Bots)
+Copyright (c) 2015-2021 Just-Some-Bots (https://github.com/Just-Some-Bots)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -2,10 +2,10 @@
 
 [![GitHub stars](https://img.shields.io/github/stars/Just-Some-Bots/MusicBot.svg)](https://github.com/Just-Some-Bots/MusicBot/stargazers)
 [![GitHub forks](https://img.shields.io/github/forks/Just-Some-Bots/MusicBot.svg)](https://github.com/Just-Some-Bots/MusicBot/network)
-[![Python version](https://img.shields.io/badge/python-3.5%2C%203.6%2C%203.7-blue.svg)](https://python.org)
+[![Python version](https://img.shields.io/badge/python-3.8%2C%203.6%2C%203.7-blue.svg)](https://python.org)
 [![Discord](https://discordapp.com/api/guilds/129489631539494912/widget.png?style=shield)](https://discord.gg/bots)
 
-MusicBot is the original Discord music bot written for [Python](https://www.python.org "Python homepage") 3.5+, using the [discord.py](https://github.com/Rapptz/discord.py) library. It plays requested songs from YouTube and other services into a Discord server (or multiple servers). Besides, if the queue becomes empty MusicBot will play through a list of existing songs with configuration. The bot features a permission system allowing owners to restrict commands to certain people. As well as playing songs, MusicBot is capable of streaming live media into a voice channel (experimental).
+MusicBot is the original Discord music bot written for [Python](https://www.python.org "Python homepage") 3.8+, using the [discord.py](https://github.com/Rapptz/discord.py) library. It plays requested songs from YouTube and other services into a Discord server (or multiple servers). Besides, if the queue becomes empty MusicBot will play through a list of existing songs with configuration. The bot features a permission system allowing owners to restrict commands to certain people. As well as playing songs, MusicBot is capable of streaming live media into a voice channel (experimental).
 
 ![Main](https://i.imgur.com/FWcHtcS.png)