diff --git a/Pipfile.lock b/Pipfile.lock index dca61a41f..02280a53e 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -80,7 +80,7 @@ "discord.py": { "editable": true, "git": "git://github.com/Rapptz/discord.py", - "ref": "00a659c6526b2445162b52eaf970adbd22c6d35d" + "ref": "77239e4f1588b7cf99ca54c36665ebfc4ad5bd57" }, "distro": { "hashes": [ @@ -126,37 +126,38 @@ }, "multidict": { "hashes": [ - "sha256:112eeeddd226af681dc82b756ed34aa7b6d98f9c4a15760050298c21d715473d", - "sha256:13b64ecb692effcabc5e29569ba9b5eb69c35112f990a16d6833ec3a9d9f8ec0", - "sha256:1725373fb8f18c2166f8e0e5789851ccf98453c849b403945fa4ef59a16ca44e", - "sha256:2061a50b7cae60a1f987503a995b2fc38e47027a937a355a124306ed9c629041", - "sha256:35b062288a9a478f627c520fd27983160fc97591017d170f966805b428d17e07", - "sha256:467b134bcc227b91b8e2ef8d2931f28b50bf7eb7a04c0403d102ded22e66dbfc", - "sha256:475a3ece8bb450e49385414ebfae7f8fdb33f62f1ac0c12935c1cfb1b7c1076a", - "sha256:49b885287e227a24545a1126d9ac17ae43138610713dc6219b781cc0ad5c6dfc", - "sha256:4c95b2725592adb5c46642be2875c1234c32af841732c5504c17726b92082021", - "sha256:4ea7ed00f4be0f7335c9a2713a65ac3d986be789ce5ebc10821da9664cbe6b85", - "sha256:5e2d5e1d999e941b4a626aea46bdc4206877cf727107fdaa9d46a8a773a6e49b", - "sha256:8039c520ef7bb9ec7c3db3df14c570be6362f43c200ae9854d2422d4ffe175a4", - "sha256:81459a0ebcca09c1fcb8fe887ed13cf267d9b60fe33718fc5fd1a2a1ab49470a", - "sha256:847c3b7b9ca3268e883685dc1347a4d09f84de7bd7597310044d847590447492", - "sha256:8551d1db45f0ca4e8ec99130767009a29a4e0dc6558a4a6808491bcd3472d325", - "sha256:8fa7679ffe615e0c1c7b80946ab4194669be74848719adf2d7867b5e861eb073", - "sha256:a42a36f09f0f907579ff0fde547f2fde8a739a69efe4a2728835979d2bb5e17b", - "sha256:a5fcad0070685c5b2d04b468bf5f4c735f5c176432f495ad055fcc4bc0a79b23", - "sha256:ae22195b2a7494619b73c01129ddcddc0dfaa9e42727404b1d9a77253da3f420", - "sha256:b360e82bdbbd862e1ce2a41cc3bbd0ab614350e813ca74801b34aac0f73465aa", - "sha256:b96417899344c5e96bef757f4963a72d02e52653a4e0f99bbea3a531cedac59f", - "sha256:b9e921140b797093edfc13ac08dc2a4fd016dd711dc42bb0e1aaf180e48425a7", - "sha256:c5022b94fc330e6d177f3eb38097fb52c7df96ca0e04842c068cf0d9fc38b1e6", - "sha256:cf2b117f2a8d951638efc7592fb72d3eeb2d38cc2194c26ba7f00e7190451d92", - "sha256:d79620b542d9d0e23ae9790ca2fe44f1af40ffad9936efa37bd14954bc3e2818", - "sha256:e2860691c11d10dac7c91bddae44f6211b3da4122d9a2ebb509c2247674d6070", - "sha256:e3a293553715afecf7e10ea02da40593f9d7f48fe48a74fc5dd3ce08a0c46188", - "sha256:e465be3fe7e992e5a6e16731afa6f41cb6ca53afccb4f28ea2fa6457783edf15", - "sha256:e6d27895ef922bc859d969452f247bfbe5345d9aba69b9c8dbe1ea7704f0c5d9" + "sha256:05eeab69bf2b0664644c62bd92fabb045163e5b8d4376a31dfb52ce0210ced7b", + "sha256:0c85880efa7cadb18e3b5eef0aa075dc9c0a3064cbbaef2e20be264b9cf47a64", + "sha256:136f5a4a6a4adeacc4dc820b8b22f0a378fb74f326e259c54d1817639d1d40a0", + "sha256:14906ad3347c7d03e9101749b16611cf2028547716d0840838d3c5e2b3b0f2d3", + "sha256:1ade4a3b71b1bf9e90c5f3d034a87fe4949c087ef1f6cd727fdd766fe8bbd121", + "sha256:22939a00a511a59f9ecc0158b8db728afef57975ce3782b3a265a319d05b9b12", + "sha256:2b86b02d872bc5ba5b3a4530f6a7ba0b541458ab4f7c1429a12ac326231203f7", + "sha256:3c11e92c3dfc321014e22fb442bc9eb70e01af30d6ce442026b0c35723448c66", + "sha256:4ba3bd26f282b201fdbce351f1c5d17ceb224cbedb73d6e96e6ce391b354aacc", + "sha256:4c6e78d042e93751f60672989efbd6a6bc54213ed7ff695fff82784bbb9ea035", + "sha256:4d80d1901b89cc935a6cf5b9fd89df66565272722fe2e5473168927a9937e0ca", + "sha256:4fcf71d33178a00cc34a57b29f5dab1734b9ce0f1c97fb34666deefac6f92037", + "sha256:52f7670b41d4b4d97866ebc38121de8bcb9813128b7c4942b07794d08193c0ab", + "sha256:5368e2b7649a26b7253c6c9e53241248aab9da49099442f5be238fde436f18c9", + "sha256:5bb65fbb48999044938f0c0508e929b14a9b8bf4939d8263e9ea6691f7b54663", + "sha256:60672bb5577472800fcca1ac9dae232d1461db9f20f055184be8ce54b0052572", + "sha256:669e9be6d148fc0283f53e17dd140cde4dc7c87edac8319147edd5aa2a830771", + "sha256:6a0b7a804e8d1716aa2c72e73210b48be83d25ba9ec5cf52cf91122285707bb1", + "sha256:79034ea3da3cf2a815e3e52afdc1f6c1894468c98bdce5d2546fa2342585497f", + "sha256:79247feeef6abcc11137ad17922e865052f23447152059402fc320f99ff544bb", + "sha256:81671c2049e6bf42c7fd11a060f8bc58f58b7b3d6f3f951fc0b15e376a6a5a98", + "sha256:82ac4a5cb56cc9280d4ae52c2d2ebcd6e0668dd0f9ef17f0a9d7c82bd61e24fa", + "sha256:9436267dbbaa49dad18fbbb54f85386b0f5818d055e7b8e01d219661b6745279", + "sha256:94e4140bb1343115a1afd6d84ebf8fca5fb7bfb50e1c2cbd6f2fb5d3117ef102", + "sha256:a2cab366eae8a0ffe0813fd8e335cf0d6b9bb6c5227315f53bb457519b811537", + "sha256:a596019c3eafb1b0ae07db9f55a08578b43c79adb1fe1ab1fd818430ae59ee6f", + "sha256:e8848ae3cd6a784c29fae5055028bee9bffcc704d8bcad09bd46b42b44a833e2", + "sha256:e8a048bfd7d5a280f27527d11449a509ddedf08b58a09a24314828631c099306", + "sha256:f6dd28a0ac60e2426a6918f36f1b4e2620fc785a0de7654cd206ba842eee57fd" ], - "version": "==4.4.0" + "markers": "python_version >= '3.4.1'", + "version": "==4.4.2" }, "pymongo": { "hashes": [ @@ -333,7 +334,7 @@ "sha256:0312ad34fcad8fac3704d441f7b317e50af620823353ec657a53e981f92920c0", "sha256:ec9ae8adaae229e4f8446952d204a3e4b5fdd2d099f9be3aaf556120135fb3ee" ], - "markers": "python_version != '3.2.*' and python_version != '3.3.*' and python_version >= '2.7' and python_version != '3.0.*' and python_version != '3.1.*'", + "markers": "python_version != '3.0.*' and python_version != '3.3.*' and python_version >= '2.7' and python_version != '3.1.*' and python_version != '3.2.*'", "version": "==1.2.1" }, "attrs": { @@ -434,7 +435,7 @@ "sha256:3f349de3eb99145973fefb7dbe38554414e5c30abd0c8e4b970a7c9d09f3a1d8", "sha256:f3832918bc3c66617f92e35f5d70729187676313caa60c187eb0f28b8fe5e3b5" ], - "markers": "python_version != '3.2.*' and python_version != '3.3.*' and python_version >= '2.7' and python_version != '3.0.*' and python_version != '3.1.*'", + "markers": "python_version != '3.0.*' and python_version != '3.3.*' and python_version >= '2.7' and python_version != '3.1.*' and python_version != '3.2.*'", "version": "==1.1.0" }, "jinja2": { @@ -460,37 +461,38 @@ }, "multidict": { "hashes": [ - "sha256:112eeeddd226af681dc82b756ed34aa7b6d98f9c4a15760050298c21d715473d", - "sha256:13b64ecb692effcabc5e29569ba9b5eb69c35112f990a16d6833ec3a9d9f8ec0", - "sha256:1725373fb8f18c2166f8e0e5789851ccf98453c849b403945fa4ef59a16ca44e", - "sha256:2061a50b7cae60a1f987503a995b2fc38e47027a937a355a124306ed9c629041", - "sha256:35b062288a9a478f627c520fd27983160fc97591017d170f966805b428d17e07", - "sha256:467b134bcc227b91b8e2ef8d2931f28b50bf7eb7a04c0403d102ded22e66dbfc", - "sha256:475a3ece8bb450e49385414ebfae7f8fdb33f62f1ac0c12935c1cfb1b7c1076a", - "sha256:49b885287e227a24545a1126d9ac17ae43138610713dc6219b781cc0ad5c6dfc", - "sha256:4c95b2725592adb5c46642be2875c1234c32af841732c5504c17726b92082021", - "sha256:4ea7ed00f4be0f7335c9a2713a65ac3d986be789ce5ebc10821da9664cbe6b85", - "sha256:5e2d5e1d999e941b4a626aea46bdc4206877cf727107fdaa9d46a8a773a6e49b", - "sha256:8039c520ef7bb9ec7c3db3df14c570be6362f43c200ae9854d2422d4ffe175a4", - "sha256:81459a0ebcca09c1fcb8fe887ed13cf267d9b60fe33718fc5fd1a2a1ab49470a", - "sha256:847c3b7b9ca3268e883685dc1347a4d09f84de7bd7597310044d847590447492", - "sha256:8551d1db45f0ca4e8ec99130767009a29a4e0dc6558a4a6808491bcd3472d325", - "sha256:8fa7679ffe615e0c1c7b80946ab4194669be74848719adf2d7867b5e861eb073", - "sha256:a42a36f09f0f907579ff0fde547f2fde8a739a69efe4a2728835979d2bb5e17b", - "sha256:a5fcad0070685c5b2d04b468bf5f4c735f5c176432f495ad055fcc4bc0a79b23", - "sha256:ae22195b2a7494619b73c01129ddcddc0dfaa9e42727404b1d9a77253da3f420", - "sha256:b360e82bdbbd862e1ce2a41cc3bbd0ab614350e813ca74801b34aac0f73465aa", - "sha256:b96417899344c5e96bef757f4963a72d02e52653a4e0f99bbea3a531cedac59f", - "sha256:b9e921140b797093edfc13ac08dc2a4fd016dd711dc42bb0e1aaf180e48425a7", - "sha256:c5022b94fc330e6d177f3eb38097fb52c7df96ca0e04842c068cf0d9fc38b1e6", - "sha256:cf2b117f2a8d951638efc7592fb72d3eeb2d38cc2194c26ba7f00e7190451d92", - "sha256:d79620b542d9d0e23ae9790ca2fe44f1af40ffad9936efa37bd14954bc3e2818", - "sha256:e2860691c11d10dac7c91bddae44f6211b3da4122d9a2ebb509c2247674d6070", - "sha256:e3a293553715afecf7e10ea02da40593f9d7f48fe48a74fc5dd3ce08a0c46188", - "sha256:e465be3fe7e992e5a6e16731afa6f41cb6ca53afccb4f28ea2fa6457783edf15", - "sha256:e6d27895ef922bc859d969452f247bfbe5345d9aba69b9c8dbe1ea7704f0c5d9" + "sha256:05eeab69bf2b0664644c62bd92fabb045163e5b8d4376a31dfb52ce0210ced7b", + "sha256:0c85880efa7cadb18e3b5eef0aa075dc9c0a3064cbbaef2e20be264b9cf47a64", + "sha256:136f5a4a6a4adeacc4dc820b8b22f0a378fb74f326e259c54d1817639d1d40a0", + "sha256:14906ad3347c7d03e9101749b16611cf2028547716d0840838d3c5e2b3b0f2d3", + "sha256:1ade4a3b71b1bf9e90c5f3d034a87fe4949c087ef1f6cd727fdd766fe8bbd121", + "sha256:22939a00a511a59f9ecc0158b8db728afef57975ce3782b3a265a319d05b9b12", + "sha256:2b86b02d872bc5ba5b3a4530f6a7ba0b541458ab4f7c1429a12ac326231203f7", + "sha256:3c11e92c3dfc321014e22fb442bc9eb70e01af30d6ce442026b0c35723448c66", + "sha256:4ba3bd26f282b201fdbce351f1c5d17ceb224cbedb73d6e96e6ce391b354aacc", + "sha256:4c6e78d042e93751f60672989efbd6a6bc54213ed7ff695fff82784bbb9ea035", + "sha256:4d80d1901b89cc935a6cf5b9fd89df66565272722fe2e5473168927a9937e0ca", + "sha256:4fcf71d33178a00cc34a57b29f5dab1734b9ce0f1c97fb34666deefac6f92037", + "sha256:52f7670b41d4b4d97866ebc38121de8bcb9813128b7c4942b07794d08193c0ab", + "sha256:5368e2b7649a26b7253c6c9e53241248aab9da49099442f5be238fde436f18c9", + "sha256:5bb65fbb48999044938f0c0508e929b14a9b8bf4939d8263e9ea6691f7b54663", + "sha256:60672bb5577472800fcca1ac9dae232d1461db9f20f055184be8ce54b0052572", + "sha256:669e9be6d148fc0283f53e17dd140cde4dc7c87edac8319147edd5aa2a830771", + "sha256:6a0b7a804e8d1716aa2c72e73210b48be83d25ba9ec5cf52cf91122285707bb1", + "sha256:79034ea3da3cf2a815e3e52afdc1f6c1894468c98bdce5d2546fa2342585497f", + "sha256:79247feeef6abcc11137ad17922e865052f23447152059402fc320f99ff544bb", + "sha256:81671c2049e6bf42c7fd11a060f8bc58f58b7b3d6f3f951fc0b15e376a6a5a98", + "sha256:82ac4a5cb56cc9280d4ae52c2d2ebcd6e0668dd0f9ef17f0a9d7c82bd61e24fa", + "sha256:9436267dbbaa49dad18fbbb54f85386b0f5818d055e7b8e01d219661b6745279", + "sha256:94e4140bb1343115a1afd6d84ebf8fca5fb7bfb50e1c2cbd6f2fb5d3117ef102", + "sha256:a2cab366eae8a0ffe0813fd8e335cf0d6b9bb6c5227315f53bb457519b811537", + "sha256:a596019c3eafb1b0ae07db9f55a08578b43c79adb1fe1ab1fd818430ae59ee6f", + "sha256:e8848ae3cd6a784c29fae5055028bee9bffcc704d8bcad09bd46b42b44a833e2", + "sha256:e8a048bfd7d5a280f27527d11449a509ddedf08b58a09a24314828631c099306", + "sha256:f6dd28a0ac60e2426a6918f36f1b4e2620fc785a0de7654cd206ba842eee57fd" ], - "version": "==4.4.0" + "markers": "python_version >= '3.4.1'", + "version": "==4.4.2" }, "packaging": { "hashes": [ @@ -504,7 +506,7 @@ "sha256:6e3836e39f4d36ae72840833db137f7b7d35105079aee6ec4a62d9f80d594dd1", "sha256:95eb8364a4708392bae89035f45341871286a333f749c3141c20573d2b3876e1" ], - "markers": "python_version != '3.0.*' and python_version != '3.3.*' and python_version >= '2.7' and python_version != '3.2.*' and python_version != '3.1.*'", + "markers": "python_version != '3.0.*' and python_version != '3.3.*' and python_version >= '2.7' and python_version != '3.1.*' and python_version != '3.2.*'", "version": "==0.7.1" }, "py": { @@ -512,7 +514,7 @@ "sha256:06a30435d058473046be836d3fc4f27167fd84c45b99704f2fb5509ef61f9af1", "sha256:50402e9d1c9005d759426988a492e0edaadb7f4e68bcddfea586bc7432d009c6" ], - "markers": "python_version != '3.2.*' and python_version != '3.3.*' and python_version >= '2.7' and python_version != '3.0.*' and python_version != '3.1.*'", + "markers": "python_version != '3.0.*' and python_version != '3.3.*' and python_version >= '2.7' and python_version != '3.1.*' and python_version != '3.2.*'", "version": "==1.6.0" }, "pygments": { @@ -524,24 +526,24 @@ }, "pyparsing": { "hashes": [ - "sha256:0832bcf47acd283788593e7a0f542407bd9550a55a8a8435214a1960e04bcb04", - "sha256:fee43f17a9c4087e7ed1605bd6df994c6173c1e977d7ade7b651292fab2bd010" + "sha256:905d8090c335314568b5faee0025b1829f27bb974604a5762a6cdef3a7dfc3b7", + "sha256:f493ee323be1e94929416b3585eefcc04943115cecbaaa35a8c86d1a2368af19" ], - "version": "==2.2.0" + "markers": "python_version != '3.0.*' and python_version != '3.1.*' and python_version != '3.2.*' and python_version >= '2.6'", + "version": "==2.2.1" }, "pytest": { "hashes": [ - "sha256:2d7c49e931316cc7d1638a3e5f54f5d7b4e5225972b3c9838f3584788d27f349", - "sha256:ad0c7db7b5d4081631e0155f5c61b80ad76ce148551aaafe3a718d65a7508b18" + "sha256:0a72d8a9f559c006ba153e0c9b4838efd7b656cf1f993747ba7128770d6eb12c", + "sha256:95529588ff4e85114a0b0ad8e9cf0131ca47d46b28230e25366c5aba66b1d854" ], - "version": "==3.7.4" + "version": "==3.8.1" }, "pytest-asyncio": { "hashes": [ "sha256:a962e8e1b6ec28648c8fe214edab4e16bacdb37b52df26eb9d63050af309b2a9", "sha256:fbd92c067c16111174a1286bfb253660f1e564e5146b39eeed1133315cf2c2cf" ], - "markers": "python_version != '3.0.*' and python_version != '3.3.*' and python_version >= '2.7' and python_version != '3.2.*' and python_version != '3.1.*'", "version": "==0.9.0" }, "python-levenshtein": { @@ -592,6 +594,7 @@ "sha256:63b52e3c866428a224f97cab011de738c36aec0185aa91cfacd418b5d58911d1", "sha256:ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a" ], + "markers": "python_version != '3.0.*' and python_version != '3.3.*' and python_version < '4' and python_version != '3.1.*' and python_version != '3.2.*' and python_version >= '2.6'", "version": "==2.19.1" }, "six": { @@ -610,10 +613,10 @@ }, "sphinx": { "hashes": [ - "sha256:a07050845cc9a2f4026a6035cc8ed795a5ce7be6528bbc82032385c10807dfe7", - "sha256:d719de667218d763e8fd144b7fcfeefd8d434a6201f76bf9f0f0c1fa6f47fcdb" + "sha256:217a7705adcb573da5bbe1e0f5cab4fa0bd89fd9342c9159121746f593c2d5a4", + "sha256:a602513f385f1d5785ff1ca420d9c7eb1a1b63381733b2f0ea8188a391314a86" ], - "version": "==1.7.8" + "version": "==1.7.9" }, "sphinx-rtd-theme": { "hashes": [ @@ -633,29 +636,30 @@ "sha256:68ca7ff70785cbe1e7bccc71a48b5b6d965d79ca50629606c7861a21b206d9dd", "sha256:9de47f375baf1ea07cdb3436ff39d7a9c76042c10a769c52353ec46e4e8fc3b9" ], - "markers": "python_version != '3.0.*' and python_version != '3.3.*' and python_version >= '2.7' and python_version != '3.2.*' and python_version != '3.1.*'", + "markers": "python_version != '3.0.*' and python_version != '3.3.*' and python_version >= '2.7' and python_version != '3.1.*' and python_version != '3.2.*'", "version": "==1.1.0" }, "toml": { "hashes": [ - "sha256:8e86bd6ce8cc11b9620cb637466453d94f5d57ad86f17e98a98d1f73e3baab2d" + "sha256:380178cde50a6a79f9d2cf6f42a62a5174febe5eea4126fe4038785f1d888d42", + "sha256:a7901919d3e4f92ffba7ff40a9d697e35bbbc8a8049fe8da742f34c83606d957" ], - "version": "==0.9.4" + "version": "==0.9.6" }, "tox": { "hashes": [ - "sha256:37cf240781b662fb790710c6998527e65ca6851eace84d1595ee71f7af4e85f7", - "sha256:eb61aa5bcce65325538686f09848f04ef679b5cd9b83cc491272099b28739600" + "sha256:7f802b37fffd3b5ef2aab104943fa5dad24bf9564bb7e732e54b8d0cfec2fca0", + "sha256:cc97859bd7f38aa5b3b8ba55ffe7ee9952e7050faad1aedc0829cd3db2fb61d6" ], "index": "pypi", - "version": "==3.2.1" + "version": "==3.4.0" }, "urllib3": { "hashes": [ "sha256:a68ac5e15e76e7e5dd2b8f94007233e01effe3e50e8daddf69acfd81cb686baf", "sha256:b5725a0bd4ba422ab0e66e89e030c806576753ea3ee08554382c14e685d117b5" ], - "markers": "python_version != '3.0.*' and python_version != '3.3.*' and python_version != '3.2.*' and python_version < '4' and python_version >= '2.6' and python_version != '3.1.*'", + "markers": "python_version != '3.0.*' and python_version != '3.3.*' and python_version < '4' and python_version != '3.1.*' and python_version != '3.2.*' and python_version >= '2.6'", "version": "==1.23" }, "virtualenv": { @@ -663,7 +667,7 @@ "sha256:2ce32cd126117ce2c539f0134eb89de91a8413a29baac49cbab3eb50e2026669", "sha256:ca07b4c0b54e14a91af9f34d0919790b016923d157afda5efdde55c96718f752" ], - "markers": "python_version != '3.0.*' and python_version >= '2.7' and python_version != '3.2.*' and python_version != '3.1.*'", + "markers": "python_version != '3.0.*' and python_version >= '2.7' and python_version != '3.1.*' and python_version != '3.2.*'", "version": "==16.0.0" }, "websockets": { diff --git a/dependency_links.txt b/dependency_links.txt index a733e7a0a..85b17018d 100644 --- a/dependency_links.txt +++ b/dependency_links.txt @@ -1 +1 @@ -https://github.com/Rapptz/discord.py/tarball/00a659c6526b2445162b52eaf970adbd22c6d35d#egg=discord.py-1.0.0a0 +https://github.com/Rapptz/discord.py/tarball/77239e4f1588b7cf99ca54c36665ebfc4ad5bd57#egg=discord.py-1.0.0a0 diff --git a/redbot/cogs/audio/audio.py b/redbot/cogs/audio/audio.py index f52dce280..fb799d40a 100644 --- a/redbot/cogs/audio/audio.py +++ b/redbot/cogs/audio/audio.py @@ -263,8 +263,7 @@ class Audio: async def role(self, ctx, role_name: discord.Role): """Sets the role to use for DJ mode.""" await self.config.guild(ctx.guild).dj_role.set(role_name.id) - dj_role_id = await self.config.guild(ctx.guild).dj_role() - dj_role_obj = discord.utils.get(ctx.guild.roles, id=dj_role_id) + dj_role_obj = ctx.guild.get_role(await self.config.guild(ctx.guild).dj_role()) await self._embed_msg(ctx, "DJ role set to: {}.".format(dj_role_obj.name)) @audioset.command() @@ -301,7 +300,7 @@ class Audio: """Show the current settings.""" data = await self.config.guild(ctx.guild).all() global_data = await self.config.all() - dj_role_obj = discord.utils.get(ctx.guild.roles, id=data["dj_role"]) + dj_role_obj = ctx.guild.get_role(data["dj_role"]) dj_enabled = data["dj_enabled"] emptydc_enabled = data["emptydc_enabled"] emptydc_timer = data["emptydc_timer"] @@ -2028,8 +2027,7 @@ class Audio: return nonbots <= 1 async def _has_dj_role(self, ctx, member): - dj_role_id = await self.config.guild(ctx.guild).dj_role() - dj_role_obj = discord.utils.get(ctx.guild.roles, id=dj_role_id) + dj_role_obj = ctx.guild.get_role(await self.config.guild(ctx.guild).dj_role()) if dj_role_obj in ctx.guild.get_member(member.id).roles: return True else: diff --git a/redbot/cogs/general/general.py b/redbot/cogs/general/general.py index c87bfe794..6daf50662 100644 --- a/redbot/cogs/general/general.py +++ b/redbot/cogs/general/general.py @@ -203,9 +203,9 @@ class General: data = discord.Embed(description=created_at, colour=(await ctx.embed_colour())) data.add_field(name=_("Region"), value=str(guild.region)) data.add_field(name=_("Users"), value="{}/{}".format(online, total_users)) - data.add_field(name=_("Text Channels"), value=text_channels) - data.add_field(name=_("Voice Channels"), value=voice_channels) - data.add_field(name=_("Roles"), value=len(guild.roles)) + data.add_field(name=_("Text Channels"), value=str(text_channels)) + data.add_field(name=_("Voice Channels"), value=str(voice_channels)) + data.add_field(name=_("Roles"), value=str(len(guild.roles))) data.add_field(name=_("Owner"), value=str(guild.owner)) data.set_footer(text=_("Server ID: ") + str(guild.id)) diff --git a/redbot/cogs/mod/checks.py b/redbot/cogs/mod/checks.py index 91ed9d334..62cc2f7da 100644 --- a/redbot/cogs/mod/checks.py +++ b/redbot/cogs/mod/checks.py @@ -10,8 +10,8 @@ def mod_or_voice_permissions(**perms): # Author is bot owner or guild owner return True - admin_role = discord.utils.get(guild.roles, id=await ctx.bot.db.guild(guild).admin_role()) - mod_role = discord.utils.get(guild.roles, id=await ctx.bot.db.guild(guild).mod_role()) + admin_role = guild.get_role(await ctx.bot.db.guild(guild).admin_role()) + mod_role = guild.get_role(await ctx.bot.db.guild(guild).mod_role()) if admin_role in author.roles or mod_role in author.roles: return True @@ -35,7 +35,7 @@ def admin_or_voice_permissions(**perms): guild = ctx.guild if await ctx.bot.is_owner(author) or guild.owner == author: return True - admin_role = discord.utils.get(guild.roles, id=await ctx.bot.db.guild(guild).admin_role()) + admin_role = guild.get_role(await ctx.bot.db.guild(guild).admin_role()) if admin_role in author.roles: return True for vc in guild.voice_channels: diff --git a/redbot/cogs/reports/reports.py b/redbot/cogs/reports/reports.py index 0bfa708ce..f74b2cb14 100644 --- a/redbot/cogs/reports/reports.py +++ b/redbot/cogs/reports/reports.py @@ -87,10 +87,8 @@ class Reports: ret = False if mod: guild = m.guild - admin_role = discord.utils.get( - guild.roles, id=await self.bot.db.guild(guild).admin_role() - ) - mod_role = discord.utils.get(guild.roles, id=await self.bot.db.guild(guild).mod_role()) + admin_role = guild.get_role(await self.bot.db.guild(guild).admin_role()) + mod_role = guild.get_role(await self.bot.db.guild(guild).mod_role()) ret |= any(r in m.roles for r in (mod_role, admin_role)) if perms: ret |= m.guild_permissions >= perms diff --git a/redbot/core/core_commands.py b/redbot/core/core_commands.py index 6009c508b..d26cd6079 100644 --- a/redbot/core/core_commands.py +++ b/redbot/core/core_commands.py @@ -609,10 +609,13 @@ class Core(CoreLogic): """Changes Red's settings""" if ctx.invoked_subcommand is None: if ctx.guild: - admin_role_id = await ctx.bot.db.guild(ctx.guild).admin_role() - admin_role = discord.utils.get(ctx.guild.roles, id=admin_role_id) or "Not set" - mod_role_id = await ctx.bot.db.guild(ctx.guild).mod_role() - mod_role = discord.utils.get(ctx.guild.roles, id=mod_role_id) or "Not set" + guild = ctx.guild + admin_role = ( + guild.get_role(await ctx.bot.db.guild(ctx.guild).admin_role()) or "Not set" + ) + mod_role = ( + guild.get_role(await ctx.bot.db.guild(ctx.guild).mod_role()) or "Not set" + ) prefixes = await ctx.bot.db.guild(ctx.guild).prefix() guild_settings = f"Admin role: {admin_role}\nMod role: {mod_role}\n" else: diff --git a/setup.py b/setup.py index adf5d4ae5..da72ca729 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ requirements = [ "fuzzywuzzy==0.17.0", "idna-ssl==1.1.0", "idna==2.7", - "multidict==4.4.0", + "multidict==4.4.2", "python-levenshtein==0.12.0", "pyyaml==3.13", "raven==6.9.0", @@ -107,7 +107,7 @@ if __name__ == "__main__": "more-itertools==4.3.0", "pluggy==0.7.1", "py==1.6.0", - "pytest==3.7.4", + "pytest==3.8.1", "pytest-asyncio==0.9.0", "six==1.11.0", ], @@ -121,7 +121,7 @@ if __name__ == "__main__": "Jinja2==2.10", "MarkupSafe==1.0", "packaging==17.1", - "pyparsing==2.2.0", + "pyparsing==2.2.1", "six==1.11.0", "Pygments==2.2.0", "pytz==2018.5", @@ -129,12 +129,12 @@ if __name__ == "__main__": "urllib3==1.23", "six==1.11.0", "snowballstemmer==1.2.1", - "sphinx==1.7.8", + "sphinx==1.7.9", "sphinx_rtd_theme==0.4.1", "sphinxcontrib-asyncio==0.2.0", "sphinxcontrib-websupport==1.1.0", ], "voice": ["red-lavalink==0.1.2"], - "style": ["black==18.6b4", "click==6.7", "toml==0.9.4"], + "style": ["black==18.6b4", "click==6.7", "toml==0.9.6"], }, )