Add more API routes

Author: TuxCoding

README.md

@@ -55,6 +55,7 @@ This project uses the Laravel framework. They have great documentation here: htt
  * Sponge: https://github.com/SpongePowered/Ore/blob/1420c404ded5ce8b392e993fe1679beaa6f15be5/conf/routes#L7
 * Server GEO location
 * Player database
+* Add servers at once
 * Automatically detect teamspeak and website by doing a SRV lookup
 * API for all features, including UUID resolver, Banner generator, ...
 

app/Console/Commands/Ping.php

@@ -6,6 +6,8 @@
 use xPaw\MinecraftPing;
 use xPaw\MinecraftPingException;
 use \App\Server;
+use \File;
+use \Exception;
 
 class Ping extends Command {
 
@@ -57,7 +59,7 @@ function pingServer(Server $server) {
 
  $this->parsePingData($server, $result);
  $server->save();
- } catch (\Exception $exception) {
+ } catch (Exception $exception) {
  $this->error($server->address . " " . $exception->getMessage());
 
  //Reset the these data online if the server was online before
@@ -169,7 +171,7 @@ function saveIcon($hostname, $favicon) {
 
  $path = public_path() . "/img/favicons/$hostname.png";
  //check if it's still the same folder
- if (\File::dirname($path) == public_path() . "/img/favicons"
+ if (File::dirname($path) == public_path() . "/img/favicons"
  && (!file_exists($path) || md5_file($path) !== md5($data))) {
  //strip invalid path characters
  file_put_contents($path, $data);

app/Console/Commands/Query.php

@@ -7,6 +7,7 @@
 use \xPaw\MinecraftQueryException;
 use \App\Server;
 use \App\PluginUsage;
+use \Exception;
 
 class Query extends Command {
 
@@ -62,7 +63,7 @@ function queryServer(Server $server, $port = 25565) {
  if ($port === 25565) {
  $this->queryServer($server, Server::DEFAULT_BUNGEE_QUERY_PORT);
  }
- } catch (\Exception $exception) {
+ } catch (Exception $exception) {
  $this->error($exception);
  $this->error($server->address . " " . $exception->getMessage());
  }

app/Http/Controllers/ApiController.php

@@ -5,21 +5,65 @@
 use App\Server;
 use App\Skin;
 use App\Player;
+use \App\PluginUsage;
 
 class ApiController extends Controller {
 
  public function index() {
- return App\Server::paginate();
+ return Server::paginate();
  }
 
  public function getServer($address) {
- return App\Server::whereAddress($address)->firstOrFail();
+ return Server::whereAddress($address)->firstOrFail();
  }
 
  public function getIcon($address) {
  return redirect('/img/favicons/' . $address . ".png");
  }
 
+ public function getPlayerByUUID($uuid) {
+ return Player::whereUuid($uuid)->firstOrFail();
+ }
+
+ public function getPlayerByName($name) {
+ $players = Player::whereName($name)->get();
+ if (count($players) == 0) {
+ return response('', 404);
+ }
+
+ return $players;
+ }
+
+ public function getSkinByUUID($uuid) {
+ $skin = Skin::whereProfileId($uuid)->firstOrFail();
+ return [
+ 'timestamp' => $skin->timestamp,
+ 'profileId' => $skin->profile_id,
+ 'profileName' => $skin->profile_name,
+ 'skinUrl' => $skin->skin_url,
+ 'slimMode' => $skin->slim_model,
+ 'capeUrl' => $skin->cape_url,
+ 'signature' => base64_encode($skin->signature)
+ ];
+ }
+
+ public function getSkinByName($name) {
+ $skin = Skin::whereProfileName($name)->firstOrFail();
+ return [
+ 'timestamp' => $skin->timestamp,
+ 'profileId' => $skin->profile_id,
+ 'profileName' => $skin->profile_name,
+ 'skinUrl' => $skin->skin_url,
+ 'slimMode' => $skin->slim_model,
+ 'capeUrl' => $skin->cape_url,
+ 'signature' => base64_encode($skin->signature)
+ ];
+ }
+
+ public function getPluginUsage($pluginName) {
+ return PluginUsage::wherePlugin($pluginName)->count();
+ }
+
  public function stats() {
  $totalServers = Server::count();
  $onlineServers = Server::whereOnline(true)->count();

app/Http/Controllers/ServerController.php

@@ -8,8 +8,8 @@
 
 class ServerController extends Controller {
 
- //http://regexr.com/3d8n1
- const SERVER_REGEX = "/^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$/";
+ //http://regexr.com/3ddc0
+ const SERVER_REGEX = "/^(([\w-]+\.)?([\w-]+\.)?[\w-]+\.\w+|((2[0-5]{2}|1[0-9]{2}|[0-9]{1,2})\.){3}(2[0-5]{2}|1[0-9]{2}|[0-9]{1,2}))?$/";
 
  public function index() {
  $servers = Server::where('online', true)->whereNotNull('motd')->orderBy("players", "desc")->paginate(5);

app/Http/routes.php

@@ -35,6 +35,17 @@
  Route::get('/server/{address}', 'ApiController@getServer');
  Route::get('/server/{address}/favicon', 'ApiController@getIcon');
 
+ Route::get('/plugin/{pluginName}/usage', 'ApiController@getPluginUsage');
+
+ Route::get('/player/{uuid}', 'ApiController@getPlayerByUUID')
+ ->where("uuid", "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}");
+ Route::get('/player/{username}', 'ApiController@getPlayerByName')->where("username", "\w{2,16}");
+
+ //todo: rendered skin routes
+ Route::get('/skin/{uuid}', 'ApiController@getSkinByUUID')
+ ->where("uuid", "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}");
+ Route::get('/skin/{name}', 'ApiController@getSkinByName')->where("username", "\w{2,16}");
+
  Route::get('/stats', 'ApiController@stats');
 });
 

app/Skin.php

@@ -8,52 +8,47 @@
  * App\Skin
  *
  * @property integer $id
- * @property integer $timestamp
- * @property string $profileId
- * @property string $profileName
- * @property string $skinUrl
- * @property string $capeUrl
- * @property boolean $slimModel
+ * @property string $profile_id
+ * @property string $profile_name
+ * @property string $skin_url
+ * @property string $cape_url
+ * @property boolean $slim_model
  * @property mixed $signature
+ * @property integer $timestamp
  * @property \Carbon\Carbon $created_at
  * @property \Carbon\Carbon $updated_at
  * @method static \Illuminate\Database\Query\Builder|\App\Skin whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\App\Skin whereTimestamp($value)
  * @method static \Illuminate\Database\Query\Builder|\App\Skin whereProfileId($value)
  * @method static \Illuminate\Database\Query\Builder|\App\Skin whereProfileName($value)
  * @method static \Illuminate\Database\Query\Builder|\App\Skin whereSkinUrl($value)
  * @method static \Illuminate\Database\Query\Builder|\App\Skin whereCapeUrl($value)
  * @method static \Illuminate\Database\Query\Builder|\App\Skin whereSlimModel($value)
  * @method static \Illuminate\Database\Query\Builder|\App\Skin whereSignature($value)
+ * @method static \Illuminate\Database\Query\Builder|\App\Skin whereTimestamp($value)
  * @method static \Illuminate\Database\Query\Builder|\App\Skin whereCreatedAt($value)
  * @method static \Illuminate\Database\Query\Builder|\App\Skin whereUpdatedAt($value)
  * @mixin \Eloquent
  */
 class Skin extends Model {
 
- /**
- * The database table used by the model.
- *
- * @var string
- */
  protected $table = 'skins';
 
  public function getEncodedData() {
  $data = array();
  $data['timestamp'] = $this->timestamp;
- $data['profileId'] = str_replace("-", "", $this->profileId);
- $data['profileName'] = $this->profileName;
+ $data['profileId'] = str_replace("-", "", $this->profile_id);
+ $data['profileName'] = $this->profile_name;
  $data['signatureRequired'] = true;
 
  $textures = array();
- $textures['SKIN'] = ["url" => $this->skinUrl];
+ $textures['SKIN'] = ["url" => $this->skin_url];
 
- if ($this->slimModel) {
+ if ($this->slim_model) {
  $textures['SKIN']["metadata"] = ["model" => "slim"];
  }
 
- if ($this->capeUrl) {
- $textures['CAPE'] = ["url" => $this->capeUrl];
+ if ($this->cape_url) {
+ $textures['CAPE'] = ["url" => $this->cape_url];
  }
 
  $data['textures'] = $textures;

database/migrations/2016_04_19_175109_create_skins_table.php

@@ -14,15 +14,15 @@ public function up() {
  Schema::create('skins', function (Blueprint $table) {
  $table->increments('id')->unsigned();
 
- $table->uuid("profileId");
+ $table->uuid("profile_id");
 
  //due name changes the profile name could be different while we want to keep this database entry
- $table->string("profileName", 16);
+ $table->string("profile_name", 16);
 
- $table->string("skinUrl");
- $table->string("capeUrl")->nullable();
+ $table->string("skin_url");
+ $table->string("cape_url")->nullable();
 
- $table->boolean("slimModel")->default(0);
+ $table->boolean("slim_model")->default(0);
 
  $table->binary("signature");
 
@@ -31,8 +31,8 @@ public function up() {
 
  $table->timestamps();
 
- $table->index("profileId");
- $table->index("profileName");
+ $table->index("profile_id");
+ $table->index("profile_name");
  });
  }
 

database/seeds/SkinTableSeeder.php

@@ -12,11 +12,11 @@ class SkinTableSeeder extends Seeder {
  public function run() {
  App\Skin::create([
  'timestamp' => 1461163718120,
- 'profileId' => "61699b2e-d327-4a01-9f1e-0ea8c3f06bc6",
- 'profileName' => "Dinnerbone",
- 'skinUrl' => "http://textures.minecraft.net/texture/"
+ 'profile_id' => "61699b2e-d327-4a01-9f1e-0ea8c3f06bc6",
+ 'profile_name' => "Dinnerbone",
+ 'skin_url' => "http://textures.minecraft.net/texture/"
  . "cd6be915b261643fd13621ee4e99c9e541a551d80272687a3b56183b981fb9a",
- 'capeUrl' => "http://textures.minecraft.net/texture/"
+ 'cape_url' => "http://textures.minecraft.net/texture/"
  . "eec3cabfaeed5dafe61c6546297e853a547c39ec238d7c44bf4eb4a49dc1f2c0",
  'signature' => base64_decode("FjF5sk3ZC6mUEV9Z3QMNIFsmudgdhf2sSSy8bR/5fmAeg8df/o8nth28uk4gFADUoydhcCzB8fW2b"
  . "Fcr32pb9ujw0i6D/nX82mBhENjU29YZ5b7mCzdmNW2zH04tIDoF3mRLw2Arn+NovwoUJmSo4g/QVsT0GbQGIMaRpKzW4YTn8"