Mirrored_Repos/NexusDashboard
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/NexusDashboard.git synced 2025-08-09 20:14:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

syntax/linting fixes

Browse Source
This commit is contained in:
Aaron Kimbre
2022-03-12 20:09:35 -06:00
parent 70742549b9
commit 5ce9ac85bc
18 changed files with 504 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
app/mail.py
View File

@@ -1,7 +1,6 @@
from flask import render_template, Blueprint, redirect, url_for, request, abort, flash, request
from flask import render_template, Blueprint, redirect, url_for, flash, request
from flask_user import login_required, current_user
from app.models import db, Mail, CharacterInfo
from datatables import ColumnDT, DataTables
from app.models import Mail, CharacterInfo
from app.forms import SendMailForm
from app import gm_level, log_audit
from app.luclient import translate_from_locale, query_cdclient
@@ -31,37 +30,40 @@ def send():
log_audit(f"Sending {form.subject.data}: {form.body.data} to All Characters with {form.attachment_count.data} of item {form.attachment.data}")
for character in CharacterInfo.query.all():
Mail(
sender_id = 0,
sender_name = f"[GM] {current_user.username}",
receiver_id = character.id,
receiver_name = character.name,
time_sent = time.time(),
subject = form.subject.data,
body = form.body.data,
attachment_id = 0,
attachment_lot = form.attachment.data,
attachment_count = form.attachment_count.data
sender_id=0,
sender_name=f"[GM] {current_user.username}",
receiver_id=character.id,
receiver_name=character.name,
time_sent=time.time(),
subject=form.subject.data,
body=form.body.data,
attachment_id=0,
attachment_lot=form.attachment.data,
attachment_count=form.attachment_count.data
).save()
log_audit(f"Sent {form.subject.data}: {form.body.data} to ({character.id}){character.name} with {form.attachment_count.data} of item {form.attachment.data}")
log_audit(f"Sent {form.subject.data}: \
{form.body.data} to ({character.id}){character.name} \
with {form.attachment_count.data} of item {form.attachment.data}")
else:
Mail(
sender_id = 0,
sender_name = f"[GM] {current_user.username}",
receiver_id = form.recipient.data,
receiver_name = CharacterInfo.query.filter(CharacterInfo.id == form.recipient.data).first().name,
time_sent = time.time(),
subject = form.subject.data,
body = form.body.data,
attachment_id = 0,
attachment_lot = form.attachment.data,
attachment_count = form.attachment_count.data
sender_id=0,
sender_name=f"[GM] {current_user.username}",
receiver_id=form.recipient.data,
receiver_name=CharacterInfo.query.filter(CharacterInfo.id == form.recipient.data).first().name,
time_sent=time.time(),
subject=form.subject.data,
body=form.body.data,
attachment_id=0,
attachment_lot=form.attachment.data,
attachment_count=form.attachment_count.data
).save()
log_audit(f"Sent {form.subject.data}: {form.body.data} to ({form.recipient.data}){CharacterInfo.query.filter(CharacterInfo.id == form.recipient.data).first().name} with {form.attachment_count.data} of item {form.attachment.data}")
log_audit(f"Sent {form.subject.data}: \
{form.body.data} to ({form.recipient.data}){CharacterInfo.query.filter(CharacterInfo.id == form.recipient.data).first().name} \
with {form.attachment_count.data} of item {form.attachment.data}")
flash("Sent Mail", "success")
return redirect(url_for('mail.send'))
recipients = CharacterInfo.query.all()
for character in recipients:
form.recipient.choices.append((character.id, character.name))
@@ -74,7 +76,7 @@ def send():
for item in items:
name = translate_from_locale(f'Objects_{item[0]}_name')
if name == f'Objects_{item[0]}_name':
name = (item[2] if (item[2] != "None" and item[2] !="" and item[2] != None) else item[1])
name = (item[2] if (item[2] != "None" and item[2] != "" and item[2] not None) else item[1])
form.attachment.choices.append(
(
item[0],