Fix #41
This commit is contained in:
parent
11b5359b54
commit
68c2e58c89
2 changed files with 14 additions and 3 deletions
|
@ -2,7 +2,7 @@ import re
|
|||
|
||||
from core.elements import MessageSession
|
||||
from core.loader.decorator import command
|
||||
from .bugtracker_new import bugtracker_get
|
||||
from .bugtracker import bugtracker_get
|
||||
|
||||
|
||||
@command('bug', alias='b', help_doc='~bug <MojiraID> {查询Mojira上的漏洞编号内容}')
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
import json
|
||||
import re
|
||||
|
||||
from core.utils import get_url
|
||||
|
||||
|
@ -13,8 +14,15 @@ async def bugtracker_get(MojiraID):
|
|||
Version = False
|
||||
Link = False
|
||||
FixVersion = False
|
||||
json_url = 'https://bugs.mojang.com/rest/api/2/issue/' + str.upper(MojiraID)
|
||||
Translation = False
|
||||
ID = str.upper(MojiraID)
|
||||
json_url = 'https://bugs.mojang.com/rest/api/2/issue/' + ID
|
||||
get_json = await get_url(json_url)
|
||||
get_spx = await get_url('https://spx.spgoding.com/bugs')
|
||||
if get_spx:
|
||||
spx = json.loads(get_spx)
|
||||
if ID in spx:
|
||||
Translation = re.sub(r"(\[backcolor=White\]\[font=Monaco,Consolas,'Lucida Console','Courier New',serif\]|\[/font\]\[/backcolor\])", '', spx[ID]['summary'])
|
||||
if get_json:
|
||||
load_json = json.loads(get_json)
|
||||
errmsg = ''
|
||||
|
@ -27,6 +35,9 @@ async def bugtracker_get(MojiraID):
|
|||
if 'fields' in load_json:
|
||||
fields = load_json['fields']
|
||||
if 'summary' in fields:
|
||||
if Translation:
|
||||
Title = Title + fields['summary'] + f' ({Translation})' if Translation else ''
|
||||
else:
|
||||
Title = Title + fields['summary']
|
||||
if 'issuetype' in fields:
|
||||
Type = fields['issuetype']['name']
|
Reference in a new issue