Merge branch 'main' into main

makayla-moster · Oct 1, 2023 · 27f18b3 · 27f18b3
2 parents 388e7f1 + 45a0598
commit 27f18b3
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 9 deletions.
diff --git a/cog_modules/random/cog.py b/cog_modules/random/cog.py
@@ -50,7 +50,7 @@ async def gizmo(self, ctx: commands.Context):
         if most_common[0][1] != most_common[1][1] and pic == most_common[0][0]:
             info += f" HammerBot's favorite Gizmo pic! Shown {most_common[0][1]} times."
         elif gizmoResources[pic] == 1:
-            info += " First! ^_^"
+            info += " First time shown! ^_^"
         else:
             info += f" Shown {gizmoResources[pic]} times."
         await ctx.send(info)
@@ -60,24 +60,24 @@ async def gizmo(self, ctx: commands.Context):
     async def gizmo_error(self, ctx, error):
         if isinstance(error, commands.CommandOnCooldown):
             await ctx.send(
-                f"You can only view Gizmo once every 30 seconds. Try again in {round(error.retry_after, 2)} seconds."
+                f"Gizmo likes to hide, so you can only view him once every 30 seconds. Try again in {round(error.retry_after, 2)} seconds."
             )
 
     @commands.command(name="!tao", aliases=["!taø"])
     @commands.cooldown(1, 30, commands.BucketType.user)
     async def tao(self, ctx: commands.Context):
-        last_update = datetime.datetime.fromisoformat('2023-08-25T12:58:32-04:00')
-        time_delta = datetime.datetime.now(datetime.timezone.utc) - last_update
-
-        info = f" {str(time_delta)} since a new Tao sighting"
-        pic = taoPics[0]
+        num = random.randint(0, len(taoPics) - 1)
+        info = f"Tao #{num + 1} of {len(taoPics)}"
+        pic = taoPics[num]
         await ctx.send(info)
         await ctx.send(pic)
 
     @tao.error
     async def tao_error(self, ctx, error):
         if isinstance(error, commands.CommandOnCooldown):
-            await ctx.send(f"You can only view Tao once every 30 seconds. Try again in {round(error.retry_after, 2)} seconds.")
+            await ctx.send(
+                f"Tao is shy, so you can only view him once every 30 seconds. Try again in {round(error.retry_after, 2)} seconds."
+            )
 
     # Checks to see if someone DMs the bot
     # If so, it forwards the message to a specific channel and replies to the

diff --git a/gizmoResources b/gizmoResources
diff --git a/gizmopics.py b/gizmopics.py
@@ -162,6 +162,68 @@
     "https://cdn.discordapp.com/attachments/1105932220838989834/1151944507395411968/IMG_4678.jpg",
     "https://cdn.discordapp.com/attachments/1105932220838989834/1151944507714195576/IMG_4681.jpg",
     "https://cdn.discordapp.com/attachments/1105932220838989834/1151944508154593290/IMG_4683.jpg",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1153132128217858108/IMG_4698.jpg?ex=651abdbb&is=65196c3b&hm=fa7c4eafda897fe124011c040bbf5d0349ec29386ec8b3f7bd5c48b6e5db78bd&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1153132128536641586/IMG_4695.jpg?ex=651abdbb&is=65196c3b&hm=07e4bf8e0bab1518e627869ea781641171454e4a749d80d5ac46c0af7aaf2455&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1153132128888967189/IMG_2600.jpg?ex=651abdbb&is=65196c3b&hm=adcd84ab455581f5e433933245aeb28943cf7a0f2e25de54e8f3138d9a0eed13&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1153132129371291738/IMG_4686.jpg?ex=651abdbb&is=65196c3b&hm=9afbcfe5be950c3b6c61bcf8597b548fa9c0072172761c1dbaf51b4c593e31c4&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1153375838960623717/IMG_4707.jpg?ex=651af7f4&is=6519a674&hm=23c8c550dff4e0711aba1442da2a1384872876480269f4df7b4ef5d4cf87af44&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1153375839535239178/IMG_4714.jpg?ex=651af7f4&is=6519a674&hm=cd65d5d682ee03a7f0012d422f42e95922731a1f01c305be28326bca93fca091&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1153375839979835462/IMG_4718.jpg?ex=651af7f4&is=6519a674&hm=d8f5dc0c459ad00b98f5bcf461e494eba841e4528b92d0356d2a757aeec65b89&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1153875747816095824/IMG_4736.jpg?ex=651acf48&is=65197dc8&hm=9491e68f9d8acfe5932053dede4b3e9a4e62c3a48d4e491e91cd9ff338e89adc&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1153875748164214814/IMG_4744.jpg?ex=651acf48&is=65197dc8&hm=62962e647da1c2d6292315e9f1450f2af6222e0caa421bb1e4857cc3e4c598f4&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1153875748466196530/IMG_4752.jpg?ex=651acf48&is=65197dc8&hm=3ca9540930ac1e11fd69dc2d7f21da0f85b46de01656042eb14d197383b6f205&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1154096246827524181/IMG_4757.jpg?ex=651af3e3&is=6519a263&hm=215f0befc4ceb59d970f290f2955811ed416684054be11b69c623b5c7f6bc29a&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1154597053675085855/IMG_4793.jpg?ex=651acc0c&is=65197a8c&hm=059f404719e262b9e7bb03e956223182bf533f17b54f5946dbad008a6ee9a225&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1154597054279057518/IMG_4790.jpg?ex=651acc0d&is=65197a8d&hm=83fafd594f96a97d9cc6b3bd7af0ae799bc1a4722af22a55a01408e7d069b87d&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1154599068786491422/IMG_4775.jpg?ex=651acded&is=65197c6d&hm=ea686564ea439e16274d59706ac3d1260b0bf2135bcbbdac0b9e8d236f774293&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1154599069403062392/IMG_4772.jpg?ex=651acded&is=65197c6d&hm=cc55398cfa1a522fde026c8415a025e76674883120b0dbc3cef4d3628a3e662d&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1154599069835087892/IMG_4769.jpg?ex=651acded&is=65197c6d&hm=6a6c9829bf8f87b575972c3e9bec77aa543368833e0dd5d808368acedd2e4566&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1155550153420312676/IMG_4843.jpg?ex=651af7f1&is=6519a671&hm=cb51676c827f2b2ae75403be855b659070661c932c0e1c4dcf200a1803e1cbb6&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1155550153814585355/IMG_4844.jpg?ex=651af7f1&is=6519a671&hm=3ec1afcc45ffa73114a255c104def5b701067cbb1f47caf79e931dd2452cd8ee&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1155550154401779763/IMG_4845.jpg?ex=651af7f1&is=6519a671&hm=563165a87c2ed0adb9bf94b137e009ed1dfa448fe79959c39e8f579477918e3f&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1156233330501636116/IMG_4873.jpg?ex=651ad133&is=65197fb3&hm=3d72a54ae1642b982662e6ee013f3b8e07ff5efe4678e5bdb7688a191cece16b&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1156415869447049216/IMG_4890.jpg?ex=651ad274&is=651980f4&hm=e384cb778e9d3fc2f4c2a0ae2a67f5597df4709a2c9ecf7745e8899ad9dbcc5f&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1158183097167265852/IMG_4943.jpg?ex=651b5190&is=651a0010&hm=cf7d438f46e9ccfb2c53f0ea818e45c9e19c947afef529360ae4e8cd9c4303a9&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1158183097477640372/IMG_4942.jpg?ex=651b5190&is=651a0010&hm=288413382c2c423fd37baffa1183ec300debbe44aa41244ae3bd34a3b24500bd&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1158183097842532372/IMG_4917.jpg?ex=651b5190&is=651a0010&hm=c832f35f0393ba82b749a05da8d1009895a83c2ec95187b0ad96df9b8507e76f&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1158183098312310875/IMG_4912.jpg?ex=651b5190&is=651a0010&hm=3132252714a2e49f36638c56185bca7a5cc0e43d73fd50171f88e4c0cefad31b&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1158183098652045363/IMG_4909.jpg?ex=651b5190&is=651a0010&hm=54a20963bd84ee4dfbdc9e1f9cadb5d44038769d7767afa858714ffb7143a380&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1158183099075657748/IMG_4907.jpg?ex=651b5190&is=651a0010&hm=4d7a7105203aed8c05eac90ececfa9ea039cd28057fe71adefd09722efc0a15c&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1158183099490910359/IMG_4903.jpg?ex=651b5190&is=651a0010&hm=b15ef1fb3f21128a7e93e9ad8f68e42a145897ec469ddaab2d16c3f615a1d07e&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1158183099943890984/IMG_4898.jpg?ex=651b5191&is=651a0011&hm=71d70b5c0a3d2d6376d2861347fe6f6c39af0975ac52d043cdfc4c4bf46087f5&",
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1158183100501721158/IMG_4869.jpg?ex=651b5191&is=651a0011&hm=af4919a3e5ac2bfdfd607acf5c99a97a55f3ed11d06aad8f0a56e76b560be25c&",
 ]
 
-taoPics = ["https://cdn.discordapp.com/attachments/1105932220838989834/1144676822957695127/image.png"]
+taoPics = [
+    "https://cdn.discordapp.com/attachments/1105932220838989834/1144676822957695127/image.png",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182056786927657/IMG_20210806_025304.jpg?ex=651b5098&is=6519ff18&hm=6650fa52ae0363e28ed1a8631649a0fc4a703fcd532be04beecf8d9d3988aa10&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182057135046656/IMG_20210806_140000.jpg?ex=651b5098&is=6519ff18&hm=3ca291ab1de8e5055bf2e2f003c81c02fc13a3b1af85b4ee0996fc06ea22d169&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182057592246374/IMG_20210810_161614.jpg?ex=651b5098&is=6519ff18&hm=9c477e98ecad79a30d3c7d6000e2960cc11db6e6ab69b3d71f69c26c4c6ff8fe&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182057940361218/IMG_20210822_161633.jpg?ex=651b5098&is=6519ff18&hm=1e75edad578aa6480f3553004e78921c56a53b4f1ca870972348ea007483fa62&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182058347200512/IMG_20210822_161709.jpg?ex=651b5098&is=6519ff18&hm=0f88d2040db6ca5089023a9ebb7d8d132611c8b0df7a60902e43bf972c58d48f&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182058737279016/IMG_20210823_135725.jpg?ex=651b5098&is=6519ff18&hm=6ed1cc86198db83ed67f1334b9cc75e1ce45a4182a8a2c5c2c9b5a4ba23bea79&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182059064426526/IMG_20210717_190200_Cropped.jpg?ex=651b5098&is=6519ff18&hm=75e3dd5654e4df9eedb0d7aa4472a1df6b39fad1ec61a7f66e13b4f98ac432fa&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182059320287353/IMG_20210717_190201.jpg?ex=651b5098&is=6519ff18&hm=27fcf5b8634d32c673ed7f9dbe9c348d2aab6c7d09c7a244a018e6c96f4a2013&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182059618074624/IMG_20210717_190201_01.jpg?ex=651b5098&is=6519ff18&hm=ec3eda2e692b77bd75756e592ae77322f20af8c224dc229a0e5c79362f7427e3&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182059995582504/IMG_20210727_130119.jpg?ex=651b5099&is=6519ff19&hm=7ca1cd1599121bde4740ca6d24b91fbc92db855a894d3df2935ce1cd8ae687ef&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182142338142328/PXL_20210720_152455159.jpg?ex=651b50ac&is=6519ff2c&hm=a0b42df74e3394ca912c1ea24445ba197c4da50ce17256c24acda8dcbc0a7ad7&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182142946324580/PXL_20210727_130802818.jpg?ex=651b50ac&is=6519ff2c&hm=43973fe1876009f84425076ebbd4f0e5ac2736a77ed55b8ea04a479b1c97122a&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182143470620702/PXL_20210810_164452047.jpg?ex=651b50ac&is=6519ff2c&hm=c66eea77e26ae938b027feb8adfcb0c64a3b9d6aad358c5433f063084a89b98a&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182144003281027/PXL_20210810_164453159.jpg?ex=651b50ad&is=6519ff2d&hm=9861a5016bd59fb5d4b00351bd4eb272a9e5f5ee2158c6a9831e7f24f4cd5453&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182144556937266/PXL_20210810_165218368.jpg?ex=651b50ad&is=6519ff2d&hm=3dff03aa06e46ae5d2986a17db01ed6ddc61c733ddd8d26b05bd757f04202482&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182145941065738/PXL_20210716_164746553.jpg?ex=651b50ad&is=6519ff2d&hm=570d974500a9f113264f43da03ebfd5546d8533dadfb720bf873af58521e595a&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182146259816479/PXL_20210716_170403194.jpg?ex=651b50ad&is=6519ff2d&hm=ee036e53cf0d15685f255976bf4e1512b8508b9ae8418fd9224d52e35e64e44d&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182146654089316/PXL_20210716_170635770.jpg?ex=651b50ad&is=6519ff2d&hm=7a47be111de4723556da5e97bda76a863550706a934d6931e83825b8b37df89c&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182147119665172/PXL_20210719_113045652.jpg?ex=651b50ad&is=6519ff2d&hm=7fbb3d17a8f522c774952e3255e45fc76f10ad7bbf5aabcea41720ab147092de&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182147723628626/PXL_20210720_152426562.jpg?ex=651b50ae&is=6519ff2e&hm=cfb656d5a7295730b20eaae51d191adb190b07e0bd7c025b2c45cd122cd2aa8c&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182185468182599/PXL_20210819_011338665.jpg?ex=651b50b7&is=6519ff37&hm=ca51f283a17f95d1fbe13548f4daf225c701482dc8b728ee04ddaba010fae57e&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182185845665812/PXL_20210819_011349875.jpg?ex=651b50b7&is=6519ff37&hm=946d1c2c327c93b369dd7b912b54bc2678366cdabcd9af5ac733a2f40771b163&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182186525147136/PXL_20210822_190305796.jpg?ex=651b50b7&is=6519ff37&hm=9d3ff65f3a15169ed8af3458f722b3f763080c48b6e7fb81241330baaa44066e&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182187124928572/PXL_20210913_215018662.jpg?ex=651b50b7&is=6519ff37&hm=9969ddb658e41d62f2b0f8d05671dfcadb765e550b789ffe713fd2e694f13d28&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182187384979506/PXL_20210921_215728148.jpg?ex=651b50b7&is=6519ff37&hm=a6ee0d6820c648d2b23a40e5c1bdb9c30c411a17dcff2df78c03ebd4d88b0aae&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182187674374244/PXL_20210922_163554891.jpg?ex=651b50b7&is=6519ff37&hm=a2f71964b1d5fb59129d05162e37e5dd1eb2247fba470d946019e62e55cee5ff&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182188114784358/PXL_20210923_164549771_exported_0.jpg?ex=651b50b7&is=6519ff37&hm=9d76285ba6e803be9e04371d6df20c3113c324d049c660124e78bea181871ee6&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182188370640947/PXL_20210817_004933739.jpg?ex=651b50b7&is=6519ff37&hm=43f414771649314f6c450e039889d05c579eed1db4a8bd6e0d848beefd2be4fe&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182189129797672/PXL_20210817_210128872.jpg?ex=651b50b7&is=6519ff37&hm=829fd1d2314d66969d0226176195cb2db57123b25830d47edd3c21aa5434fc3e&",
+    "https://cdn.discordapp.com/attachments/1158181434662584320/1158182189981249546/PXL_20210818_214212828.jpg?ex=651b50b8&is=6519ff38&hm=4652ada8273adfc19f9c72ca47a3eac6a1b05dfc9013998a99fb2372a025f46f&",
+]