devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

refac: API/Troop 의 $me를 GeneralLite로 변경

Browse Source 
- StaticEventHandler 처리도 추가
This commit is contained in:
Hide_D
2024-09-18 14:54:40 +00:00
parent 477b77b59f
commit 3d12de3838
5 changed files with 64 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/API/Troop/ExitTroop.php
+20 -5
View File
@@ -6,6 +6,9 @@ use sammo\Session;
use DateTimeInterface;
use sammo\DB;
use sammo\Enums\APIRecoveryType;
use sammo\Enums\GeneralLiteQueryMode;
use sammo\GeneralLite;
use sammo\StaticEventHandler;
class ExitTroop extends \sammo\BaseAPI
{
@@ -24,23 +27,35 @@ class ExitTroop extends \sammo\BaseAPI
$generalID = $session->generalID;
$db = DB::db();
$troopID = $db->queryFirstField('SELECT troop FROM general WHERE no = %i', $generalID);
$me = GeneralLite::createObjFromDB($generalID, ['troop'], GeneralLiteQueryMode::Lite);
if (!$me) {
return '장수 정보를 불러올 수 없습니다.';
}
$troopID = $me->getVar('troop');
if($troopID == 0){
return '부대에 소속되어 있지 않습니다.';
}
if($generalID != $troopID){
$db->update('general', [
'troop' => 0,
], '`no` = %i', $generalID);
if($troopID != $generalID){
StaticEventHandler::handleEvent($me, null, $this::class, [
"isTroopLeader" => false,
], $this->args);
$me->setVar('troop', 0);
$me->applyDB($db);
return null;
}
//부대장이다.
StaticEventHandler::handleEvent($me, null, $this::class, [
"isTroopLeader" => true,
], $this->args);
$db->update('general', [
'troop' => 0,
], '`troop` = %i', $troopID);
$db->delete('troop', 'troop_leader = %i', $troopID);
$me->setVar('troop', 0);
$me->applyDB($db);
return null;
}
hwe/sammo/API/Troop/JoinTroop.php
+17 -9
View File
@@ -6,6 +6,9 @@ use sammo\Session;
use DateTimeInterface;
use sammo\DB;
use sammo\Enums\APIRecoveryType;
use sammo\Enums\GeneralLiteQueryMode;
use sammo\GeneralLite;
use sammo\StaticEventHandler;
use sammo\StringUtil;
use sammo\Validator;
@@ -32,16 +35,22 @@ class JoinTroop extends \sammo\BaseAPI
public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
{
$userID = $session->userID;
$generalID = $session->generalID;
$troopID = $this->args['troopID'];
$db = DB::db();
$me = $db->queryFirstRow('SELECT `no`,nation,`troop`,`officer_level`,permission,penalty FROM general WHERE `owner`=%i', $userID);
if ($me['troop'] != 0) {
$me = GeneralLite::createObjFromDB($generalID, ['troop'], GeneralLiteQueryMode::Lite);
if(!$me){
return '장수 정보를 불러올 수 없습니다.';
}
if($me->getVar('troop') != 0){
return '이미 부대에 소속되어 있습니다.';
}
$nationID = $me['nation'];
if ($nationID == 0) {
$nationID = $me->getNationID();
if($nationID == 0){
return '국가에 소속되어 있지 않습니다.';
}
@@ -49,11 +58,10 @@ class JoinTroop extends \sammo\BaseAPI
if (!$troopExists) {
return '부대가 올바르지 않습니다.';
}
$generalID = $me['no'];
$db->update('general', [
'troop' => $troopID,
], '`no` = %i AND `troop` = %i', $generalID, 0);
$me->setVar('troop', $troopID);
StaticEventHandler::handleEvent($me, null, $this::class, [], $this->args);
$me->applyDB($db);
return null;
}
hwe/sammo/API/Troop/KickFromTroop.php
+9 -4
View File
@@ -6,6 +6,9 @@ use sammo\Session;
use DateTimeInterface;
use sammo\DB;
use sammo\Enums\APIRecoveryType;
use sammo\Enums\GeneralLiteQueryMode;
use sammo\GeneralLite;
use sammo\StaticEventHandler;
use sammo\Validator;
class KickFromTroop extends \sammo\BaseAPI
@@ -37,7 +40,8 @@ class KickFromTroop extends \sammo\BaseAPI
$generalID = $this->args['generalID'];
$db = DB::db();
$troopID = $db->queryFirstField('SELECT troop FROM general WHERE no = %i', $generalID);
$destGeneral = GeneralLite::createObjFromDB($generalID, ['troop'], GeneralLiteQueryMode::Lite);
$troopID = $destGeneral->getVar('troop');
if($troopID == 0){
return '부대에 소속되어 있지 않습니다.';
}
@@ -50,9 +54,10 @@ class KickFromTroop extends \sammo\BaseAPI
return '부대장을 추방할 수 없습니다.';
}
$db->update('general', [
'troop' => 0,
], '`no` = %i AND `troop` = %i', $generalID, $troopID);
StaticEventHandler::handleEvent($destGeneral, null, $this::class, [], $this->args);
$destGeneral->setVar('troop', 0);
$destGeneral->applyDB($db);
return null;
}
}
hwe/sammo/API/Troop/NewTroop.php
+11 -9
View File
@@ -6,6 +6,9 @@ use sammo\Session;
use DateTimeInterface;
use sammo\DB;
use sammo\Enums\APIRecoveryType;
use sammo\Enums\GeneralLiteQueryMode;
use sammo\GeneralLite;
use sammo\StaticEventHandler;
use sammo\StringUtil;
use sammo\Validator;
@@ -32,24 +35,23 @@ class NewTroop extends \sammo\BaseAPI
public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
{
$userID = $session->userID;
$generalID = $session->generalID;
$troopName = StringUtil::neutralize($this->args['troopName']);
if(!$troopName){
return '부대 이름이 없습니다.';
}
$db = DB::db();
$me = $db->queryFirstRow('SELECT `no`,nation,`troop`,`officer_level`,permission,penalty FROM general WHERE `owner`=%i', $userID);
if($me['troop'] != 0){
$me = GeneralLite::createObjFromDB($generalID, ['troop'], GeneralLiteQueryMode::Lite);
$troopID = $me->getVar('troop');
if($troopID != 0){
return '이미 부대에 소속되어 있습니다.';
}
$nationID = $me['nation'];
$nationID = $me->getNationID();
if($nationID == 0){
return '국가에 소속되어 있지 않습니다.';
}
$generalID = $me['no'];
$db->insert('troop', [
'name'=>$troopName,
'troop_leader'=>$generalID,
@@ -60,9 +62,9 @@ class NewTroop extends \sammo\BaseAPI
return '부대가 생성되지 않았습니다. 버그일 수 있습니다.';
}
$db->update('general', [
'troop'=>$generalID
], '`no` = %i', $generalID);
$me->setVar('troop', $generalID);
StaticEventHandler::handleEvent($me, null, $this::class, [], $this->args);
$me->applyDB($db);
return null;
}
hwe/sammo/API/Troop/SetTroopName.php
+7 -3
View File
@@ -6,6 +6,9 @@ use sammo\Session;
use DateTimeInterface;
use sammo\DB;
use sammo\Enums\APIRecoveryType;
use sammo\Enums\GeneralLiteQueryMode;
use sammo\GeneralLite;
use sammo\StaticEventHandler;
use sammo\StringUtil;
use sammo\Validator;
@@ -36,10 +39,10 @@ class SetTroopName extends \sammo\BaseAPI
public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
{
$userID = $session->userID;
$generalID = $session->generalID;
$db = DB::db();
$me = $db->queryFirstRow('SELECT `no`,nation,`officer_level`,permission,penalty FROM general WHERE `owner`=%i', $userID);
$permission = checkSecretPermission($me, false);
$me = GeneralLite::createObjFromDB($generalID, ['troop', 'permission', 'penalty'], GeneralLiteQueryMode::Lite);
$permission = checkSecretPermission($me->getRaw(), false);
$troopID = $this->args['troopID'];
$generalID = $me['no'];
@@ -60,6 +63,7 @@ class SetTroopName extends \sammo\BaseAPI
if($db->affectedRows() == 0){
return '부대가 없습니다.';
}
StaticEventHandler::handleEvent($me, null, $this::class, [], $this->args);
return null;
}