cynic
/
minecraft-discord-bridge
mirror of https://github.com/kurisufriend/minecraft-discord-bridge
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/fix-elasticsearch-naming'

Browse Source
feature/embed-uploads
Tristan Gosselin-Hane 7 years ago
parent 7963e68ffb 2c151541cb
commit daaddd5a78
No known key found for this signature in database
GPG Key ID: 86886FC44C72EAA1
2 changed files with 20 additions and 20 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      elasticsearch_logger.py
  2. 26
      webhook-bridge.py

14
elasticsearch_logger.py
Unescape View File

@ -19,7 +19,7 @@ def initialize(config):
_url = config.es_url
def es_connection(uuid, reason, count=0):
def log_connection(uuid, reason, count=0):
if ConnectionReason(reason).name != "SEEN":
es_payload = {
"uuid": uuid,
@ -33,10 +33,10 @@ def es_connection(uuid, reason, count=0):
"time": (lambda: int(round(time.time() * 1000)))(),
"reason": ConnectionReason(reason).name,
}
es_post_request("connections/_doc/", es_payload)
post_request("connections/_doc/", es_payload)
def es_chat_message(uuid, display_name, message, message_unformatted):
def log_chat_message(uuid, display_name, message, message_unformatted):
es_payload = {
"uuid": uuid,
"display_name": display_name,
@ -44,19 +44,19 @@ def es_chat_message(uuid, display_name, message, message_unformatted):
"message_unformatted": message_unformatted,
"time": (lambda: int(round(time.time() * 1000)))(),
}
es_post_request("chat_messages/_doc/", es_payload)
post_request("chat_messages/_doc/", es_payload)
def es_raw_message(type, message):
def log_raw_message(type, message):
es_payload = {
"time": (lambda: int(round(time.time() * 1000)))(),
"type": type,
"message": message,
}
es_post_request("raw_messages/_doc/", es_payload)
post_request("raw_messages/_doc/", es_payload)
def es_post_request(endpoint, payload):
def post_request(endpoint, payload):
the_url = "{}{}".format(_url, endpoint)
if _auth:
post = requests.post(the_url, auth=(_username, _password), json=payload)

26
webhook-bridge.py
Unescape View File

@ -18,9 +18,7 @@ from database import DiscordChannel, AccountLinkToken, DiscordAccount
import database_session
from datetime import datetime, timedelta, timezone
import elasticsearch_logger
from elasticsearch_logger import es_chat_message, es_connection, es_raw_message, ConnectionReason
import elasticsearch_logger as el
from minecraft import authentication
from minecraft.exceptions import YggdrasilError
from minecraft.networking.connection import Connection
@ -168,7 +166,7 @@ def main():
database_session.initialize(config)
if config.es_enabled:
elasticsearch_logger.initialize(config)
el.initialize(config)
reactor_thread = Thread(target=run_auth_server, args=(config.auth_port,))
reactor_thread.start()
@ -290,7 +288,8 @@ def main():
for webhook in WEBHOOKS:
post = requests.post(webhook,json=webhook_payload)
if config.es_enabled:
es_connection(uuid=action.uuid, reason=ConnectionReason.CONNECTED, count=len(PLAYER_LIST))
el.log_connection(
uuid=action.uuid, reason=el.ConnectionReason.CONNECTED, count=len(PLAYER_LIST))
return
else:
# The bot's name is sent last after the initial back-fill
@ -299,14 +298,15 @@ def main():
if config.es_enabled:
diff = set(PREVIOUS_PLAYER_LIST.keys()) - set(PLAYER_LIST.keys())
for idx, uuid in enumerate(diff):
es_connection(uuid=uuid, reason=ConnectionReason.DISCONNECTED,
el.log_connection(uuid=uuid, reason=el.ConnectionReason.DISCONNECTED,
count=len(PREVIOUS_PLAYER_LIST) - (idx + 1))
# Don't bother announcing the bot's own join message (who cares) but log it for analytics still
if config.es_enabled:
es_connection(uuid=action.uuid, reason=ConnectionReason.CONNECTED, count=len(PLAYER_LIST))
el.log_connection(
uuid=action.uuid, reason=el.ConnectionReason.CONNECTED, count=len(PLAYER_LIST))
if config.es_enabled:
es_connection(uuid=action.uuid, reason=ConnectionReason.SEEN)
el.log_connection(uuid=action.uuid, reason=el.ConnectionReason.SEEN)
if isinstance(action, clientbound.play.PlayerListItemPacket.RemovePlayerAction):
logging.debug("Processing RemovePlayerAction tab list packet, uuid: {}".format(action.uuid))
username = UUID_CACHE[action.uuid]
@ -322,7 +322,7 @@ def main():
del UUID_CACHE[action.uuid]
del PLAYER_LIST[action.uuid]
if config.es_enabled:
es_connection(uuid=action.uuid, reason=ConnectionReason.DISCONNECTED, count=len(PLAYER_LIST))
el.log_connection(uuid=action.uuid, reason=el.ConnectionReason.DISCONNECTED, count=len(PLAYER_LIST))
def handle_join_game(join_game_packet):
global PLAYER_LIST
@ -349,12 +349,12 @@ def main():
bot_message_match = re.match("<{}> (.*?): (.*)".format(
BOT_USERNAME.lower()), chat_string, re.M | re.I)
if bot_message_match:
es_chat_message(
el.log_chat_message(
uuid=UUID_CACHE.inv[bot_message_match.group(1)],
display_name=bot_message_match.group(1),
message=bot_message_match.group(2),
message_unformatted=chat_string)
es_raw_message(type=ChatType(chat_packet.position).name, message=chat_packet.json_data)
el.log_raw_message(type=ChatType(chat_packet.position).name, message=chat_packet.json_data)
return
logging.info("Username: {} Message: {}".format(username, original_message))
logging.debug("msg: {}".format(repr(original_message)))
@ -367,10 +367,10 @@ def main():
for webhook in WEBHOOKS:
post = requests.post(webhook, json=webhook_payload)
if config.es_enabled:
es_chat_message(
el.log_chat_message(
uuid=player_uuid, display_name=username, message=original_message, message_unformatted=chat_string)
if config.es_enabled:
es_raw_message(type=ChatType(chat_packet.position).name, message=chat_packet.json_data)
el.log_raw_message(type=ChatType(chat_packet.position).name, message=chat_packet.json_data)
def handle_health_update(health_update_packet):
if health_update_packet.health <= 0:

Write Preview
Loading…
Cancel
Save