stonewareslord/telematrix
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix url shortener

Browse Source
This commit is contained in:
Sijmen Schoon 2016-09-26 04:11:18 +02:00
parent a0c111c1ea
commit 37a8c63502
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app_service.py
View File

@ -8,6 +8,7 @@ import html
import json import json
import logging import logging
import mimetypes import mimetypes
import sys
from datetime import datetime from datetime import datetime
from time import time from time import time
from urllib.parse import unquote, quote, urlparse, parse_qs from urllib.parse import unquote, quote, urlparse, parse_qs
@ -117,11 +118,15 @@ async def shorten_url(url):
""" """
headers = {'Content-Type': 'application/json'} headers = {'Content-Type': 'application/json'}
async with SHORTEN_SESS.post(GOO_GL_URL, params={'key': GOOGLE_TOKEN}, async with SHORTEN_SESS.post(GOO_GL_URL, params={'key': GOOGLE_TOKEN},
data={'longUrl': url}, headers=headers) \ data=json.dumps({'longUrl': url}),
headers=headers) \
as response: as response:
obj = response.json() obj = await response.json()
return obj['id'] if 'id' in obj else url if 'id' in obj:
return obj['id']
else:
return url
async def matrix_transaction(request): async def matrix_transaction(request):