rewrite resolve() to use async instead on non-async, should fix #8
This commit is contained in:
@@ -6,6 +6,7 @@ import logging
|
|||||||
from jeevesbot import bothelp, functions, env
|
from jeevesbot import bothelp, functions, env
|
||||||
import gspread
|
import gspread
|
||||||
from oauth2client.service_account import ServiceAccountCredentials
|
from oauth2client.service_account import ServiceAccountCredentials
|
||||||
|
import asyncio
|
||||||
|
|
||||||
# setup logging
|
# setup logging
|
||||||
logging.basicConfig(level=logging.INFO)
|
logging.basicConfig(level=logging.INFO)
|
||||||
@@ -40,7 +41,7 @@ async def on_message(message):
|
|||||||
channel = functions.checkchannel(message.channel.id)
|
channel = functions.checkchannel(message.channel.id)
|
||||||
embed_url = message.content
|
embed_url = message.content
|
||||||
follow_url = embed_url + '.gif'
|
follow_url = embed_url + '.gif'
|
||||||
full_url = functions.resolve(follow_url)
|
full_url = asyncio.run(functions.resolve(follow_url))
|
||||||
gif_url = full_url.split('?')[0]
|
gif_url = full_url.split('?')[0]
|
||||||
embed = e.set_image(url=gif_url)
|
embed = e.set_image(url=gif_url)
|
||||||
if channel is True:
|
if channel is True:
|
||||||
|
|||||||
@@ -1,12 +1,20 @@
|
|||||||
#!/usr/bin/env python 3
|
#!/usr/bin/env python 3
|
||||||
|
|
||||||
from jeevesbot import env
|
from jeevesbot import env
|
||||||
import urllib
|
# import urllib
|
||||||
|
import aiohttp
|
||||||
import dice
|
import dice
|
||||||
|
|
||||||
# This function is necessary for tenor, because they do not allow linking directly to the gif and need resolving.
|
# This function is necessary for tenor, because they do not allow linking directly to the gif and need resolving.
|
||||||
def resolve(url):
|
#def resolve(url):
|
||||||
return urllib.request.urlopen(url).url
|
# return urllib.request.urlopen(url).url
|
||||||
|
|
||||||
|
# This function is necessary for tenor, because they do not allow linking directly to the gif and need resolving. ASYNC VERSION
|
||||||
|
async def resolve(url):
|
||||||
|
async with aiohttp.ClientSession() as session:
|
||||||
|
async with session.get(url) as response:
|
||||||
|
message = response.url
|
||||||
|
return message
|
||||||
|
|
||||||
# use the dice module for rolling.
|
# use the dice module for rolling.
|
||||||
def roll(notation):
|
def roll(notation):
|
||||||
|
|||||||
Reference in New Issue
Block a user