dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1 from turbofeedorglory/fix.character-affiliation

Browse Source 
Use character affiliation endpoint
This commit is contained in:
BiekerUdan
2023-01-18 10:41:21 -07:00
committed by GitHub
parent 0ae644f187 d3a1330f9f
commit 5a45de16ad
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/Controller/Ccp/Sso.php
View File

@@ -505,25 +505,31 @@ class Sso extends Api\User{
$characterData->corporation = null;
$characterData->alliance = null;
if($corporationId = (int)$characterDataBasic['corporation']['id']){
/**
* @var $corporation Pathfinder\CorporationModel
*/
$corporation = Pathfinder\AbstractPathfinderModel::getNew('CorporationModel');
$corporation->getById($corporationId, 0);
if($corporation->valid()){
$characterData->corporation = $corporation;
}
}
$characterAffiliation = $this->getF3()->ccpClient()->send('getCharacterAffiliation', [$characterId]);
if(count($characterAffiliation) === 1) {
$characterCorporationId = $characterAffiliation[0]['corporation']['id'];
$characterAllianceId = $characterAffiliation[0]['alliance']['id'];
if($allianceId = (int)$characterDataBasic['alliance']['id']){
/**
* @var $alliance Pathfinder\AllianceModel
*/
$alliance = Pathfinder\AbstractPathfinderModel::getNew('AllianceModel');
$alliance->getById($allianceId, 0);
if($alliance->valid()){
$characterData->alliance = $alliance;
if($corporationId = (int)$characterCorporationId){
/**
* @var $corporation Pathfinder\CorporationModel
*/
$corporation = Pathfinder\AbstractPathfinderModel::getNew('CorporationModel');
$corporation->getById($corporationId, 0);
if($corporation->valid()){
$characterData->corporation = $corporation;
}
}
if($allianceId = (int)$characterAllianceId){
/**
* @var $alliance Pathfinder\AllianceModel
*/
$alliance = Pathfinder\AbstractPathfinderModel::getNew('AllianceModel');
$alliance->getById($allianceId, 0);
if($alliance->valid()){
$characterData->alliance = $alliance;
}
}
}
}
@@ -614,4 +620,4 @@ class Sso extends Api\User{
static function getSSOLogger() : \Log {
return parent::getLogger('SSO');
}
}
}