Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-15 07:20:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Handle new zKillboard API format

Browse Source
This commit is contained in:
Adarnof 2017-10-01 12:53:03 -04:00
parent cca8b26375
commit c63464c4c9
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
allianceauth/srp/managers.py
View File

@ -6,7 +6,7 @@ import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class SRPManager: class srpManager:
def __init__(self): def __init__(self):
pass pass
@ -26,11 +26,12 @@ class SRPManager:
r = requests.get(url, headers=headers) r = requests.get(url, headers=headers)
result = r.json()[0] result = r.json()[0]
if result: if result:
ship_type = result['victim']['shipTypeID'] ship_type = result['victim']['ship_type_id']
logger.debug("Ship type for kill ID %s is determined to be %s" % (kill_id, ship_type)) logger.debug("Ship type for kill ID %s is %s" % (kill_id, ship_type))
ship_value = result['zkb']['totalValue'] ship_value = result['zkb']['totalValue']
logger.debug("total loss value for kill id %s is %s" % (kill_id, ship_value)) logger.debug("Total loss value for kill id %s is %s" % (kill_id, ship_value))
victim_name = result['victim']['characterName'] victim_id = result['victim']['character_id']
return ship_type, ship_value, victim_name return ship_type, ship_value, victim_id
else: else:
raise ValueError("Invalid Kill ID") raise ValueError("Invalid Kill ID")

10
allianceauth/srp/views.py
View File

@ -186,7 +186,7 @@ def srp_request_view(request, fleet_srp):
try: try:
srp_kill_link = SRPManager.get_kill_id(srp_request.killboard_link) srp_kill_link = SRPManager.get_kill_id(srp_request.killboard_link)
(ship_type_id, ship_value, victim_name) = SRPManager.get_kill_data(srp_kill_link) (ship_type_id, ship_value, victim_id) = SRPManager.get_kill_data(srp_kill_link)
except ValueError: except ValueError:
logger.debug("User %s Submitted Invalid Killmail Link %s or server could not be reached" % ( logger.debug("User %s Submitted Invalid Killmail Link %s or server could not be reached" % (
request.user, srp_request.killboard_link)) request.user, srp_request.killboard_link))
@ -196,7 +196,7 @@ def srp_request_view(request, fleet_srp):
"Your SRP request Killmail link is invalid. Please make sure you are using zKillboard.")) "Your SRP request Killmail link is invalid. Please make sure you are using zKillboard."))
return redirect("srp:management") return redirect("srp:management")
if request.user.character_ownerships.filter(character__character_name=victim_name).exists(): if request.user.character_ownerships.filter(character__character_id=str(victim_id)).exists():
srp_request.srp_ship_name = provider.get_itemtype(ship_type_id).name srp_request.srp_ship_name = provider.get_itemtype(ship_type_id).name
srp_request.kb_total_loss = ship_value srp_request.kb_total_loss = ship_value
srp_request.post_time = post_time srp_request.post_time = post_time
@ -209,8 +209,8 @@ def srp_request_view(request, fleet_srp):
else: else:
messages.error(request, messages.error(request,
_( _(
"%(charname)s does not belong to your Auth account. Please add the API key for this character and try again") "Character %(charid)s does not belong to your Auth account. Please add the API key for this character and try again")
% {"charname": victim_name}) % {"charid": victim_id})
return redirect("srp:management") return redirect("srp:management")
else: else:
logger.debug("Returning blank SrpFleetUserRequestForm") logger.debug("Returning blank SrpFleetUserRequestForm")
@ -237,7 +237,7 @@ def srp_request_remove(request):
srpuserrequest = SrpUserRequest.objects.get(id=srp_request_id) srpuserrequest = SrpUserRequest.objects.get(id=srp_request_id)
stored_fleet_view = srpuserrequest.srp_fleet_main.id stored_fleet_view = srpuserrequest.srp_fleet_main.id
srpuserrequest.delete() srpuserrequest.delete()
logger.info("Deleted SRP request id %s for user %s" % (srp_request_id, request.user)) logger.info("Deleted SRP request id %s for user %s" % (srp_request_id, request.user))
if stored_fleet_view is None: if stored_fleet_view is None:
logger.error("Unable to delete srp requests for user %s - request matching id not found." % (request.user)) logger.error("Unable to delete srp requests for user %s - request matching id not found." % (request.user))
messages.error(request, _('Unable to locate selected SRP request.')) messages.error(request, _('Unable to locate selected SRP request.'))