Skip to content
This repository has been archived by the owner on Aug 24, 2022. It is now read-only.

Commit

Permalink
.serverinfo improvements - Minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Sakiut committed May 15, 2017
1 parent 58c84b6 commit eb5cfdd
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 23 deletions.
12 changes: 8 additions & 4 deletions FalltoSkyBot_Music.py
Original file line number Diff line number Diff line change
Expand Up @@ -827,8 +827,8 @@ async def userinfo(self, ctx, *, user=None):

try:
RolesList = get_user_roles(member)
createdAt = lol.dateConverter(member.created_at)
joinedAt = lol.dateConverter(member.joined_at)
createdAt = dateConverter(member.created_at)
joinedAt = dateConverter(member.joined_at)
Statut = str(member.status)
StatutFinal = Statut.capitalize()

Expand Down Expand Up @@ -869,10 +869,14 @@ async def serverinfo(self, ctx):
ServerEmbed.add_field(name = "Server ID", value = server.id)
ServerEmbed.add_field(name = "Owner's Name", value = server.owner.name)
ServerEmbed.add_field(name = "Owner's ID", value = server.owner.id)
ServerEmbed.add_field(name = "Text Channels", value = str(len(getTextChannels(server))))
ServerEmbed.add_field(name = "Voice Channels", value = str(len(getVoiceChannels(server))))
ServerEmbed.add_field(name = "Users", value = server.member_count)
ServerEmbed.add_field(name = "Verification level", value = VerifLevel.upper())
ServerEmbed.add_field(name = "Roles Count", value = str(len(server.role_hierarchy)))
ServerEmbed.add_field(name = "Region", value = formatServerRegion(server.region))
ServerEmbed.add_field(name = "Creation Date", value = lol.dateConverter(server.created_at))
ServerEmbed.add_field(name = "Creation Date", value = dateConverter(server.created_at))
ServerEmbed.add_field(name = "Emotes Count", value = str(len(server.emojis)))
ServerEmbed.add_field(name = "Roles", value = formatServerRoles(server.role_hierarchy), inline=False)
ServerEmbed.add_field(name = "Emojis", value = formatEmojis(server.emojis), inline = False)
ServerEmbed.set_footer(text = "Requested by {0}".format(ctx.message.author.name), icon_url = ctx.message.author.avatar_url)
Expand Down Expand Up @@ -905,7 +909,7 @@ async def convoque(self, ctx, user=None, *, reason):
ConvocEmbed.title = "Convocation"
ConvocEmbed.colour = 0x3498db
ConvocEmbed.set_thumbnail(url=member.avatar_url)
ConvocEmbed.description = "Vous avez été convoqué par l'administration du serveur {0} pour la raison qui suit. Vous êtes prié de vous rendre sur le serveur dans les plus brefs délais et de vous mettre en contact avec un des administrateurs ou des modérateurs".format(ctx.message.server.name)
ConvocEmbed.description = "Vous avez été convoqué par l'administration du serveur **{0}** pour la raison qui suit. Vous êtes prié de vous rendre sur le serveur dans les plus brefs délais et de vous mettre en contact avec un des administrateurs ou des modérateurs".format(ctx.message.server.name)
ConvocEmbed.add_field(name = 'Raison', value = reason)
ConvocEmbed.set_footer(text = "Requested by {0}".format(ctx.message.author.name), icon_url = ctx.message.author.avatar_url)

Expand Down
21 changes: 19 additions & 2 deletions libraries/library.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ def getLDIcon(pseudo):

#####################################################################################################################################################

def getTextChannels(server:discord.Server):
def getTextChannels(server):
"""Retourne la liste des channels textuels du serveur"""

Channels = server.channels
Expand All @@ -235,7 +235,7 @@ def getTextChannels(server:discord.Server):

#####################################################################################################################################################

def getVoiceChannels(server:discord.Server):
def getVoiceChannels(server):
"""Retourne la liste des channels vocaux du serveur"""

Channels = server.channels
Expand All @@ -248,4 +248,21 @@ def getVoiceChannels(server:discord.Server):

return End

#####################################################################################################################################################

def dateConverter(date:str):
"""Convertit le format de lecture d'une date"""
date = str(date)

date2 = date.split('-')
date3 = date2[2]
date4 = date3.split(' ')
date5 = date4[1]
date6 = date5.split('.')
date7 = date6[0]
date8 = date7.split(':')

FinalDate = '{0}/{1}/{2} à {3}'.format(date4[0], date2[1], date2[0], date6[0])
return FinalDate

#####################################################################################################################################################
17 changes: 0 additions & 17 deletions libraries/lol.py
Original file line number Diff line number Diff line change
Expand Up @@ -241,23 +241,6 @@ def msToHourConverter(ms:int):

#####################################################################################################################################################

def dateConverter(date:str):
"""Convertit le format de lecture d'une date"""
date = str(date)

date2 = date.split('-')
date3 = date2[2]
date4 = date3.split(' ')
date5 = date4[1]
date6 = date5.split('.')
date7 = date6[0]
date8 = date7.split(':')

FinalDate = '{0}/{1}/{2} à {3}'.format(date4[0], date2[1], date2[0], date6[0])
return FinalDate

#####################################################################################################################################################

def getFreeChamps():

request = requests.get("https://euw1.api.riotgames.com/lol/platform/v3/champions?freeToPlay=true&api_key=" + ApiKey)
Expand Down

0 comments on commit eb5cfdd

Please sign in to comment.