bugfix
This commit is contained in:
parent
5bbec3607a
commit
c584f4b05c
5 changed files with 12 additions and 12 deletions
|
@ -4,14 +4,14 @@ import aiohttp
|
||||||
import ujson as json
|
import ujson as json
|
||||||
from PIL import ImageFont
|
from PIL import ImageFont
|
||||||
|
|
||||||
from config import Config
|
from config import Config, CFG
|
||||||
from core.builtins import Url
|
from core.builtins import Url
|
||||||
from core.logger import Logger
|
from core.logger import Logger
|
||||||
from core.utils.http import download_to_cache
|
from core.utils.http import download_to_cache
|
||||||
from core.utils.http import get_url
|
from core.utils.http import get_url
|
||||||
|
|
||||||
web_render = Config('web_render')
|
web_render = CFG.get_url('web_render')
|
||||||
web_render_local = Config('web_render_local')
|
web_render_local = CFG.get_url('web_render_local')
|
||||||
elements = ['div#descriptionmodule']
|
elements = ['div#descriptionmodule']
|
||||||
assets_path = os.path.abspath('./assets/')
|
assets_path = os.path.abspath('./assets/')
|
||||||
font = ImageFont.truetype(f'{assets_path}/SourceHanSansCN-Normal.ttf', 15)
|
font = ImageFont.truetype(f'{assets_path}/SourceHanSansCN-Normal.ttf', 15)
|
||||||
|
|
|
@ -2,7 +2,7 @@ import datetime
|
||||||
|
|
||||||
from bs4 import BeautifulSoup
|
from bs4 import BeautifulSoup
|
||||||
|
|
||||||
from config import Config
|
from config import CFG
|
||||||
from core.builtins import Url
|
from core.builtins import Url
|
||||||
from core.logger import Logger
|
from core.logger import Logger
|
||||||
from core.utils.http import get_url
|
from core.utils.http import get_url
|
||||||
|
@ -10,7 +10,7 @@ from core.utils.http import get_url
|
||||||
|
|
||||||
async def news(msg):
|
async def news(msg):
|
||||||
api = 'https://www.mcbbs.net/forum-news-1.html'
|
api = 'https://www.mcbbs.net/forum-news-1.html'
|
||||||
webrender = Config('web_render')
|
webrender = CFG.get_url('web_render')
|
||||||
if webrender:
|
if webrender:
|
||||||
api = webrender + 'source?url=' + api
|
api = webrender + 'source?url=' + api
|
||||||
html = await get_url(api, 200)
|
html = await get_url(api, 200)
|
||||||
|
|
|
@ -2,7 +2,7 @@ from urllib.parse import quote
|
||||||
|
|
||||||
from bs4 import BeautifulSoup
|
from bs4 import BeautifulSoup
|
||||||
|
|
||||||
from config import Config
|
from config import CFG
|
||||||
from core.builtins import Url
|
from core.builtins import Url
|
||||||
from core.logger import Logger
|
from core.logger import Logger
|
||||||
from core.utils.http import get_url
|
from core.utils.http import get_url
|
||||||
|
@ -14,10 +14,10 @@ api_details = 'https://search.mcmod.cn/s?filter=3&key='
|
||||||
async def mcmod(msg, keyword: str, detail: bool = False):
|
async def mcmod(msg, keyword: str, detail: bool = False):
|
||||||
endpoint = api_details if detail else api
|
endpoint = api_details if detail else api
|
||||||
search_url = endpoint + quote(keyword)
|
search_url = endpoint + quote(keyword)
|
||||||
webrender = Config('web_render')
|
webrender = CFG.get_url('web_render')
|
||||||
if not webrender:
|
if not webrender:
|
||||||
return
|
return
|
||||||
search_url = webrender + '/source?url=' + quote(search_url)
|
search_url = webrender + 'source?url=' + quote(search_url)
|
||||||
html = await get_url(search_url, 200)
|
html = await get_url(search_url, 200)
|
||||||
Logger.debug(html)
|
Logger.debug(html)
|
||||||
bs = BeautifulSoup(html, 'html.parser')
|
bs = BeautifulSoup(html, 'html.parser')
|
||||||
|
|
|
@ -2,7 +2,7 @@ import traceback
|
||||||
|
|
||||||
from bs4 import BeautifulSoup
|
from bs4 import BeautifulSoup
|
||||||
|
|
||||||
from config import Config
|
from config import CFG
|
||||||
from core.builtins import Url
|
from core.builtins import Url
|
||||||
from core.logger import Logger
|
from core.logger import Logger
|
||||||
from core.utils.http import get_url
|
from core.utils.http import get_url
|
||||||
|
@ -16,7 +16,7 @@ async def jiki(term: str, locale: Locale):
|
||||||
:returns: 查询结果。'''
|
:returns: 查询结果。'''
|
||||||
try:
|
try:
|
||||||
api = 'https://jikipedia.com/search?phrase=' + term
|
api = 'https://jikipedia.com/search?phrase=' + term
|
||||||
webrender = Config('web_render')
|
webrender = CFG.get_url('web_render')
|
||||||
if webrender:
|
if webrender:
|
||||||
api = webrender + 'source?url=' + api
|
api = webrender + 'source?url=' + api
|
||||||
html = await get_url(api, 200)
|
html = await get_url(api, 200)
|
||||||
|
|
|
@ -2,7 +2,7 @@ import traceback
|
||||||
|
|
||||||
import ujson as json
|
import ujson as json
|
||||||
|
|
||||||
from config import Config
|
from config import CFG
|
||||||
from core.builtins import Url
|
from core.builtins import Url
|
||||||
from core.logger import Logger
|
from core.logger import Logger
|
||||||
from core.utils.http import get_url
|
from core.utils.http import get_url
|
||||||
|
@ -16,7 +16,7 @@ async def urban(term: str, locale: Locale):
|
||||||
:returns: 查询结果。'''
|
:returns: 查询结果。'''
|
||||||
try:
|
try:
|
||||||
url = 'http://api.urbandictionary.com/v0/define?term=' + term
|
url = 'http://api.urbandictionary.com/v0/define?term=' + term
|
||||||
webrender = Config('web_render')
|
webrender = CFG.get_url('web_render')
|
||||||
if not webrender:
|
if not webrender:
|
||||||
return ''
|
return ''
|
||||||
url = webrender + 'source?url=' + url
|
url = webrender + 'source?url=' + url
|
||||||
|
|
Reference in a new issue