Compare commits

..

10 Commits

Author SHA1 Message Date
binlab
11f75e97cd ya vale con lo de la evau
Some checks failed
Update Bot / deploy-via-sftp (push) Failing after 11m52s
Update Bot / restart-bot (push) Has been cancelled
2024-06-13 14:12:00 +00:00
binlab
a92b066ecb suerte con la evau 2024-06-03 19:08:24 +00:00
binlab
4640d389a4 test 3 2024-06-03 19:06:38 +00:00
binlab
2c625c0c6c test 2 2024-06-03 19:05:16 +00:00
binlab
bc3f890825 test 2024-06-03 19:02:52 +00:00
binlab
8d46673092 jaja bromita 2024-05-30 17:17:54 +00:00
binlab
def16f0760 Update main.py 2024-05-30 17:16:11 +00:00
binlab
28893789bb Update .gitea/workflows/update-bot.yml 2024-05-30 17:13:36 +00:00
binlab
8b95218f84 Update .gitea/workflows/update-bot.yml 2024-05-30 17:11:42 +00:00
binlab
1d5a126d44 Update .gitea/workflows/update-bot.yml 2024-05-30 17:08:42 +00:00
2 changed files with 7 additions and 5 deletions

View File

@@ -18,7 +18,7 @@ jobs:
port: 22 port: 22
local_path: ./* local_path: ./*
remote_path: /home/admin/${{ env.REPO_NAME }}/ remote_path: /home/admin/${{ env.REPO_NAME }}/
ssh_private_key: ${{ env.SSH_PRIVATE_KEY }} password: ${{ secrets.SSH_PASS }}
restart-bot: restart-bot:
needs: [deploy-via-sftp] needs: [deploy-via-sftp]
@@ -30,4 +30,4 @@ jobs:
command: sudo systemctl start ${{ env.REPO_NAME }}-watcher.service & command: sudo systemctl start ${{ env.REPO_NAME }}-watcher.service &
host: 172.17.0.1 host: 172.17.0.1
user: root user: root
pass: ${{ secrets.SSH_PRIVATE_KEY }} pass: ${{ secrets.SSH_PASS }}

View File

@@ -7,6 +7,7 @@ import time
intents = discord.Intents.all() intents = discord.Intents.all()
allowed_mentions = discord.AllowedMentions(everyone = True)
# intents.members = True # intents.members = True
bot = commands.Bot(intents=intents) bot = commands.Bot(intents=intents)
@@ -151,7 +152,6 @@ async def mensaje_jueves():
except Exception as e: except Exception as e:
await send_log(f"rip. Error: ```{e}```") await send_log(f"rip. Error: ```{e}```")
@tasks.loop(hours = 1) @tasks.loop(hours = 1)
async def horario_enviar(): async def horario_enviar():
try: try:
@@ -213,12 +213,14 @@ async def rima(ctx, message):
elif message.content.lower().endswith("jueves") and message.author != bot.user: elif message.content.lower().endswith("jueves") and message.author != bot.user:
await ctx.reply(random.choices(["https://media.tenor.com/riA830QHvC8AAAAC/feliz-jueves-asuka.gif","https://media.tenor.com/L2-mDROrwgwAAAAd/racism.gif"], k=1, weights=[9,1])[0], mention_author=True) await ctx.reply(random.choices(["https://media.tenor.com/riA830QHvC8AAAAC/feliz-jueves-asuka.gif","https://media.tenor.com/L2-mDROrwgwAAAAd/racism.gif"], k=1, weights=[9,1])[0], mention_author=True)
elif message.content.lower().endswith("jueves ** **") and message.author == 518377522485002241: elif message.content.lower().endswith("jueves ** **") and message.author.id == 518377522485002241:
await ctx.reply("https://media.tenor.com/L2-mDROrwgwAAAAd/racism.gif", mention_author=True) await ctx.reply("https://media.tenor.com/L2-mDROrwgwAAAAd/racism.gif", mention_author=True)
elif any(i in message.content for i in ("33", "treinta y tres")) and message.author != bot.user: elif any(i in message.content for i in ("33", "treinta y tres")) and message.author != bot.user:
await ctx.reply("https://tenor.com/view/fernando-alonso-live-fernando-reaction-alonso-fernando-live-reaction-gif-1814768510923235803", delete_after=5) await ctx.reply("https://tenor.com/view/fernando-alonso-live-fernando-reaction-alonso-fernando-live-reaction-gif-1814768510923235803", delete_after=5)
elif message.content.lower() == "!evau" and message.author.id == 518377522485002241:
await mandar_ebau()
except Exception as e: except Exception as e:
await send_log(f"rip. Error: ```{e}```") await send_log(f"rip. Error: ```{e}```")