Geoffrey
/
Geoffrey-Django
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/joeyahines/Geoffrey

doc_update
Joey Hines 2018-08-29 13:38:45 -05:00
parent 6083e9d1c7 5e0e02989f
commit 3e7d721d2e
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
geoffrey/DatabaseModels.py
View File

@ -121,7 +121,7 @@ class Dimension(enum.Enum):
class Player(SQL_Base): class Player(SQL_Base):
__tablename__ = 'Players' __tablename__ = 'geoffrey_players'
id = Column(Integer, primary_key=True, autoincrement=True) id = Column(Integer, primary_key=True, autoincrement=True)
mc_uuid = Column(String(128)) mc_uuid = Column(String(128))
discord_uuid = Column(String(128)) discord_uuid = Column(String(128))
@ -140,7 +140,7 @@ class Player(SQL_Base):
class Tunnel(SQL_Base): class Tunnel(SQL_Base):
__tablename__ = 'Tunnels' __tablename__ = 'geoffrey_tunnels'
id = Column(Integer, primary_key=True, autoincrement=True) id = Column(Integer, primary_key=True, autoincrement=True)
tunnel_number = Column(Integer) tunnel_number = Column(Integer)
tunnel_direction = Column(Enum(TunnelDirection)) tunnel_direction = Column(Enum(TunnelDirection))
@ -171,7 +171,7 @@ class Tunnel(SQL_Base):
class Location(SQL_Base): class Location(SQL_Base):
__tablename__ = 'Locations' __tablename__ = 'geoffrey_locations'
id = Column(Integer, primary_key=True) id = Column(Integer, primary_key=True)
name = Column(String(128), unique=True) name = Column(String(128), unique=True)
@ -228,7 +228,7 @@ class Location(SQL_Base):
class Base(Location): class Base(Location):
__tablename__ = 'Bases' __tablename__ = 'geoffrey_bases'
base_id = Column(Integer, ForeignKey('Locations.id', ondelete='CASCADE'), primary_key=True) base_id = Column(Integer, ForeignKey('Locations.id', ondelete='CASCADE'), primary_key=True)
name = column_property(Column(String(128)), Location.name) name = column_property(Column(String(128)), Location.name)
@ -238,7 +238,7 @@ class Base(Location):
class Shop(Location): class Shop(Location):
__tablename__ = 'Shops' __tablename__ = 'geoffrey_shops'
shop_id = Column(Integer, ForeignKey('Locations.id', ondelete='CASCADE'), primary_key=True) shop_id = Column(Integer, ForeignKey('Locations.id', ondelete='CASCADE'), primary_key=True)
name = column_property(Column(String(128)), Location.name) name = column_property(Column(String(128)), Location.name)
inventory = relationship('ItemListing', back_populates='shop', cascade='all, delete-orphan', lazy='dynamic') inventory = relationship('ItemListing', back_populates='shop', cascade='all, delete-orphan', lazy='dynamic')
@ -270,7 +270,7 @@ class Shop(Location):
class ItemListing(SQL_Base): class ItemListing(SQL_Base):
__tablename__ = 'Items' __tablename__ = 'geoffrey_items'
id = Column(Integer, primary_key=True, autoincrement=True) id = Column(Integer, primary_key=True, autoincrement=True)
name = Column(String(128)) name = Column(String(128))
@ -290,4 +290,4 @@ class ItemListing(SQL_Base):
return '**{}** **{}** for **{}D**'.format(self.amount, self.name, self.price) return '**{}** **{}** for **{}D**'.format(self.amount, self.name, self.price)
def __str__(self): def __str__(self):
return '**{}**, selling {}'.format(self.shop.name, self.listing_str()) return '**{}**, selling {}'.format(self.shop.name, self.listing_str())

2
geoffrey/bot.py
View File

@ -52,7 +52,7 @@ async def on_ready():
info = await bot.application_info() info = await bot.application_info()
url = oauth_url(info.id) url = oauth_url(info.id)
logger.info("Bot url: %s", url) logger.info("Bot url: %s", url)
await bot.change_presence(game=Game(name=bot_config.status)) await bot.change_presence(activity=Game(bot_config.status))
@bot.event @bot.event

2
geoffrey/cogs/Admin_Commands.py
View File

@ -122,7 +122,7 @@ class Admin_Commands:
""" """
Updates "playing [game]" status of the bot. Updates "playing [game]" status of the bot.
""" """
await self.bot.change_presence(game=Game(name=status)) await self.bot.change_presence(activity=Game(status))
await self.bot.say('{}, status has been changed'.format(ctx.message.author.mention)) await self.bot.say('{}, status has been changed'.format(ctx.message.author.mention))

2
setup.py
View File

@ -3,7 +3,7 @@ from distutils.core import setup
setup( setup(
name='Geoffrey', name='Geoffrey',
version=__import__('geoffrey').__version__, version=__import__('geoffrey').__version__,
packages=['geoffrey'], packages=['geoffrey', 'geoffrey.cogs'],
install_requires=['discord.py', 'SQLAlchemy', 'pymysql', 'requests'], install_requires=['discord.py', 'SQLAlchemy', 'pymysql', 'requests'],
long_description=open('README.txt').read(), long_description=open('README.txt').read(),
) )