|
@@ -7,7 +7,7 @@
|
|
|
# TODO: Make routes for various chat and video links
|
|
|
|
|
|
try:
|
|
|
- from names import *
|
|
|
+ from names import t_name, m_name
|
|
|
from config import *
|
|
|
from auth import *
|
|
|
from flask import Flask, jsonify, current_app, request
|
|
@@ -18,15 +18,14 @@ try:
|
|
|
import socket
|
|
|
from mcstatus import JavaServer
|
|
|
except Exception as import_error: # Log any errors loading modules, and try to keep running
|
|
|
- fail_log = open(log_location, 'a')
|
|
|
+ fail_log = open('/var/www/html/webhooks.log', 'a')
|
|
|
fail_log.write(f'------{import_error}------\n')
|
|
|
fail_log.close()
|
|
|
|
|
|
logging.basicConfig(filename='/var/www/html/webhooks.log', level=logging.INFO)
|
|
|
-#logging.basicConfig(filename='/var/www/html/webhooks.log', level=logging.DEBUG)
|
|
|
-#logging.basicConfig(level=logging.DEBUG)
|
|
|
|
|
|
current_names = [] # Initialize empty list to hold current Twitter and Mastodon names
|
|
|
+
|
|
|
testing = 0 # Are we testing? 1 for testing. 0 for live.
|
|
|
|
|
|
twitter = Twython(APP_KEY, APP_SECRET, OAUTH_TOKEN, OAUTH_TOKEN_SECRET)
|
|
@@ -37,6 +36,7 @@ get_m_info = get_m_info.json() # Jsonify the response
|
|
|
|
|
|
app = Flask(__name__)
|
|
|
|
|
|
+
|
|
|
def get_now(): # This creates and returns a time stamp
|
|
|
now = str(time.strftime("%Y/%m/%d %H:%M:%S"))
|
|
|
return now
|
|
@@ -78,10 +78,13 @@ def reg_m_name(): # Change Mastodon name to regular name
|
|
|
|
|
|
def write_current_names(): # Write current names to names.py
|
|
|
logging.info(f'{get_now()} - Storing {current_names}.')
|
|
|
- file = open("names.py", "w")
|
|
|
- for name in current_names:
|
|
|
- file.write(f'{name}\n')
|
|
|
- file.close()
|
|
|
+ try:
|
|
|
+ file = open("/var/www/html/webhooks/names.py", "w")
|
|
|
+ for name in current_names:
|
|
|
+ file.write(f'{name}\n')
|
|
|
+ file.close()
|
|
|
+ except Exception as write_error:
|
|
|
+ logging.info(f'{get_now()} - {write_error}')
|
|
|
|
|
|
def mc_chat(mc_msg): # Send chat message to Minecraft chat
|
|
|
logging.info(f'{get_now()} - Checking Minecraft server for players.')
|