mirror of https://github.com/miaowware/qrm2.git
Merge pull request #138 from classabbyamp/continuations
correct some line continuations
This commit is contained in:
Abigail Gold
GitHub
commit
f32aa240ce
17
exts/ae7q.py
17
exts/ae7q.py
|
|
@ -97,19 +97,18 @@ class AE7QCog(commands.Cog):
|
|||
|
||||
for row in table_contents[0:3]:
|
||||
header = f'**{row[0]}** ({row[1]})'
|
||||
body = f'Class: *{row[2]}*\n'
|
||||
body += f'Region: *{row[3]}*\n'
|
||||
body += f'Status: *{row[4]}*\n'
|
||||
body += f'Granted: *{row[5]}*\n'
|
||||
body += f'Effective: *{row[6]}*\n'
|
||||
body += f'Cancelled: *{row[7]}*\n'
|
||||
body += f'Expires: *{row[8]}*'
|
||||
body = (f'Class: *{row[2]}*\n'
|
||||
f'Region: *{row[3]}*\n'
|
||||
f'Status: *{row[4]}*\n'
|
||||
f'Granted: *{row[5]}*\n'
|
||||
f'Effective: *{row[6]}*\n'
|
||||
f'Cancelled: *{row[7]}*\n'
|
||||
f'Expires: *{row[8]}*')
|
||||
embed.add_field(name=header, value=body, inline=False)
|
||||
|
||||
embed.description = desc
|
||||
if len(table_contents) > 3:
|
||||
embed.description += f'\nRecords 1 to 3 of {len(table_contents)}.'
|
||||
embed.description += ' See ae7q.com for more...'
|
||||
embed.description += f'\nRecords 1 to 3 of {len(table_contents)}. See ae7q.com for more...'
|
||||
|
||||
await ctx.send(embed=embed)
|
||||
|
||||
|
|
|
|||
|
|
@ -22,8 +22,7 @@ import common as cmn
|
|||
|
||||
class QrmHelpCommand(commands.HelpCommand):
|
||||
def __init__(self):
|
||||
super().__init__(command_attrs={'help': 'Shows help about qrm or a command',
|
||||
'aliases': ['h']})
|
||||
super().__init__(command_attrs={'help': 'Shows help about qrm or a command', 'aliases': ['h']})
|
||||
|
||||
def get_bot_mapping(self):
|
||||
bot = self.context.bot
|
||||
|
|
@ -142,8 +141,7 @@ class BaseCog(commands.Cog):
|
|||
@commands.command(name="echo", aliases=["e"], hidden=True)
|
||||
@commands.check(cmn.check_if_owner)
|
||||
async def _echo(self, ctx: commands.Context, channel: commands.TextChannelConverter, *, msg: str):
|
||||
"""Send a message in a channel as qrm. Only works within a server or DM to server,
|
||||
not between servers."""
|
||||
"""Send a message in a channel as qrm. Only works within a server or DM to server, not between servers."""
|
||||
await channel.send(msg)
|
||||
|
||||
|
||||
|
|
|
|||
15
exts/grid.py
15
exts/grid.py
|
|
@ -83,18 +83,21 @@ If two grid squares are given, the distance and azimuth between them is calculat
|
|||
# Haversine formula
|
||||
d_lat = math.radians(loc2[0] - loc[0])
|
||||
d_lon = math.radians(loc2[1] - loc[1])
|
||||
a = math.sin(d_lat/2) ** 2 +\
|
||||
math.cos(math.radians(loc[0])) * math.cos(math.radians(loc2[0])) *\
|
||||
math.sin(d_lon/2) ** 2
|
||||
a = (math.sin(d_lat/2) ** 2
|
||||
+ math.cos(math.radians(loc[0]))
|
||||
* math.cos(math.radians(loc2[0]))
|
||||
* math.sin(d_lon/2) ** 2)
|
||||
c = 2 * math.atan2(math.sqrt(a), math.sqrt(1-a))
|
||||
d = radius * c
|
||||
d_mi = 0.6213712 * d
|
||||
|
||||
# Bearing
|
||||
y_dist = math.sin(math.radians(loc2[1]-loc[1])) * math.cos(math.radians(loc2[0]))
|
||||
x_dist = math.cos(math.radians(loc[0])) * math.sin(math.radians(loc2[0])) -\
|
||||
math.sin(math.radians(loc[0])) * math.cos(math.radians(loc2[0])) *\
|
||||
math.cos(math.radians(loc2[1] - loc[1]))
|
||||
x_dist = (math.cos(math.radians(loc[0]))
|
||||
* math.sin(math.radians(loc2[0]))
|
||||
- math.sin(math.radians(loc[0]))
|
||||
* math.cos(math.radians(loc2[0]))
|
||||
* math.cos(math.radians(loc2[1] - loc[1])))
|
||||
bearing = (math.degrees(math.atan2(y_dist, x_dist)) + 360) % 360
|
||||
|
||||
embed = cmn.embed_factory(ctx)
|
||||
|
|
|
|||
|
|
@ -48,15 +48,11 @@ class LookupCog(commands.Cog):
|
|||
while query:
|
||||
if query in self.cty.keys():
|
||||
data = self.cty[query]
|
||||
embed.add_field(name="Entity",
|
||||
value=data['entity'])\
|
||||
.add_field(name="CQ Zone",
|
||||
value=data['cq'])\
|
||||
.add_field(name="ITU Zone",
|
||||
value=data['itu'])\
|
||||
.add_field(name="Continent",
|
||||
value=data['continent'])\
|
||||
.add_field(name="Time Zone",
|
||||
embed.add_field(name="Entity", value=data['entity'])
|
||||
embed.add_field(name="CQ Zone", value=data['cq'])
|
||||
embed.add_field(name="ITU Zone", value=data['itu'])
|
||||
embed.add_field(name="Continent", value=data['continent'])
|
||||
embed.add_field(name="Time Zone",
|
||||
value=f'+{data["tz"]}' if data['tz'] > 0 else str(data['tz']))
|
||||
embed.title += query
|
||||
embed.colour = cmn.colours.good
|
||||
|
|
|
|||
18
exts/qrz.py
18
exts/qrz.py
|
|
@ -42,8 +42,7 @@ class QRZCog(commands.Cog):
|
|||
raise ConnectionError(f'Unable to connect to QRZ (HTTP Error {resp.status})')
|
||||
resp_xml = etree.parse(BytesIO(await resp.read())).getroot()
|
||||
|
||||
resp_xml_session = resp_xml.xpath('/x:QRZDatabase/x:Session',
|
||||
namespaces={'x': 'http://xmldata.qrz.com'})
|
||||
resp_xml_session = resp_xml.xpath('/x:QRZDatabase/x:Session', namespaces={'x': 'http://xmldata.qrz.com'})
|
||||
resp_session = {el.tag.split('}')[1]: el.text for el in resp_xml_session[0].getiterator()}
|
||||
if 'Error' in resp_session:
|
||||
if 'Session Timeout' in resp_session['Error']:
|
||||
|
|
@ -59,8 +58,7 @@ class QRZCog(commands.Cog):
|
|||
return
|
||||
raise ValueError(resp_session['Error'])
|
||||
|
||||
resp_xml_data = resp_xml.xpath('/x:QRZDatabase/x:Callsign',
|
||||
namespaces={'x': 'http://xmldata.qrz.com'})
|
||||
resp_xml_data = resp_xml.xpath('/x:QRZDatabase/x:Callsign', namespaces={'x': 'http://xmldata.qrz.com'})
|
||||
resp_data = {el.tag.split('}')[1]: el.text for el in resp_xml_data[0].getiterator()}
|
||||
|
||||
embed = cmn.embed_factory(ctx)
|
||||
|
|
@ -101,8 +99,7 @@ async def qrz_login(user: str, passwd: str, session: aiohttp.ClientSession):
|
|||
raise ConnectionError(f'Unable to connect to QRZ (HTTP Error {resp.status})')
|
||||
resp_xml = etree.parse(BytesIO(await resp.read())).getroot()
|
||||
|
||||
resp_xml_session = resp_xml.xpath('/x:QRZDatabase/x:Session',
|
||||
namespaces={'x': 'http://xmldata.qrz.com'})
|
||||
resp_xml_session = resp_xml.xpath('/x:QRZDatabase/x:Session', namespaces={'x': 'http://xmldata.qrz.com'})
|
||||
resp_session = {el.tag.split('}')[1]: el.text for el in resp_xml_session[0].getiterator()}
|
||||
if 'Error' in resp_session:
|
||||
raise ConnectionError(resp_session['Error'])
|
||||
|
|
@ -118,8 +115,7 @@ async def qrz_test_session(key: str, session: aiohttp.ClientSession):
|
|||
raise ConnectionError(f'Unable to connect to QRZ (HTTP Error {resp.status})')
|
||||
resp_xml = etree.parse(BytesIO(await resp.read())).getroot()
|
||||
|
||||
resp_xml_session = resp_xml.xpath('/x:QRZDatabase/x:Session',
|
||||
namespaces={'x': 'http://xmldata.qrz.com'})
|
||||
resp_xml_session = resp_xml.xpath('/x:QRZDatabase/x:Session', namespaces={'x': 'http://xmldata.qrz.com'})
|
||||
resp_session = {el.tag.split('}')[1]: el.text for el in resp_xml_session[0].getiterator()}
|
||||
if 'Error' in resp_session:
|
||||
raise ConnectionError(resp_session['Error'])
|
||||
|
|
@ -137,8 +133,7 @@ def qrz_process_info(data: dict):
|
|||
state = f', {data["state"]}'
|
||||
else:
|
||||
state = ''
|
||||
address = data.get('addr1', '') + '\n' + data.get('addr2', '') + \
|
||||
state + ' ' + data.get('zip', '')
|
||||
address = data.get('addr1', '') + '\n' + data.get('addr2', '') + state + ' ' + data.get('zip', '')
|
||||
address = address.strip()
|
||||
if address == '':
|
||||
address = None
|
||||
|
|
@ -174,8 +169,7 @@ def qrz_process_info(data: dict):
|
|||
('CQ Zone', data.get('cqzone', None)),
|
||||
('ITU Zone', data.get('ituzone', None)),
|
||||
('IOTA Designator', data.get('iota', None)),
|
||||
('Born', data.get('born', None)),
|
||||
])
|
||||
('Born', data.get('born', None))])
|
||||
|
||||
|
||||
def setup(bot):
|
||||
|
|
|
|||
|
|
@ -75,11 +75,10 @@ class StudyCog(commands.Cog):
|
|||
embed.description = self.source
|
||||
embed.colour = cmn.colours.good
|
||||
embed.add_field(name='Question:', value=question['text'], inline=False)
|
||||
embed.add_field(name='Answers:', value='**A:** ' + question['answers']['A'] +
|
||||
'\n**B:** ' + question['answers']['B'] +
|
||||
'\n**C:** ' + question['answers']['C'] +
|
||||
'\n**D:** ' + question['answers']['D'],
|
||||
inline=False)
|
||||
embed.add_field(name='Answers:', value='**A:** ' + question['answers']['A']
|
||||
+ '\n**B:** ' + question['answers']['B']
|
||||
+ '\n**C:** ' + question['answers']['C']
|
||||
+ '\n**D:** ' + question['answers']['D'], inline=False)
|
||||
embed.add_field(name='Answer:', value='Type _?rqa_ for answer', inline=False)
|
||||
if 'image' in question:
|
||||
image_url = f'https://hamstudy.org/_1330011/images/{selected_pool.split("_",1)[1]}/{question["image"]}'
|
||||
|
|
|
|||
Loading…
Reference in New Issue