miaowware/qrm2
1
0
Fork 0
mirror of https://github.com/miaowware/qrm2.git synced 2024-11-26 17:58:40 -05:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'master' into cog-to-ext

Browse Source
This commit is contained in:
Abigail Gold 2019-12-08 03:16:08 -05:00
commit 725172f341
No known key found for this signature in database
GPG Key ID: CF88335E873C3FB4
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
exts/base.py
View File

@ -17,7 +17,7 @@ import discord.ext.commands as commands
import info
from data import options as opt
import data.options as opt
import common as cmn

4
exts/ham.py
View File

@ -84,7 +84,7 @@ class HamCog(commands.Cog):
if country.lower() not in callsign_info.options:
embed = discord.Embed(title=f'{country} not found!',
description=f'Valid countries: {", ".join(callsign_info.options.keys())}',
colour=self.gs.colours.bad,
colour=cmn.colours.bad,
timestamp=datetime.utcnow())
embed.set_footer(text=ctx.author.name,
icon_url=str(ctx.author.avatar_url))
@ -92,7 +92,7 @@ class HamCog(commands.Cog):
return
embed = discord.Embed(title=callsign_info.options[country.lower()][0],
description=callsign_info.options[country.lower()][1],
colour=self.gs.colours.good,
colour=cmn.colours.good,
timestamp=datetime.utcnow())
embed.set_footer(text=ctx.author.name,
icon_url=str(ctx.author.avatar_url))

2
exts/qrz.py
View File

@ -17,7 +17,7 @@ import aiohttp
from lxml import etree
import common as cmn
import keys
import data.keys as keys
class QRZCog(commands.Cog):

4
main.py
View File

@ -17,8 +17,8 @@ from discord.ext import commands, tasks
import common as cmn
import info
from data import options as opt
from data import keys
import data.options as opt
import data.keys as keys
# --- Settings ---