Browse Source

Merge remote-tracking branch 'origin/master'

master
DrBot7 4 years ago
parent
commit
eb1461cb6c
  1. 16
      README.md
  2. 47
      bot.py
  3. 174
      cogs/linking_panel.py
  4. 115
      cogs/linking_updater_panel.py
  5. 0
      cogs/timings.py

16
README.md

@ -1,12 +1,12 @@
# Botflop
# "Botflop"
[Click here](https://discord.com/api/oauth2/authorize?client_id=787929894616825867&permissions=0&scope=bot) to invite Botflop to your server [Click here](https://discord.com/api/oauth2/authorize?client_id=787929894616825867&permissions=0&scope=bot) to invite Botflop to your server
# Current abilities # Current abilities
## Analyze timings reports ## Analyze timings reports
Paste a timings report to review an in-depth description of potential optimizations. You can try it out yourself on our [Discord](https://discord.gg/zsz3PzT) Paste a timings report to review an in-depth description of potential optimizations. You can try it out yourself on our [Discord](https://discord.gg/zsz3PzT)
![Timings 1](https://i.imgur.com/MT6ScnL.png)
![Timings 2](https://i.imgur.com/2ApteF5.png)
![Timings 1](https://i.imgur.com/nt6EUVN.png)
![Timings 2](https://i.imgur.com/BTfed8r.png)
## Hastebin upload ## Hastebin upload
Botflop converts text files into bin links. You can try it out yourself on our [Discord](https://discord.gg/zsz3PzT) Botflop converts text files into bin links. You can try it out yourself on our [Discord](https://discord.gg/zsz3PzT)
@ -15,10 +15,6 @@ Botflop converts text files into bin links. You can try it out yourself on our [
![latest.log](https://i.imgur.com/AoZGQRi.png) ![latest.log](https://i.imgur.com/AoZGQRi.png)
![config.yml](https://i.imgur.com/qovRot8.png) ![config.yml](https://i.imgur.com/qovRot8.png)
## Pterodactyl linking
* Links Pterodactyl panel and Discord accounts
* Ensures backups even when running with Blesta
## In Progress
* `.update` command to update either all available plugins to the latest version or just one plugin
* ability to fix all timings recommendations with one click or one click per recommendation
## React
Botflop reacts to messages (requires Administrator permission)
![reaction](https://i.imgur.com/o1swgZw.png)

47
bot.py

@ -8,36 +8,15 @@ from discord.ext import commands, tasks
from discord.ext.commands import has_permissions, MissingPermissions from discord.ext.commands import has_permissions, MissingPermissions
from dotenv import load_dotenv from dotenv import load_dotenv
import aiohttp import aiohttp
import asyncio
import paramiko
from unidecode import unidecode
# import subprocess # import subprocess
bot = commands.Bot(command_prefix=".", intents=discord.Intents.default(), bot = commands.Bot(command_prefix=".", intents=discord.Intents.default(),
case_insensitive=True) case_insensitive=True)
load_dotenv()
load_dotenv()
token = os.getenv('token') token = os.getenv('token')
crabwings_role_id = int(os.getenv('crabwings_role_id'))
duckfeet_role_id = int(os.getenv('duckfeet_role_id'))
elktail_role_id = int(os.getenv('elktail_role_id'))
client_role_id = int(os.getenv('client_role_id'))
subuser_role_id = int(os.getenv('subuser_role_id'))
verified_role_id = int(os.getenv('verified_role_id'))
guild_id = int(os.getenv('guild_id'))
verification_channel = int(os.getenv('verification_channel'))
verification_message = int(os.getenv('verification_message'))
application_api_key = os.getenv('application_api_key')
running_on_panel = str(os.getenv('running_on_panel'))
crabwings_ip = os.getenv('crabwings_ip')
crabwings_port = int(os.getenv('crabwings_port'))
crabwings_username = os.getenv('crabwings_username')
crabwings_password = os.getenv('crabwings_password')
if running_on_panel == "False":
running_on_panel = False
else:
running_on_panel = True
logging.basicConfig(filename='console.log', logging.basicConfig(filename='console.log',
level=logging.INFO, level=logging.INFO,
@ -54,7 +33,6 @@ async def on_ready():
@bot.event @bot.event
async def on_message(message): async def on_message(message):
if not running_on_panel:
# Binflop # Binflop
if len(message.attachments) > 0: if len(message.attachments) > 0:
if not message.attachments[0].url.endswith( if not message.attachments[0].url.endswith(
@ -65,6 +43,7 @@ async def on_message(message):
# r = requests.get(download, allow_redirects=True) # r = requests.get(download, allow_redirects=True)
text = await r.text() text = await r.text()
text = unidecode(text)
text = "\n".join(text.splitlines()) text = "\n".join(text.splitlines())
if '' not in text: # If it's not an image/gif if '' not in text: # If it's not an image/gif
truncated = False truncated = False
@ -87,36 +66,20 @@ async def on_message(message):
@bot.command() @bot.command()
async def ping(ctx): async def ping(ctx):
if running_on_panel:
if guild_id == ctx.guild.id:
await ctx.send(f'Private bot ping is {round(bot.latency * 1000)}ms')
if not running_on_panel:
await ctx.send(f'Public bot ping is {round(bot.latency * 1000)}ms')
await ctx.send(f'Birdflop bot ping is {round(bot.latency * 1000)}ms')
@bot.command(name="react", pass_context=True) @bot.command(name="react", pass_context=True)
@has_permissions(administrator=True) @has_permissions(administrator=True)
async def react(ctx, url, reaction): async def react(ctx, url, reaction):
if not running_on_panel:
channel = await bot.fetch_channel(int(url.split("/")[5])) channel = await bot.fetch_channel(int(url.split("/")[5]))
message = await channel.fetch_message(int(url.split("/")[6])) message = await channel.fetch_message(int(url.split("/")[6]))
await message.add_reaction(reaction) await message.add_reaction(reaction)
logging.info('reacted to ' + url + ' with ' + reaction) logging.info('reacted to ' + url + ' with ' + reaction)
if running_on_panel:
for file_name in os.listdir('./cogs'):
if file_name.endswith('_panel.py'):
bot.load_extension(f'cogs.{file_name[:-3]}')
else:
for file_name in os.listdir('./cogs'): for file_name in os.listdir('./cogs'):
if file_name.endswith('_public.py'):
if file_name.endswith('.py'):
bot.load_extension(f'cogs.{file_name[:-3]}') bot.load_extension(f'cogs.{file_name[:-3]}')
if running_on_panel:
print("running on panel, starting loops")
updater.start()
linking_updater = bot.get_cog('Linking_updater')
linking_updater.linking_updater.start()
bot.run(token) bot.run(token)

174
cogs/linking_panel.py

@ -1,174 +0,0 @@
import os
import discord
import requests
import json
import logging
import sys
from discord.ext import commands, tasks
from discord.ext.commands import has_permissions, MissingPermissions
from dotenv import load_dotenv
import aiohttp
import asyncio
class Linking(commands.Cog):
def __init__(self, bot):
self.bot = bot
self.guild_id = int(os.getenv('guild_id'))
self.crabwings_role_id = int(os.getenv('crabwings_role_id'))
self.duckfeet_role_id = int(os.getenv('duckfeet_role_id'))
self.elktail_role_id = int(os.getenv('elktail_role_id'))
self.client_role_id = int(os.getenv('client_role_id'))
self.subuser_role_id = int(os.getenv('subuser_role_id'))
self.verified_role_id = int(os.getenv('verified_role_id'))
@commands.Cog.listener()
async def on_message(self, message):
self.guild = self.bot.get_guild(self.guild_id)
if message.author != self.bot.user and message.guild is None and self.guild.get_member(message.author.id) is not None:
if "://" in message.content:
return
if self.guild in message.author.guilds:
channel = message.channel
await channel.send("Processing, please wait...")
# Potential API key, so tries it out
if len(message.content) == 48:
url = "https://panel.birdflop.com/api/client/account"
headers = {
'Accept': 'application/json',
'Content-Type': 'application/json',
'Authorization': 'Bearer ' + message.content,
}
# response = requests.get(url, headers=headers)
async with aiohttp.ClientSession() as session:
async with session.get(url, headers=headers) as response:
# If API token is verified to be correct:
if response.status == 200:
# Formats response of account in JSON format
json_response = await response.json()
# Loads contents of users.json
file = open('users.json', 'r')
data = json.load(file)
file.close()
# Checks if user exists. If so, skips adding them to users.json
client_id_already_exists = False
discord_id_already_exists = False
for user in data['users']:
if user['client_id'] == json_response['attributes']['id']:
client_id_already_exists = True
logging.info("Client ID already exists")
if user['discord_id'] == message.author.id:
discord_id_already_exists = True
logging.info("Discord ID already exists")
if not client_id_already_exists and not discord_id_already_exists:
data['users'].append({
'discord_id': message.author.id,
'client_id': json_response['attributes']['id'],
'client_api_key': message.content
})
json_dumps = json.dumps(data, indent=2)
# Adds user to users.json
file = open('users.json', 'w')
file.write(json_dumps)
file.close()
member = self.guild.get_member(message.author.id)
if member:
url = "https://panel.birdflop.com/api/client"
headers = {
'Accept': 'application/json',
'Authorization': 'Bearer ' + message.content,
}
async with aiohttp.ClientSession() as session:
async with session.get(url, headers=headers) as response:
# If API token is verified to be correct, continues
if response.status == 200:
# Formats response for servers in JSON format
servers_json_response = await response.json()
user_client = False
user_subuser = False
user_crabwings = False
user_duckfeet = False
user_elktail = False
for server in servers_json_response['data']:
server_owner = server['attributes']['server_owner']
if server_owner:
user_client = True
elif not server_owner:
user_subuser = True
server_node = server['attributes']['node']
if server_node == "Crabwings - NYC":
user_crabwings = True
elif server_node == "Duckfeet - EU":
user_duckfeet = True
elif server_node == "Elktail - EU":
user_elktail = True
if user_client:
role = discord.utils.get(self.guild.roles, id=self.client_role_id)
await member.add_roles(role)
if user_subuser:
role = discord.utils.get(self.guild.roles, id=self.subuser_role_id)
await member.add_roles(role)
if user_crabwings:
role = discord.utils.get(self.guild.roles, id=self.crabwings_role_id)
await member.add_roles(role)
if user_duckfeet:
role = discord.utils.get(self.guild.roles, id=self.duckfeet_role_id)
await member.add_roles(role)
if user_elktail:
role = discord.utils.get(self.guild.roles, id=self.elktail_role_id)
await member.add_roles(role)
role = discord.utils.get(self.guild.roles, id=self.verified_role_id)
await member.add_roles(role)
await channel.send(
'Your Discord account has been linked to your panel account! You may unlink your Discord and panel accounts by reacting in the #verification channel or by deleting your Verification API key.')
logging.info("Success message sent to " + message.author.name + "#" + str(
message.author.discriminator) + " (" + str(
message.author.id) + ")" + ". User linked to API key " + message.content + " and client_id " + str(
json_response['attributes']['id']))
elif discord_id_already_exists:
await channel.send(
'Sorry, your Discord account is already linked to a panel account. If you would like to link your Discord account to a different panel account, please unlink your Discord account first by reacting in the #verification channel.')
logging.info("Duplicate Discord message sent to " + message.author.name + "#" + str(
message.author.discriminator) + " (" + str(
message.author.id) + ")" + " for using API key " + message.content + " linked to client_id " + str(
json_response['attributes']['id']))
elif client_id_already_exists:
await channel.send(
'Sorry, your panel account is already linked to a Discord account. If you would like to link your panel account to a different Discord account, please unlink your panel account first by deleting its Verification API key and waiting up to 10 minutes.')
logging.info("Duplicate panel message sent to " + message.author.name + "#" + str(
message.author.discriminator) + " (" + str(
message.author.id) + ")" + " for using API key " + message.content + " linked to client_id " + str(
json_response['attributes']['id']))
else:
# Says if API key is the corect # of characters but invalid
await channel.send("Sorry, that appears to be an invalid API key.")
logging.info(
'invalid sent to ' + message.author.name + "#" + str(
message.author.discriminator) + " (" + str(
message.author.id) + ")")
else:
# Says this if API key is incorrect # of characters
await channel.send(
'Sorry, that doesn\'t appear to be an API token. An API token should be a long string resembling this: ```yQSB12ik6YRcmE4d8tIEj5gkQqDs6jQuZwVOo4ZjSGl28d46```')
logging.info("obvious incorrect sent to " + message.author.name + "#" + str(
message.author.discriminator) + " (" + str(message.author.id) + ")")
def setup(bot):
bot.add_cog(Linking(bot))

115
cogs/linking_updater_panel.py

@ -1,115 +0,0 @@
import os
import discord
import requests
import json
import logging
from discord.ext import commands, tasks
from discord.ext.commands import has_permissions, MissingPermissions
from dotenv import load_dotenv
import aiohttp
import asyncio
class Linking_updater(commands.Cog):
def __init__(self, bot):
self.bot = bot
self.guild_id = int(os.getenv('guild_id'))
self.crabwings_role_id = int(os.getenv('crabwings_role_id'))
self.duckfeet_role_id = int(os.getenv('duckfeet_role_id'))
self.elktail_role_id = int(os.getenv('elktail_role_id'))
self.client_role_id = int(os.getenv('client_role_id'))
self.subuser_role_id = int(os.getenv('subuser_role_id'))
self.verified_role_id = int(os.getenv('verified_role_id'))
@tasks.loop(minutes=10)
async def linking_updater(self):
logging.info("Synchronizing roles")
file = open('users.json', 'r')
data = json.load(file)
file.close()
guild = self.bot.get_guild(self.guild_id)
i = -1
for client in data['users']:
i += 1
member = guild.get_member(client['discord_id'])
if member:
api_key = client['client_api_key']
url = "https://panel.birdflop.com/api/client"
headers = {
'Accept': 'application/json',
'Authorization': 'Bearer ' + api_key,
}
async with aiohttp.ClientSession() as session:
async with session.get(url, headers=headers) as response:
if response.status == 200:
# Formats response for servers in JSON format
servers_json_response = await response.json()
user_client = False
user_subuser = False
user_crabwings = False
user_duckfeet = False
user_elktail = False
for server in servers_json_response['data']:
server_owner = server['attributes']['server_owner']
if server_owner == True:
user_client = True
elif server_owner == False:
user_subuser = True
server_node = server['attributes']['node']
if server_node == "Crabwings - NYC":
user_crabwings = True
elif server_node == "Duckfeet - EU":
user_duckfeet = True
elif server_node == "Elktail - EU":
user_elktail = True
role = discord.utils.get(guild.roles, id=self.client_role_id)
if user_client == True:
await member.add_roles(role)
else:
await member.remove_roles(role)
role = discord.utils.get(guild.roles, id=self.subuser_role_id)
if user_subuser == True:
await member.add_roles(role)
else:
await member.remove_roles(role)
role = discord.utils.get(guild.roles, id=self.crabwings_role_id)
if user_crabwings == True:
await member.add_roles(role)
else:
await member.remove_roles(role)
role = discord.utils.get(guild.roles, id=self.duckfeet_role_id)
if user_duckfeet == True:
await member.add_roles(role)
else:
await member.remove_roles(role)
role = discord.utils.get(guild.roles, id=self.elktail_role_id)
if user_elktail == True:
await member.add_roles(role)
else:
await member.remove_roles(role)
else:
data['users'].pop(i)
json_dumps = json.dumps(data, indent=2)
file = open('users.json', 'w')
file.write(json_dumps)
file.close()
await member.edit(roles=[])
logging.info("removed discord_id " + str(client['discord_id']) + " with client_id " + str(
client['client_id']) + " and INVALID client_api_key " + client['client_api_key'])
else:
data['users'].pop(i)
json_dumps = json.dumps(data, indent=2)
file = open('users.json', 'w')
file.write(json_dumps)
file.close()
logging.info("removed discord_id " + str(client['discord_id']) + " with client_id " + str(
client['client_id']) + " and client_api_key " + client['client_api_key'])
@linking_updater.before_loop
async def before_linking_updater(self):
logging.info('waiting to enter loop')
await self.bot.wait_until_ready()
def setup(bot):
bot.add_cog(Linking_updater(bot))

0
cogs/timings_public.py → cogs/timings.py

Loading…
Cancel
Save