Finally got everything working

pull/2/head
sgoudham 5 years ago
parent 939516bcb1
commit ae1666de48

@ -107,7 +107,8 @@ async def on_member_join(member):
await new_people.send(embed=embed) await new_people.send(embed=embed)
general_welcome = f"Welcome to the server! {member.mention} I hope you enjoy your stay here. Please go into <#722347423913213992> to choose some ping-able roles for events!" general_welcome = f"Welcome to the server! {member.mention} I hope you enjoy your stay here. Please go into " \
f"<#722347423913213992> to choose some ping-able roles for events! "
await general.send(general_welcome) await general.send(general_welcome)
except Exception as e: except Exception as e:

@ -1,7 +1,6 @@
import asyncio import asyncio
import datetime import datetime
import random import random
import string
import discord import discord
from discord.ext import commands from discord.ext import commands
@ -124,25 +123,18 @@ class Waifus(commands.Cog):
'gria', 'lilu', 'marcus', 'eric', 'ifrah', 'gria', 'lilu', 'marcus', 'eric', 'ifrah',
'janet', 'connor', 'taz', 'ryder', 'clarity'] 'janet', 'connor', 'taz', 'ryder', 'clarity']
proper_name = name.lower()
if name: if name:
proper_name = name.lower()
try: try:
with open(f'images/ServerMembers/{proper_name}.txt') as file: with open(f'images/ServerMembers/{proper_name}.txt') as file:
images_array = file.readlines() images_array = file.readlines()
embed = displayServerImage(images_array, ctx, proper_name) embed = displayServerImage(images_array, ctx, proper_name)
await ctx.send(embed=embed) await ctx.send(embed=embed)
except Exception as e: except Exception as e:
print(e) print(e)
await ctx.send(f"Sorry! That person doesn't exist!! Try the names listed below!")
nice = string.capwords(', '.join(map(str, array)))
await ctx.send(nice)
else: else:
with open(f'images/ServerMembers/{random.choice(array)}.txt') as file: with open(f'images/ServerMembers/{random.choice(array)}.txt') as file:
array = file.readlines() array = file.readlines()
@ -152,7 +144,7 @@ class Waifus(commands.Cog):
userAvatar = member.avatar_url userAvatar = member.avatar_url
embed = discord.Embed( embed = discord.Embed(
title=f"**Oh Look! A Cute Person <a:huh:676195228872474643> <a:huh:676195228872474643> **", title=f"Oh Look! A Cute Person <a:huh:676195228872474643> <a:huh:676195228872474643> ",
colour=discord.Colour(random.choice(colour_list))) colour=discord.Colour(random.choice(colour_list)))
embed.set_image(url=random.choice(array)) embed.set_image(url=random.choice(array))
embed.set_footer(text=f"Requested by {member}", icon_url='{}'.format(userAvatar)) embed.set_footer(text=f"Requested by {member}", icon_url='{}'.format(userAvatar))
@ -162,30 +154,18 @@ class Waifus(commands.Cog):
def displayServerImage(array, ctx, name): def displayServerImage(array, ctx, name):
if str(ctx.channel) in channels: if str(ctx.channel) in channels:
if name == 'studentjon': # set member as the author
# set member as the author member = ctx.message.author
member = ctx.message.author userAvatar = member.avatar_url
userAvatar = member.avatar_url
embed = discord.Embed(
embed = discord.Embed( title=f"**Oh Look! A Cute Picture of {name.capitalize()}!! <a:huh:676195228872474643> <a:huh:676195228872474643> **",
title=f"**Oh Look! A Cute Picture of Student Jon!! <a:huh:676195228872474643> <a:huh:676195228872474643> **", colour=discord.Colour(random.choice(colour_list)))
colour=discord.Colour(random.choice(colour_list))) embed.set_image(url=random.choice(array))
embed.set_image(url=random.choice(array)) embed.set_footer(text=f"Requested by {member}", icon_url='{}'.format(userAvatar))
embed.set_footer(text=f"Requested by {member}", icon_url='{}'.format(userAvatar)) embed.timestamp = datetime.datetime.utcnow()
embed.timestamp = datetime.datetime.utcnow()
else: return embed
# set member as the author
member = ctx.message.author
userAvatar = member.avatar_url
embed = discord.Embed(
title=f"**Oh Look! A Cute Picture of {name.capitalize()}!! <a:huh:676195228872474643> <a:huh:676195228872474643> **",
colour=discord.Colour(random.choice(colour_list)))
embed.set_image(url=random.choice(array))
embed.set_footer(text=f"Requested by {member}", icon_url='{}'.format(userAvatar))
embed.timestamp = datetime.datetime.utcnow()
return embed
# Error handling function to make sure that the commands only work in bot-commands # Error handling function to make sure that the commands only work in bot-commands

Loading…
Cancel
Save