polyjitter
/
searchbot-discord
mirror of https://github.com/polyjitter/searchbot-discord.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Escape all links

This commit is contained in:
Adriene Hutchins 2020-03-24 22:45:43 -04:00
parent 5f8ef8a8d8
commit da7a9667af
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
extensions/search.py
View File

@ -10,6 +10,7 @@ from discord.ext import commands
from typing import List from typing import List
from extensions.models import SearchExceptions from extensions.models import SearchExceptions
import html2text import html2text
import re
class Search(commands.Cog, name="Basic"): class Search(commands.Cog, name="Basic"):
@ -109,6 +110,7 @@ class Search(commands.Cog, name="Basic"):
} }
async with self.request.get(search_url, headers=headers) as resp: async with self.request.get(search_url, headers=headers) as resp:
to_parse = await resp.json() to_parse = await resp.json()
print(to_parse)
# Sends results # Sends results
return to_parse['data']['result']['items'] return to_parse['data']['result']['items']
@ -154,16 +156,26 @@ class Search(commands.Cog, name="Basic"):
for r in results[1:count]: for r in results[1:count]:
title = self.tomd.handle(r['title']).rstrip('\n') title = self.tomd.handle(r['title']).rstrip('\n')
url = r['url'] url = r['url']
other_results.append(f"**{title}** <{url}>") other_results.append(f"**{title}** {url}")
other_msg: str = "\n".join(other_results) other_msg: str = "\n".join(other_results)
# Builds message # Builds message
msg = ( msg = (
f"Showing **{count}** results for `{query_display}`.\n\n" f"Showing **{count}** results for `{query_display}`.\n\n"
f"**{first_title}** <{first_url}>\n{first_desc}\n\n" f"**{first_title}** {first_url}\n{first_desc}\n\n"
f"{other_msg}\n\n_Powered by Qwant._" f"{other_msg}\n\n_Powered by Qwant._"
) )
print(msg)
msg = re.sub(
r'(https?://(?:www\.)?[-a-zA-Z0-9@:%._+~#=]+\.'
r'[a-zA-Z0-9()]+\b[-a-zA-Z0-9()@:%_+.~#?&/=]*)',
r'<\1>',
msg
)
# Sends message # Sends message
await self.info( await self.info(
f"**New Search** - `{ctx.author}` in `{ctx.guild}`\n\n{msg}", f"**New Search** - `{ctx.author}` in `{ctx.guild}`\n\n{msg}",