diff --git a/EnsoBot.py b/EnsoBot.py index b4223400..86d93f1d 100644 --- a/EnsoBot.py +++ b/EnsoBot.py @@ -26,7 +26,7 @@ if __name__ == '__main__': @client.event async def on_ready(): print('Bot is ready.') - await client.change_presence(activity=discord.Game(name="Falling in Love 😍 😍")) + await client.change_presence(activity=discord.Activity(name="Falling in Love 😍 😍")) # Bot ~Ping command in milliseconds diff --git a/cogs/WaifuImages.py b/cogs/WaifuImages.py index 26ba553f..ed63546d 100644 --- a/cogs/WaifuImages.py +++ b/cogs/WaifuImages.py @@ -118,6 +118,11 @@ class Waifus(commands.Cog): @commands.command(aliases=['enso', 'Ensoperson']) @cooldown(1, 0.5, BucketType.channel) async def ensoperson(self, ctx, name=None): + array = ['hussein', 'inna', 'kaiju', 'kate', 'lukas', + 'marshall', 'stitch', 'zara', 'josh', 'ange', + 'gria', 'lilu', 'marcus', 'eric', 'ifrah', + 'janet', 'connor', 'taz'] + if name: try: with open(f'images/ServerMembers/{name}.txt') as file: @@ -135,9 +140,6 @@ class Waifus(commands.Cog): # Delete the message await message.delete() else: - array = ['hussein', 'inna', 'kaiju', 'kate', 'lukas', - 'marshall', 'stitch', 'zara', 'josh', 'ange', - 'gria', 'lilu', 'marcus', 'eric', 'ifrah'] with open(f'images/ServerMembers/{random.choice(array)}.txt') as file: array = file.readlines() diff --git a/images/ServerMembers/connor.txt b/images/ServerMembers/connor.txt new file mode 100644 index 00000000..84a6cb88 --- /dev/null +++ b/images/ServerMembers/connor.txt @@ -0,0 +1,4 @@ +https://cdn.discordapp.com/attachments/716424509858644018/722850781476421682/20200617_172255.jpg +https://cdn.discordapp.com/attachments/716424509858644018/722850781874880592/20200617_171631.jpg +https://cdn.discordapp.com/attachments/716424509858644018/722850782327865365/20200617_171750.jpg +https://cdn.discordapp.com/attachments/716424509858644018/722850783745540166/20200617_171858.jpg \ No newline at end of file diff --git a/images/ServerMembers/eric.txt b/images/ServerMembers/eric.txt index 889f18e2..8ca28ef3 100644 --- a/images/ServerMembers/eric.txt +++ b/images/ServerMembers/eric.txt @@ -1,4 +1,6 @@ https://cdn.discordapp.com/attachments/718933253326635169/722595432340914206/Snapchat-1361600299.jpg https://cdn.discordapp.com/attachments/718933253326635169/722595435037851738/Snapchat-1826984508.jpg https://cdn.discordapp.com/attachments/718933253326635169/722595438787559464/Snapchat-521200379.jpg -https://cdn.discordapp.com/attachments/718933253326635169/722595443745488956/SmartSelect_20200615-175448_Snapchat.jpg \ No newline at end of file +https://cdn.discordapp.com/attachments/718933253326635169/722595443745488956/SmartSelect_20200615-175448_Snapchat.jpg +https://media.discordapp.net/attachments/680383436023791659/721592198470172724/Snapchat-1765542708.jpg?width=330&height=658 +https://cdn.discordapp.com/attachments/680383436023791659/711661447691763732/Snapchat-1705301098.jpg diff --git a/images/ServerMembers/hussein.txt b/images/ServerMembers/hussein.txt index 9a1d2667..dc5a40fa 100644 --- a/images/ServerMembers/hussein.txt +++ b/images/ServerMembers/hussein.txt @@ -9,4 +9,19 @@ https://media.discordapp.net/attachments/713893224481161277/722615114536189952/i https://media.discordapp.net/attachments/713893224481161277/722615205942788156/image0.jpg?width=494&height=658 https://cdn.discordapp.com/attachments/713893224481161277/722628280234147880/image0.jpg https://cdn.discordapp.com/attachments/713893224481161277/722628347066187836/image0.jpg -https://cdn.discordapp.com/attachments/713893224481161277/722628435062685748/image0.jpg \ No newline at end of file +https://cdn.discordapp.com/attachments/713893224481161277/722628435062685748/image0.jpg +https://cdn.discordapp.com/attachments/680383436023791659/720871563658002432/image0.jpg +https://cdn.discordapp.com/attachments/680383436023791659/720249235198574642/image0.jpg +https://cdn.discordapp.com/attachments/680383436023791659/715239083034542130/image0.jpg +https://cdn.discordapp.com/attachments/680383436023791659/712558979749773372/image0.jpg +https://cdn.discordapp.com/attachments/680383436023791659/712558980240638002/image1.jpg +https://cdn.discordapp.com/attachments/680383436023791659/711806361712721990/image0.jpg +https://cdn.discordapp.com/attachments/680383436023791659/711486037368504430/image0.png +https://cdn.discordapp.com/attachments/680383436023791659/709978006151495731/image0.jpg +https://cdn.discordapp.com/attachments/680383436023791659/709297057994899476/image0.jpg +https://cdn.discordapp.com/attachments/680383436023791659/707803581176348702/image0.png +https://cdn.discordapp.com/attachments/680383436023791659/706754603894702150/image0.png +https://cdn.discordapp.com/attachments/680383436023791659/706353787706671164/image0.png +https://cdn.discordapp.com/attachments/680383436023791659/705261540844240942/image0.jpg +https://cdn.discordapp.com/attachments/680383436023791659/703748904272789614/image0.jpg +https://cdn.discordapp.com/attachments/680383436023791659/701602005394915338/image0.jpg diff --git a/images/ServerMembers/ifrah.txt b/images/ServerMembers/ifrah.txt index b7d05b3f..e9731a03 100644 --- a/images/ServerMembers/ifrah.txt +++ b/images/ServerMembers/ifrah.txt @@ -1,4 +1,8 @@ https://cdn.discordapp.com/attachments/715244698872053802/722835467644698724/Snapchat-658843104.jpg https://cdn.discordapp.com/attachments/715244698872053802/722835468231639060/IMG_20200521_223908_081.jpg https://cdn.discordapp.com/attachments/715244698872053802/722835468743344128/B612_20200101_171515_624.jpg -https://cdn.discordapp.com/attachments/715244698872053802/722835469335003136/19-11-05-15-57-27-365_deco.jpg \ No newline at end of file +https://cdn.discordapp.com/attachments/715244698872053802/722835469335003136/19-11-05-15-57-27-365_deco.jpg +https://cdn.discordapp.com/attachments/680383436023791659/720658410105733260/IMG_20200611_180037.jpg +https://cdn.discordapp.com/attachments/680383436023791659/718006462109974528/Snapchat-107795031.jpg +https://cdn.discordapp.com/attachments/680383436023791659/711646452803174470/20-05-17-22-27-50-900_deco.jpg +https://cdn.discordapp.com/attachments/680383436023791659/711512415128256572/B612_20200101_160934_735.jpg \ No newline at end of file diff --git a/images/ServerMembers/inna.txt b/images/ServerMembers/inna.txt index 99c1efb2..c6045e8c 100644 --- a/images/ServerMembers/inna.txt +++ b/images/ServerMembers/inna.txt @@ -8,4 +8,5 @@ https://media.discordapp.net/attachments/716823227409760337/722616461859749908/r https://cdn.discordapp.com/attachments/716823227409760337/722617441447968808/IMG_20191006_015744_993.jpg https://cdn.discordapp.com/attachments/716823227409760337/722668587311038494/OVooonBEmAs.jpg https://cdn.discordapp.com/attachments/716823227409760337/722668587650646116/9NzuNyC_fjY.jpg -https://cdn.discordapp.com/attachments/716823227409760337/722668588032458833/VeOlGB171rA.jpg \ No newline at end of file +https://cdn.discordapp.com/attachments/716823227409760337/722668588032458833/VeOlGB171rA.jpg +https://cdn.discordapp.com/attachments/680383436023791659/717056215242375199/20200531_220406.JPG \ No newline at end of file diff --git a/images/ServerMembers/janet.txt b/images/ServerMembers/janet.txt new file mode 100644 index 00000000..8227d4d1 --- /dev/null +++ b/images/ServerMembers/janet.txt @@ -0,0 +1,7 @@ +https://cdn.discordapp.com/attachments/713848149705228320/722669937595777024/S00505-224052.jpg +https://cdn.discordapp.com/attachments/713848149705228320/722669938107744286/P00429-180721.jpg +https://cdn.discordapp.com/attachments/713848149705228320/722669938577244170/IMG-20200217-WA0003.jpeg +https://cdn.discordapp.com/attachments/713848149705228320/722669938879496312/IMG-20191102-WA0015.jpg +https://cdn.discordapp.com/attachments/713848149705228320/722669939160383538/IMG-20191102-WA0004.jpg +https://cdn.discordapp.com/attachments/713848149705228320/722669939336675408/P90902-163854.jpg +https://cdn.discordapp.com/attachments/713848149705228320/722669939718357032/P90901-182500.jpg \ No newline at end of file diff --git a/images/ServerMembers/lukas.txt b/images/ServerMembers/lukas.txt index cebcf65f..1b9ca883 100644 --- a/images/ServerMembers/lukas.txt +++ b/images/ServerMembers/lukas.txt @@ -4,4 +4,6 @@ https://cdn.discordapp.com/attachments/716054176014008361/722624460720701520/ima https://cdn.discordapp.com/attachments/716054176014008361/722626395280375868/image0.jpg https://cdn.discordapp.com/attachments/716054176014008361/722626395813183488/image1.jpg https://cdn.discordapp.com/attachments/716054176014008361/722846929977081906/image0.jpg -https://cdn.discordapp.com/attachments/716054176014008361/722846930383667211/image1.jpg \ No newline at end of file +https://cdn.discordapp.com/attachments/716054176014008361/722846930383667211/image1.jpg +https://cdn.discordapp.com/attachments/680383436023791659/721588911209578546/image0.jpg +https://cdn.discordapp.com/attachments/680383436023791659/717961658458439700/image0.png \ No newline at end of file diff --git a/images/ServerMembers/marshall.txt b/images/ServerMembers/marshall.txt index 0822105e..2e50b63f 100644 --- a/images/ServerMembers/marshall.txt +++ b/images/ServerMembers/marshall.txt @@ -3,4 +3,16 @@ https://cdn.discordapp.com/attachments/713802573324222534/722577743245475941/Sna https://cdn.discordapp.com/attachments/713802573324222534/722577743555985418/20200518_130307.jpg https://cdn.discordapp.com/attachments/713802573324222534/722577743828484116/20200422_175943.jpg https://cdn.discordapp.com/attachments/713802573324222534/722577744076079154/Snapchat-445490543.jpg -https://cdn.discordapp.com/attachments/713802573324222534/722577744353034290/Snapchat-417158061.jpg \ No newline at end of file +https://cdn.discordapp.com/attachments/713802573324222534/722577744353034290/Snapchat-417158061.jpg +https://cdn.discordapp.com/attachments/680383436023791659/717101746215845898/Snapchat-1952879530.jpg +https://media.discordapp.net/attachments/663651584399507481/722851217168007228/20191202_062309.png +https://cdn.discordapp.com/attachments/680383436023791659/701570626711977984/Snapchat-1488172063.jpg +https://cdn.discordapp.com/attachments/680383436023791659/703671768828739734/Snapchat-109110195.jpg +https://cdn.discordapp.com/attachments/680383436023791659/704483548203057162/20200308_133046.jpg +https://cdn.discordapp.com/attachments/680383436023791659/698207730393022514/Snapchat-273336150.jpg +https://cdn.discordapp.com/attachments/680383436023791659/691849575937605642/Snapchat-612138955.jpg +https://cdn.discordapp.com/attachments/680383436023791659/691362684138160189/Snapchat-1715805373.jpg +https://cdn.discordapp.com/attachments/680383436023791659/691360153227886592/20200322_145639.jpg +https://cdn.discordapp.com/attachments/680383436023791659/689217566996299811/PicsArt_03-16-02.04.11.jpg +https://cdn.discordapp.com/attachments/680383436023791659/688800764470362213/Snapchat-1680380903.jpg +https://cdn.discordapp.com/attachments/680383436023791659/686699751613136898/Snapchat-2112953818.jpg \ No newline at end of file diff --git a/images/ServerMembers/stitch.txt b/images/ServerMembers/stitch.txt index 94190c5b..4954daac 100644 --- a/images/ServerMembers/stitch.txt +++ b/images/ServerMembers/stitch.txt @@ -4,5 +4,12 @@ https://media.discordapp.net/attachments/683124285304209482/722626567154434089/i https://media.discordapp.net/attachments/683124285304209482/722626289982242866/image0.png https://cdn.discordapp.com/attachments/683124285304209482/722815045049909261/image0.jpg https://cdn.discordapp.com/attachments/683124285304209482/722815091015417937/image0.jpg - - +https://cdn.discordapp.com/attachments/683124285304209482/722852359423918151/image0.png +https://cdn.discordapp.com/attachments/680383436023791659/695128292142874724/SmartSelect_20200401-194239_Discord.jpg +https://cdn.discordapp.com/attachments/680383436023791659/694755091189596200/Photo_1585688934516.jpg +https://cdn.discordapp.com/attachments/680383436023791659/691888558952415263/image0_2.jpg +https://cdn.discordapp.com/attachments/680383436023791659/691196960253673482/image0.png +https://cdn.discordapp.com/attachments/680383436023791659/690037077294841952/image0.jpg +https://cdn.discordapp.com/attachments/680383436023791659/689621610340417561/image0.jpg +https://cdn.discordapp.com/attachments/680383436023791659/689621423240642568/image0.jpg +https://cdn.discordapp.com/attachments/680383436023791659/689214572346998870/PicsArt_03-16-01.52.00.jpg \ No newline at end of file diff --git a/images/ServerMembers/taz.txt b/images/ServerMembers/taz.txt new file mode 100644 index 00000000..8ece84e1 --- /dev/null +++ b/images/ServerMembers/taz.txt @@ -0,0 +1,12 @@ +https://cdn.discordapp.com/attachments/715284376383914077/722849784452612167/image0.jpg +https://cdn.discordapp.com/attachments/715284376383914077/722850450667470908/image0.png +https://cdn.discordapp.com/attachments/715284376383914077/722850592313049118/image0.jpg +https://cdn.discordapp.com/attachments/715284376383914077/722850764224987136/image0.jpg +https://cdn.discordapp.com/attachments/715284376383914077/722851203993829418/image0.jpg +https://cdn.discordapp.com/attachments/715284376383914077/722851737031147593/image0.png +https://cdn.discordapp.com/attachments/715284376383914077/722852525690322944/image0.jpg +https://cdn.discordapp.com/attachments/715284376383914077/722852804305092729/image0.jpg +https://cdn.discordapp.com/attachments/715284376383914077/722853028725522442/image0.jpg +https://cdn.discordapp.com/attachments/715284376383914077/722853030038601748/image1.jpg +https://cdn.discordapp.com/attachments/715284376383914077/722853194270638170/image0.jpg +https://cdn.discordapp.com/attachments/715284376383914077/722853393835622440/image0.jpg \ No newline at end of file diff --git a/images/ServerMembers/zara.txt b/images/ServerMembers/zara.txt index 89c6a82a..ed1b88e3 100644 --- a/images/ServerMembers/zara.txt +++ b/images/ServerMembers/zara.txt @@ -12,4 +12,9 @@ https://cdn.discordapp.com/attachments/714671068941647933/722628024692113408/Sna https://cdn.discordapp.com/attachments/714671068941647933/722628025266470922/JPEG_20200119_222645.jpg https://cdn.discordapp.com/attachments/714671068941647933/722629495642783795/Snapchat-1004499435.jpg https://cdn.discordapp.com/attachments/714671068941647933/722629495881990214/Snapchat-1687000440.jpg -https://cdn.discordapp.com/attachments/714671068941647933/722629496305352704/Snapchat-1507200564.jpg \ No newline at end of file +https://cdn.discordapp.com/attachments/714671068941647933/722629496305352704/Snapchat-1507200564.jpg +https://cdn.discordapp.com/attachments/680383436023791659/718260785733697648/Snapchat-198126601.jpg +https://cdn.discordapp.com/attachments/680383436023791659/717567197840539698/20200602_223526.jpg +https://cdn.discordapp.com/attachments/680383436023791659/716337052181987418/unknown.png +https://cdn.discordapp.com/attachments/680383436023791659/715993654388457562/image0.jpg +https://cdn.discordapp.com/attachments/680383436023791659/716321900288147559/image0.jpg \ No newline at end of file