- added new ESI scope "esi-location.read_online.v1", closed #495

- added/improved "/online" status check to deleteLogData() cronjob, closed #495
- added/improved "/online" status check to $characterModel->updateLog(), closed #495
This commit is contained in:
Exodus4D
2017-06-03 14:47:16 +02:00
parent 398615cc5c
commit f94e7269ad
10 changed files with 187 additions and 176 deletions

View File

@@ -85,12 +85,26 @@ class AllianceModel extends BasicModel {
/**
* get all characters in this alliance
* @param array $characterIds
* @param array $options
* @return array
*/
public function getCharacters(){
public function getCharacters($characterIds = [], $options = []){
$characters = [];
$filter = ['active = ?', 1];
if( !empty($characterIds) ){
$filter[0] .= ' AND id IN (?)';
$filter[] = $characterIds;
}
$this->filter('allianceCharacters', $filter);
if($options['hasLog']){
// just characters with active log data
$this->has('allianceCharacters.characterLog', ['active = ?', 1]);
}
$this->filter('allianceCharacters', ['active = ?', 1]);
if($this->allianceCharacters){
foreach($this->allianceCharacters as $character){