mirror of
https://github.com/TotalFreedomMC/TotalFreedomBot.git
synced 2024-12-22 15:44:57 +00:00
Update functions.py
This commit is contained in:
parent
a87dbc94a7
commit
166bac76cf
1 changed files with 33 additions and 15 deletions
44
functions.py
44
functions.py
|
@ -1,9 +1,11 @@
|
|||
import json
|
||||
import requests
|
||||
import os
|
||||
import itertools
|
||||
|
||||
from discord.ext import commands
|
||||
from checks import *
|
||||
|
||||
|
||||
class embed_entry:
|
||||
def __init__(self, name, value, *, playercount):
|
||||
self.name = name
|
||||
|
@ -22,6 +24,14 @@ def format_list_entry(embed, l, name):
|
|||
)
|
||||
return em
|
||||
|
||||
|
||||
def get_prefix(client, message):
|
||||
#prefixes = ['TF!', 'Tf!', 'tF!', 'tf!']
|
||||
prefix = os.getenv('prefix')
|
||||
prefixes = map(''.join, itertools.product(*((letter.upper(), letter.lower()) for letter in prefix)))
|
||||
return commands.when_mentioned_or(*prefixes)(client, message)
|
||||
|
||||
|
||||
def did_mention_other_user(users, author):
|
||||
for user in users:
|
||||
if user is not author:
|
||||
|
@ -44,12 +54,6 @@ def removed_role_mentions(old, new):
|
|||
roles.append(role)
|
||||
return roles
|
||||
|
||||
def get_prefix(bot, message):
|
||||
#prefixes = ['TF!', 'Tf!', 'tF!', 'tf!']
|
||||
prefix = os.getenv('prefix')
|
||||
prefixes = map(''.join, itertools.product(*((letter.upper(), letter.lower()) for letter in prefix)))
|
||||
return commands.when_mentioned_or(*prefixes)(bot, message)
|
||||
|
||||
|
||||
def get_avatar(user, animate=True):
|
||||
if user.avatar_url:
|
||||
|
@ -73,20 +77,34 @@ def write_json(file_name, data):
|
|||
return data
|
||||
|
||||
|
||||
def hit_endpoint(command):
|
||||
url = f"http://play.totalfreedom.me:3000?password=CENSORED&command={command}"
|
||||
def hit_endpoint(command, server=1):
|
||||
config_file = read_json('config')
|
||||
if server == 1:
|
||||
ip = config_file['SERVER_IP']
|
||||
pw = config_file['ENDPOINTS_PW']
|
||||
else:
|
||||
ip = config_file['SERVER_IP_2']
|
||||
pw = config_file['ENDPOINTS_PW_2']
|
||||
port = config_file['ENDPOINTS_PORT']
|
||||
url = f"http://{ip}:{port}?password={pw}&command={command}"
|
||||
payload = {}
|
||||
headers = {}
|
||||
try:
|
||||
response = json.loads(requests.request(
|
||||
"GET", url, headers=headers, data=payload, timeout=100).text)
|
||||
"GET", url, headers=headers, data=payload, timeout=5).text)
|
||||
except:
|
||||
response = 'Connection Error.'
|
||||
response = {'response': 'Connection Error.'}
|
||||
return response['response']
|
||||
|
||||
def get_server_status():
|
||||
def get_server_status(server=1):
|
||||
config_file = read_json('config')
|
||||
if server == 1:
|
||||
ip = config_file['SERVER_IP']
|
||||
else:
|
||||
ip = config_file['SERVER_IP_2']
|
||||
port = config_file['PLAYERLIST_PORT']
|
||||
try:
|
||||
requests.get("http://play.totalfreedom.me:28966/list?json=true", timeout=5).json()
|
||||
requests.get(f"http://{ip}:{port}/list?json=true", timeout=5).json()
|
||||
except:
|
||||
return False
|
||||
else:
|
||||
|
|
Loading…
Reference in a new issue