diff --git a/Pipfile b/Pipfile index 5a973c0..deda7c7 100644 --- a/Pipfile +++ b/Pipfile @@ -14,4 +14,4 @@ autochannel = {editable = true, path = "."} "discord.py" = {git = "https://github.com/Rapptz/discord.py", ref = "master"} [requires] -python_version = "3.6" +python_version = "3.6.8" diff --git a/Pipfile.lock b/Pipfile.lock index 062b877..b9277e3 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,11 +1,11 @@ { "_meta": { "hash": { - "sha256": "647d768ce08b321c0dbf88a8b8b9c332bf353074c5d23c661be7a815924a06f1" + "sha256": "412a2077686215a1e21234eaf98f64977b13c2140eaf18fb81af27315de0d0ff" }, "pipfile-spec": 6, "requires": { - "python_version": "3.6" + "python_version": "3.6.8" }, "sources": [ { @@ -32,6 +32,7 @@ "sha256:c506853ba52e516b264b106321c424d03f3ddef2813246432fa9d1cefd361c81", "sha256:fb83326d8295e8840e4ba774edf346e87eca78ba8a89c55d2690352842c15ba5" ], + "markers": "python_full_version >= '3.5.3'", "version": "==3.6.3" }, "aiomeasures": { @@ -46,7 +47,7 @@ "sha256:0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f", "sha256:4291ca197d287d274d0b6cb5d6f8f8f82d434ed288f962539ff18cc9012f9ea3" ], - "markers": "python_version >= '3.5.3'", + "markers": "python_full_version >= '3.5.3'", "version": "==3.0.1" }, "asyncio": { @@ -63,7 +64,7 @@ "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6", "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700" ], - "markers": "python_version != '3.1.*' and python_version != '3.2.*' and python_version != '3.0.*' and python_version != '3.3.*' and python_version >= '2.7'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==20.3.0" }, "autochannel": { @@ -89,7 +90,7 @@ "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a", "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc" ], - "markers": "python_version >= '2.7' and python_version != '3.1.*' and python_version != '3.0.*' and python_version != '3.2.*' and python_version != '3.4.*' and python_version != '3.3.*'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==7.1.2" }, "coloredlogs": { @@ -97,7 +98,7 @@ "sha256:346f58aad6afd48444c2468618623638dadab76e4e70d5e10822676f2d32226a", "sha256:a1fab193d2053aa6c0a97608c4342d031f1f93a3d1218432c59322441d31a505" ], - "markers": "python_version != '3.1.*' and python_version != '3.3.*' and python_version != '3.4.*' and python_version != '3.2.*' and python_version >= '2.7' and python_version != '3.0.*'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==14.0" }, "dblpy": { @@ -105,13 +106,17 @@ "sha256:2d7d746ee7e7b3a2597f485ebf4089e7baabdcf1717743228991bd988c69e1b5", "sha256:744f5ee9493a945e5907466754b2dce4735715b34daabb9e6264f76ec79818c9" ], - "markers": "python_version != '3.1.*' and python_version != '3.2.*' and python_version != '3.0.*' and python_version != '3.3.*' and python_version >= '2.7'", + "markers": "python_full_version >= '3.5.3'", "version": "==0.4.0" }, - "discord.py": { + "discord-py": { "git": "https://github.com/Rapptz/discord.py", "ref": "abe54f5bdc48b2a92fd2a0d158ac15655049174d" }, + "discord.py": { + "git": "https://github.com/Rapptz/discord.py", + "ref": "master" + }, "e1839a8": { "editable": true, "path": "." @@ -125,7 +130,7 @@ "sha256:4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060", "sha256:8a4fdd8936eba2512e9c85df320a37e694c93945b33ef33c89946a340a238557" ], - "markers": "python_version >= '2.7' and python_version != '3.1.*' and python_version != '3.0.*' and python_version != '3.2.*' and python_version != '3.3.*'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==1.1.2" }, "flask-sqlalchemy": { @@ -133,7 +138,7 @@ "sha256:05b31d2034dd3f2a685cbbae4cfc4ed906b2a733cff7964ada450fd5e462b84e", "sha256:bfc7150eaf809b1c283879302f04c42791136060c6eeb12c0c6674fb1291fae5" ], - "markers": "python_version != '3.1.*' and python_version != '3.2.*' and python_version != '3.0.*' and python_version != '3.3.*' and python_version >= '2.7'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.4.4" }, "humanfriendly": { @@ -141,7 +146,7 @@ "sha256:bf52ec91244819c780341a3438d5d7b09f431d3f113a475147ac9b7b167a3d12", "sha256:e78960b31198511f45fd455534ae7645a6207d33e512d2e842c766d15d9c8080" ], - "markers": "python_version != '3.1.*' and python_version != '3.3.*' and python_version != '3.4.*' and python_version != '3.2.*' and python_version >= '2.7' and python_version != '3.0.*'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==8.2" }, "idna": { @@ -149,7 +154,7 @@ "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407", "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c" ], - "markers": "python_version >= '2.7' and python_version != '3.2.*' and python_version != '3.0.*' and python_version != '3.3.*' and python_version != '3.1.*'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.8" }, "idna-ssl": { @@ -172,7 +177,7 @@ "sha256:321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19", "sha256:b12271b2047cb23eeb98c8b5622e2e5c5e9abd9784a153e9d8ef9cb4dd09d749" ], - "markers": "python_version != '3.2.*' and python_version != '3.3.*' and python_version >= '2.7' and python_version != '3.1.*' and python_version != '3.0.*'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.1.0" }, "jinja2": { @@ -180,7 +185,7 @@ "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0", "sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035" ], - "markers": "python_version >= '2.7' and python_version != '3.1.*' and python_version != '3.0.*' and python_version != '3.2.*' and python_version != '3.3.*'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==2.11.2" }, "markupsafe": { @@ -219,7 +224,7 @@ "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7", "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be" ], - "markers": "python_version != '3.2.*' and python_version != '3.3.*' and python_version >= '2.7' and python_version != '3.1.*' and python_version != '3.0.*'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.1.1" }, "multidict": { @@ -298,7 +303,7 @@ "sha256:ee69dad2c7155756ad114c02db06002f4cded41132cc51378e57aad79cc8e4f4", "sha256:f5ab93a2cb2d8338b1674be43b442a7f544a0971da062a5da774ed40587f18f5" ], - "markers": "python_version != '3.1.*' and python_version != '3.2.*' and python_version != '3.0.*' and python_version != '3.3.*' and python_version >= '2.7'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.8.6" }, "pyyaml": { @@ -329,6 +334,7 @@ "sha256:502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e", "sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.21.0" }, "sqlalchemy": { @@ -372,7 +378,7 @@ "sha256:f605f348f4e6a2ba00acb3399c71d213b92f27f2383fc4abebf7a37368c12142", "sha256:fcdb3755a7c355bc29df1b5e6fb8226d5c8b90551d202d69d0076a8a5649d68b" ], - "markers": "python_version != '3.1.*' and python_version != '3.2.*' and python_version != '3.0.*' and python_version != '3.3.*' and python_version >= '2.7'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.3.20" }, "tamago": { @@ -393,7 +399,7 @@ "sha256:2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4", "sha256:a637e5fae88995b256e3409dc4d52c2e2e0ba32c42a6365fee8bbd2238de3cfb" ], - "markers": "python_version != '3.0.*' and python_version < '4' and python_version != '3.1.*' and python_version >= '2.7' and python_version != '3.2.*' and python_version != '3.3.*'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' and python_version < '4'", "version": "==1.24.3" }, "werkzeug": { @@ -401,7 +407,7 @@ "sha256:2de2a5db0baeae7b2d2664949077c2ac63fbd16d98da0ff71837f7d1dea3fd43", "sha256:6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c" ], - "markers": "python_version >= '2.7' and python_version != '3.1.*' and python_version != '3.0.*' and python_version != '3.2.*' and python_version != '3.4.*' and python_version != '3.3.*'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==1.0.1" }, "yarl": { diff --git a/autochannel/__init__.py b/autochannel/__init__.py index 800b3b4..da582f7 100644 --- a/autochannel/__init__.py +++ b/autochannel/__init__.py @@ -1,5 +1,5 @@ """ init - version info """ -VERSION_INFO = (7, 0, 1) +VERSION_INFO = (8, 0, 0) VERSION = '.'.join(str(c) for c in VERSION_INFO) diff --git a/autochannel/autochannel_bot.py b/autochannel/autochannel_bot.py index 43c53c2..0e8b9b6 100644 --- a/autochannel/autochannel_bot.py +++ b/autochannel/autochannel_bot.py @@ -58,10 +58,12 @@ def main(): logging.getLogger('urllib3').setLevel(l_level) LOG.info("LONG LIVE AutoChannel bot") + intents = discord.Intents.default() + LOG.info(f'Intents: {intents}') autochannel = AutoChannel(shard_id=int(SHARD), shard_count=int(SHARD_COUNT), command_prefix=BOT_PREFIX, app_id=APP_ID, voice_channel_prefix=VOICE_CHANNEL_PREFIX, auto_channel_prefix=AUTO_CHANNEL_PREFIX, auto_categories=AUTO_CATEGORIES, - env=ENV, dbl_token=DBL_TOKEN) + env=ENV, dbl_token=DBL_TOKEN, intents=intents) for extension in EXTENSIONS: plugin.load('autochannel.lib.plugins.{}'.format(extension), autochannel) diff --git a/setup.py b/setup.py index 6d5f808..55430b2 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ 'aiomeasures', 'coloredlogs', 'dblpy', - 'discord.py==1.4.2', + 'discord.py==1.5.1', 'dblpy', 'flask_sqlalchemy', 'pip==18.0',