wip

hwe/sammo/API/Nation/SetTroopName.php

@@ -10,6 +10,7 @@ use sammo\Validator;
 
 use function sammo\checkSecretPermission;
 
+/** @deprecated */
 class SetTroopName extends \sammo\BaseAPI
 {
   public function validateArgs(): ?string

hwe/sammo/API/Troop/JoinTroop.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace sammo\API\Troop;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\DB;
+use sammo\StringUtil;
+use sammo\Validator;
+
+class SetTroopName extends \sammo\BaseAPI
+{
+  public function validateArgs(): ?string
+  {
+    $v = new Validator($this->args);
+    $v->rule('required', [
+      'troopID',
+    ])
+      ->rule('integer', 'troopID');
+
+    if (!$v->validate()) {
+      return $v->errorStr();
+    }
+    return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN;
+  }
+
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    $userID = $session->userID;
+    $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) {
+      return '이미 부대에 소속되어 있습니다.';
+    }
+    $nationID = $me['nation'];
+    if ($nationID == 0) {
+      return '국가에 소속되어 있지 않습니다.';
+    }
+
+    $generalID = $me['no'];
+
+    $db->insert('troop', [
+      'name' => $troopName,
+      'troop_leader' => $generalID,
+      'nation' => $nationID,
+    ]);
+
+    if ($db->affectedRows() == 0) {
+      return '부대가 생성되지 않았습니다.';
+    }
+
+    return null;
+  }
+}

hwe/sammo/API/Troop/NewTroop.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace sammo\API\Troop;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\DB;
+use sammo\StringUtil;
+use sammo\Validator;
+
+class SetTroopName extends \sammo\BaseAPI
+{
+  public function validateArgs(): ?string
+  {
+    $v = new Validator($this->args);
+    $v->rule('required', [
+      'troopName',
+    ])
+      ->rule('stringWidthBetween', 'troopName', 1, 18);
+
+    if (!$v->validate()) {
+      return $v->errorStr();
+    }
+    return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN;
+  }
+
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    $userID = $session->userID;
+    $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){
+      return '이미 부대에 소속되어 있습니다.';
+    }
+    $nationID = $me['nation'];
+    if($nationID == 0){
+      return '국가에 소속되어 있지 않습니다.';
+    }
+
+    $generalID = $me['no'];
+    
+    $db->insert('troop', [
+      'name'=>$troopName,
+      'troop_leader'=>$generalID,
+      'nation'=>$nationID,
+    ]);
+
+    if($db->affectedRows() == 0){
+      return '부대가 생성되지 않았습니다.';
+    }
+
+    return null;
+  }
+}

hwe/sammo/API/Troop/SetTroopName.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace sammo\API\Troop;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\DB;
+use sammo\StringUtil;
+use sammo\Validator;
+
+use function sammo\checkSecretPermission;
+
+class SetTroopName extends \sammo\BaseAPI
+{
+  public function validateArgs(): ?string
+  {
+    $v = new Validator($this->args);
+    $v->rule('required', [
+      'troopID',
+      'troopName',
+    ])
+      ->rule('stringWidthBetween', 'troopName', 1, 18)
+      ->rule('integer', 'troopID');
+
+    if (!$v->validate()) {
+      return $v->errorStr();
+    }
+    return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
+  }
+
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    $userID = $session->userID;
+    $db = DB::db();
+    $me = $db->queryFirstRow('SELECT `no`,nation,`officer_level`,permission,penalty FROM general WHERE `owner`=%i', $userID);
+    $permission = checkSecretPermission($me, false);
+    $troopID = $this->args['troopID'];
+
+    $generalID = $me['no'];
+    if($generalID != $troopID && $permission < 4){
+      return "권한이 부족합니다.";
+    }
+
+    $troopName = StringUtil::neutralize($this->args['troopName']);
+    if(!$troopName){
+      return '부대 이름이 없습니다.';
+    }
+
+    $nationID = $me['nation'];
+    $db->update('troop', [
+      'name'=>$troopName
+    ], 'troop_leader=%i AND `nation`=%i',$troopID, $nationID);
+
+    if($db->affectedRows() == 0){
+      return '부대가 없습니다.';
+    }
+
+    return null;
+  }
+}

hwe/ts/SammoAPI.ts

@@ -227,12 +227,22 @@ const apiRealPath = {
       },
       GetGeneralLogResponse
     >,
+    /** @deprecated */
     SetTroopName: PATCH as APICallT<{
       troopID: number;
       troopName: string;
     }>,
     GetNationInfo: GET as APICallT<{full?: boolean}, NationInfoResponse>,
   },
+  Troop: {
+    NewTroop: POST as APICallT<{
+      name: string;
+    }>,
+    SetTroopName: PATCH as APICallT<{
+      troopID: number;
+      troopName: string;
+    }>,
+  },
   Vote: {
     AddComment: POST as APICallT<{
       voteID: number;