mirror of
				https://github.com/miaowware/qrm2.git
				synced 2025-11-03 19:50:20 -05:00 
			
		
		
		
	Merge pull request #93 from classabbyamp/data-imports-fix
fix data imports
This commit is contained in:
		
						commit
						72d724af04
					
				@ -17,7 +17,7 @@ import discord.ext.commands as commands
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import info
 | 
					import info
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from data import options as opt
 | 
					import data.options as opt
 | 
				
			||||||
import common as cmn
 | 
					import common as cmn
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -84,7 +84,7 @@ class HamCog(commands.Cog):
 | 
				
			|||||||
        if country.lower() not in callsign_info.options:
 | 
					        if country.lower() not in callsign_info.options:
 | 
				
			||||||
            embed = discord.Embed(title=f'{country} not found!',
 | 
					            embed = discord.Embed(title=f'{country} not found!',
 | 
				
			||||||
                                  description=f'Valid countries: {", ".join(callsign_info.options.keys())}',
 | 
					                                  description=f'Valid countries: {", ".join(callsign_info.options.keys())}',
 | 
				
			||||||
                                  colour=self.gs.colours.bad,
 | 
					                                  colour=cmn.colours.bad,
 | 
				
			||||||
                                  timestamp=datetime.utcnow())
 | 
					                                  timestamp=datetime.utcnow())
 | 
				
			||||||
            embed.set_footer(text=ctx.author.name,
 | 
					            embed.set_footer(text=ctx.author.name,
 | 
				
			||||||
                             icon_url=str(ctx.author.avatar_url))
 | 
					                             icon_url=str(ctx.author.avatar_url))
 | 
				
			||||||
@ -92,7 +92,7 @@ class HamCog(commands.Cog):
 | 
				
			|||||||
            return
 | 
					            return
 | 
				
			||||||
        embed = discord.Embed(title=callsign_info.options[country.lower()][0],
 | 
					        embed = discord.Embed(title=callsign_info.options[country.lower()][0],
 | 
				
			||||||
                              description=callsign_info.options[country.lower()][1],
 | 
					                              description=callsign_info.options[country.lower()][1],
 | 
				
			||||||
                              colour=self.gs.colours.good,
 | 
					                              colour=cmn.colours.good,
 | 
				
			||||||
                              timestamp=datetime.utcnow())
 | 
					                              timestamp=datetime.utcnow())
 | 
				
			||||||
        embed.set_footer(text=ctx.author.name,
 | 
					        embed.set_footer(text=ctx.author.name,
 | 
				
			||||||
                         icon_url=str(ctx.author.avatar_url))
 | 
					                         icon_url=str(ctx.author.avatar_url))
 | 
				
			||||||
 | 
				
			|||||||
@ -17,7 +17,7 @@ import aiohttp
 | 
				
			|||||||
from lxml import etree
 | 
					from lxml import etree
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import common as cmn
 | 
					import common as cmn
 | 
				
			||||||
import keys
 | 
					import data.keys as keys
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class QRZCog(commands.Cog):
 | 
					class QRZCog(commands.Cog):
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user