From 62332e15c34457bd0f1087f0336a4ba40622b19f Mon Sep 17 00:00:00 2001 From: Luna Mendes Date: Mon, 12 Nov 2018 04:26:16 -0300 Subject: [PATCH] run: add set_blueprints --- Pipfile.lock | 64 +--------------------------------------------------- run.py | 58 +++++++++++++++++++++++++---------------------- 2 files changed, 32 insertions(+), 90 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index 47192c2..2436cec 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "fc9b7ad7152bf6e26291b295af92aa0a45e5140d7c87c543d769642b0c7c4919" + "sha256": "2abc409283ebbb9179a834d18b86df002d70b9956e20d40dc5de7861c77b9216" }, "pipfile-spec": 6, "requires": { @@ -40,21 +40,6 @@ "index": "pypi", "version": "==0.16.0" }, - "atomicwrites": { - "hashes": [ - "sha256:0312ad34fcad8fac3704d441f7b317e50af620823353ec657a53e981f92920c0", - "sha256:ec9ae8adaae229e4f8446952d204a3e4b5fdd2d099f9be3aaf556120135fb3ee" - ], - "markers": "python_version != '3.3.*' and python_version != '3.2.*' and python_version != '3.1.*' and python_version != '3.0.*' and python_version >= '2.7'", - "version": "==1.2.1" - }, - "attrs": { - "hashes": [ - "sha256:10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69", - "sha256:ca4be454458f9dec299268d472aaa5a11f67a4ff70093396e1ceae9c76cf4bbb" - ], - "version": "==18.2.0" - }, "bcrypt": { "hashes": [ "sha256:01477981abf74e306e8ee31629a940a5e9138de000c6b0898f7f850461c4a0a5", @@ -106,7 +91,6 @@ "sha256:f5c2e048fb15ecb3c088d192164316093fcfa602a74b3386eefb2983aa7e800a" ], "index": "pypi", - "markers": "python_version >= '2.6'", "version": "==1.2" }, "cffi": { @@ -144,7 +128,6 @@ "sha256:edabd457cd23a02965166026fd9bfd196f4324fe6032e866d0f3bd0301cd486f", "sha256:fdf1c1dc5bafc32bc5d08b054f94d659422b05aba244d6be4ddc1c72d9aa70fb" ], - "markers": "python_version != '3.3.*' and python_version != '3.2.*' and python_version != '3.1.*' and python_version != '3.0.*' and python_version >= '2.7'", "version": "==1.11.5" }, "click": { @@ -152,7 +135,6 @@ "sha256:2335065e6395b9e67ca716de5f7526736bfa6ceead690adf616d925bdc622b13", "sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7" ], - "markers": "python_version != '3.3.*' and python_version != '3.2.*' and python_version != '3.1.*' and python_version != '3.0.*' and python_version >= '2.7'", "version": "==7.0" }, "earl-etf": { @@ -215,7 +197,6 @@ "sha256:74c935a1b8bb9a3947c50a54766a969d4846290e1e788ea44c1392163723c3bd", "sha256:f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4" ], - "markers": "python_version != '3.3.*' and python_version != '3.2.*' and python_version != '3.1.*' and python_version != '3.0.*' and python_version >= '2.7'", "version": "==2.10" }, "logbook": { @@ -262,17 +243,8 @@ "sha256:f82e347a72f955b7017a39708a3667f106e6ad4d10b25f237396a7115d8ed5fd", "sha256:fb7c206e01ad85ce57feeaaa0bf784b97fa3cad0d4a5737bc5295785f5c613a1" ], - "markers": "python_version != '3.3.*' and python_version != '3.2.*' and python_version != '3.1.*' and python_version != '3.0.*' and python_version >= '2.7'", "version": "==1.1.0" }, - "more-itertools": { - "hashes": [ - "sha256:c187a73da93e7a8acc0001572aebc7e3c69daf7bf6881a2cea10650bd4420092", - "sha256:c476b5d3a34e12d40130bc2f935028b5f636df8f372dc2c1c01dc19681b2039e", - "sha256:fcbfeaea0be121980e15bc97b3817b5202ca73d0eae185b4550cbfce2a3ebb3d" - ], - "version": "==4.3.0" - }, "multidict": { "hashes": [ "sha256:05eeab69bf2b0664644c62bd92fabb045163e5b8d4376a31dfb52ce0210ced7b", @@ -305,48 +277,14 @@ "sha256:e8a048bfd7d5a280f27527d11449a509ddedf08b58a09a24314828631c099306", "sha256:f6dd28a0ac60e2426a6918f36f1b4e2620fc785a0de7654cd206ba842eee57fd" ], - "markers": "python_version >= '3.4.1'", "version": "==4.4.2" }, - "pluggy": { - "hashes": [ - "sha256:447ba94990e8014ee25ec853339faf7b0fc8050cdc3289d4d71f7f410fb90095", - "sha256:bde19360a8ec4dfd8a20dcb811780a30998101f078fc7ded6162f0076f50508f" - ], - "markers": "python_version != '3.3.*' and python_version != '3.2.*' and python_version != '3.1.*' and python_version != '3.0.*' and python_version >= '2.7'", - "version": "==0.8.0" - }, - "py": { - "hashes": [ - "sha256:bf92637198836372b520efcba9e020c330123be8ce527e535d185ed4b6f45694", - "sha256:e76826342cefe3c3d5f7e8ee4316b80d1dd8a300781612ddbc765c17ba25a6c6" - ], - "markers": "python_version != '3.3.*' and python_version != '3.2.*' and python_version != '3.1.*' and python_version != '3.0.*' and python_version >= '2.7'", - "version": "==1.7.0" - }, "pycparser": { "hashes": [ "sha256:a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3" ], - "markers": "python_version != '3.3.*' and python_version != '3.2.*' and python_version != '3.1.*' and python_version != '3.0.*' and python_version >= '2.7'", "version": "==2.19" }, - "pytest": { - "hashes": [ - "sha256:3f193df1cfe1d1609d4c583838bea3d532b18d6160fd3f55c9447fdca30848ec", - "sha256:e246cf173c01169b9617fc07264b7b1316e78d7a650055235d6d897bc80d9660" - ], - "index": "pypi", - "version": "==3.10.1" - }, - "pytest-asyncio": { - "hashes": [ - "sha256:a962e8e1b6ec28648c8fe214edab4e16bacdb37b52df26eb9d63050af309b2a9", - "sha256:fbd92c067c16111174a1286bfb253660f1e564e5146b39eeed1133315cf2c2cf" - ], - "index": "pypi", - "version": "==0.9.0" - }, "pytoml": { "hashes": [ "sha256:ca2d0cb127c938b8b76a9a0d0f855cf930c1d50cc3a0af6d3595b566519a1013" diff --git a/run.py b/run.py index e5ec495..6ad4c0a 100644 --- a/run.py +++ b/run.py @@ -62,35 +62,39 @@ def make_app(): return app +def set_blueprints(app_): + bps = { + gateway: None, + auth: '/auth', + users: '/users', + relationships: '/users', + + guilds: '/guilds', + guild_roles: '/guilds', + guild_members: '/guilds', + guild_channels: '/guilds', + guild_mod: '/guilds', + + channels: '/channels', + channel_messages: '/channels', + channel_reactions: '/channels', + channel_pins: '/channels', + + webhooks: None, + science: None, + voice: '/voice', + invites: None, + dms: '/users' + } + + for bp, suffix in bps.items(): + suffix = suffix or '' + app_.register_blueprint(bp, url_prefix=f'/api/v6{suffix}') + + app = make_app() +set_blueprints(app) -bps = { - gateway: None, - auth: '/auth', - users: '/users', - relationships: '/users', - - guilds: '/guilds', - guild_roles: '/guilds', - guild_members: '/guilds', - guild_channels: '/guilds', - guild_mod: '/guilds', - - channels: '/channels', - channel_messages: '/channels', - channel_reactions: '/channels', - channel_pins: '/channels', - - webhooks: None, - science: None, - voice: '/voice', - invites: None, - dms: '/users' -} - -for bp, suffix in bps.items(): - suffix = suffix or '' - app.register_blueprint(bp, url_prefix=f'/api/v6{suffix}') @app.before_request async def app_before_request():