Add skin download methods

Author: TuxCoding

travis.env renamed to .env.travis

@@ -2,12 +2,20 @@
 # which runs independent from the client system
 language: php
 
+## Cache composer bits
+cache:
+ directories:
+ - $HOME/.composer/cache
+
 # Our server is 7.0
 php: [7.0]
 
 env:
  - DB=mysql
 
+before_script:
+ - cp .env.travis .env
+
 # Commands to be run in order to setup the environment.
 install:
  # According to the travis site the composer build be very old, so update it to prevent bugs

.travis.yml

@@ -1,7 +1,7 @@
 <?php
 /**
  * A helper file for Laravel 5, to provide autocomplete information to your IDE
- * Generated for Laravel 5.2.31 on 2016-05-11.
+ * Generated for Laravel 5.2.31 on 2016-05-16.
  *
  * @author Barry vd. Heuvel <barryvdh@gmail.com>
  * @see https://github.com/barryvdh/laravel-ide-helper

_ide_helper.php

@@ -9,11 +9,6 @@ class NameHistory extends Command {
  protected $signature = 'app:namehistory {uuid}';
  protected $description = 'Command description';
 
- /**
- * Execute the console command.
- *
- * @return mixed
- */
  public function handle() {
  //
  }

app/Console/Commands/NameHistory.php

@@ -3,22 +3,52 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
+use \App\Player;
 
 class NameResolve extends Command {
 
- const UUID_URL = "https://api.mojang.com/users/profiles/minecraft/<username>?at=<timestamp>";
+ const UUID_URL = "https://api.mojang.com/users/profiles/minecraft/<username>";
+ const UUID_TIME_URL = "https://api.mojang.com/users/profiles/minecraft/<username>?at=<timestamp>";
  const MULTIPLE_UUID_URL = "https://api.mojang.com/profiles/minecraft";
 
  protected $signature = 'app:uuid {playerName}';
 
  protected $description = 'Get the UUID from a playername';
 
- /**
- * Execute the console command.
- *
- * @return mixed
- */
  public function handle() {
- //
+ $this->info("Getting UUID");
+
+ $name = $this->argument("playerName");
+ $this->downloadUUID($name);
+ }
+
+ function downloadUUID($name) {
+ $url = str_replace("<username>", $name, self::UUID_URL);
+
+ $request = curl_init();
+ curl_setopt($request, CURLOPT_RETURNTRANSFER, TRUE);
+ curl_setopt($request, CURLOPT_FOLLOWLOCATION, TRUE);
+ curl_setopt($request, CURLOPT_URL, $url);
+ try {
+ $response = curl_exec($request);
+
+ $curl_info = curl_getinfo($request);
+ if ($curl_info['http_code'] !== 200) {
+ $this->error("Return code: " . $curl_info['http_code']);
+ return;
+ }
+
+ $data = json_decode($response, true);
+ $player = new Player();
+ $player->uuid = $data['id'];
+ $player->name = $data['name'];
+
+ $player->save();
+ $this->info("Resolved " . $player);
+ } catch (Exception $ex) {
+ $this->error($ex);
+ } finally {
+ curl_close($request);
+ }
  }
 }

app/Console/Commands/NameResolve.php

@@ -0,0 +1,92 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use \App\Skin;
+use \File;
+use \Exception;
+use \MinecraftSkins\MinecraftSkins;
+
+class SkinDownload extends Command {
+
+ const SKIN_URL = "http://sessionserver.mojang.com/session/minecraft/profile/<uuid>?unsigned=false";
+
+ protected $signature = 'app:skin {uuid}';
+ protected $description = 'Download and save a skin';
+
+ public function handle() {
+ $this->info("Downloading skins");
+
+ $uuid = $this->argument("uuid");
+ $this->downloadSkin($uuid);
+ }
+
+ function downloadSkin($uuid) {
+ $url = str_replace("<uuid>", $uuid, self::SKIN_URL);
+
+ $request = curl_init();
+ curl_setopt($request, CURLOPT_RETURNTRANSFER, TRUE);
+ curl_setopt($request, CURLOPT_FOLLOWLOCATION, TRUE);
+ curl_setopt($request, CURLOPT_URL, $url);
+ try {
+ $response = curl_exec($request);
+
+ $curl_info = curl_getinfo($request);
+ if ($curl_info['http_code'] !== 200) {
+ $this->error("Return code: " . $curl_info['http_code']);
+ return;
+ }
+
+ $data = json_decode($response, true);
+ $skinProperties = $data['properties'][0];
+
+ $skin = new Skin();
+ $skin->signature = base64_decode($skinProperties['signature']);
+
+ $skinData = json_decode(base64_decode($skinProperties['value']), true);
+ $skin->timestamp = $skinData['timestamp'];
+ $skin->profile_id = $skinData['profileId'];
+ $skin->profile_name = $skinData['profileName'];
+
+ $textures = $skinData['textures'];
+ if (!isset($textures['SKIN'])) {
+ $this->error("User has no skin set");
+ return;
+ }
+
+ $skinTextures = $textures['SKIN'];
+ $skin->skin_url = $skinTextures['url'];
+ $skin->slim_model = isset($skinTextures['metadata']);
+ $this->saveRendered($uuid, $skin->skin_url);
+
+ if (isset($textures['CAPE'])) {
+ //user has a cape
+ $skin->cape_url = $textures['CAPE']['url'];
+ }
+
+ $skin->save();
+ } catch (Exception $ex) {
+ $this->error($ex);
+ } finally {
+ curl_close($request);
+ }
+ }
+
+ function saveRendered($uuid, $url) {
+ $rawSkin = imagecreatefromstring(file_get_contents($url));
+ $head = MinecraftSkins::head($rawSkin, 8);
+ $skin = MinecraftSkins::skin($rawSkin, 8);
+
+ $path = public_path() . "/img/head/$uuid.png";
+ //check if it's still the same folder
+ if (File::dirname($path) == public_path() . "/img/head") {
+ imagepng($head, $path);
+ }
+
+ $path = public_path() . "/img/skin/$uuid.png";
+ if (File::dirname($path) == public_path() . "/img/skin") {
+ imagepng($skin, $path);
+ }
+ }
+}

app/Console/Commands/SkinDownload.php

@@ -16,8 +16,9 @@ class Kernel extends ConsoleKernel {
 // Commands\Inspire::class,
  Commands\Ping::class,
  Commands\Query::class,
-// Commands\NameResolve::class,
-// Commands\NameHistory::class,
+ Commands\NameResolve::class,
+ Commands\NameHistory::class,
+ Commands\SkinDownload::class,
  ];
 
  /**
@@ -31,7 +32,6 @@ protected function schedule(Schedule $schedule) {
  // ->hourly();
  $schedule->command('app:ping')->everyThirtyMinutes()->sendOutputTo(storage_path() . '/logs/ping.log', true);
  $schedule->command('app:query')->weekly()->sendOutputTo(storage_path() . '/logs/query.log', true);
-
 // $schedule->command('queue:work --daemon')->everyMinute()->withoutOverlapping();
  }
 }

app/Console/Kernel.php

@@ -2,10 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\Console\Commands\Ping;
 use App\Player;
 use Illuminate\Http\Request;
-use App\Server;
 use App\Http\Controllers\Controller;
 
 class PlayerController extends Controller {
@@ -17,31 +15,27 @@ public function index() {
 
  public function addPlayer(Request $request) {
  $rules = array(
- 'address' => array('required', 'regex:' . Player::VALID_USERNAME),
+ 'name' => array('required', 'regex:' . Player::VALID_USERNAME),
  'g-recaptcha-response' => 'required|recaptcha',
  );
 
+ $name = $request->input("name");
+
  $validator = validator()->make($request->input(), $rules);
  if ($validator->passes()) {
- $name = $request->input("name");
- $uuid = Ping::constructOfflinePlayerUuid($name);
- logger("Adding player", ["name" => $name, "uuid" => $uuid]);
+ logger("Adding player", ["name" => $name]);
 
- $exists = Player::where("uuid", '=', $uuid)->exists();
+ $exists = Player::where("name", '=', $name)->exists();
  if ($exists) {
- return view("player.add")->with(["uuid" => $uuid, "name" => $name])->withErrors(['Player already exists']);
+ return view("player.add")->with(["name" => $name])->withErrors(['Player already exists']);
  } else {
- $player = new Player();
- $player->uuid = $uuid;
- $player->name = $name;
- $player->save();
-
- logger()->info("Added player: " . $name . " : " . $uuid);
+ \Artisan::call("app:uuid", ["playerName" => $name]);
 
- return redirect()->action("PlayerController@getPlayerByUUID", [$uuid]);
+ logger()->info("Added player: " . $name . " : ");
+ return redirect()->action("PlayerController@getPlayerByUsername", [$name]);
  }
  } else {
- return view("player.add")->with(["uuid" => $uuid, "name" => $name])->withErrors($validator);
+ return view("player.add")->with(["name" => $name])->withErrors($validator);
  }
  }
 

app/Http/Controllers/PlayerController.php

@@ -35,10 +35,8 @@
 
  Route::get('/player/search', "SearchController@searchPlayer");
 
- Route::get('/player/{uuid}', "PlayerController@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}', "PlayerController@getPlayerByUsername")
- ->where("username", "\w{2,16}");
+ Route::get('/player/{username}', "PlayerController@getPlayerByUsername")->where("username", "\w{2,16}");
+ Route::get('/player/{uuid}', "PlayerController@getPlayerByUUID");
 
  //general
  Route::get('/privacy', 'BaseController@privacy');
@@ -61,14 +59,12 @@
 
  //Player
  Route::get('/player', 'ApiController@playerIndex');
- 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}");
+ Route::get('/player/{uuid}', 'ApiController@getPlayerByUUID');
 
  //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('/skin/{uuid}', 'ApiController@getSkinByUUID');
 
  Route::get('/stats', 'ApiController@stats');
 });

app/Http/routes.php

@@ -11,19 +11,19 @@ class PlayerTableSeeder extends Seeder {
  */
  public function run() {
  App\Player::create([
- "uuid" => "069a79f4-44e9-4726-a5be-fca90e38aaf5",
+ "uuid" => "069a79f444e94726a5befca90e38aaf5",
  "name" => "Notch"
  ])->save();
 
  App\Player::create([
- "uuid" => "61699b2e-d327-4a01-9f1e-0ea8c3f06bc6",
+ "uuid" => "61699b2ed3274a019f1e0ea8c3f06bc6",
  "name" => "Dinnerbone"
  ])->save();
 
  //this account really exists
  /* @var $changed App\Player */
  $changed = App\Player::create([
- "uuid" => "173d39fd-987a-4a62-9673-b1a08c1d6dcf",
+ "uuid" => "173d39fd987a4a629673b1a08c1d6dcf",
  "name" => "Invalid"
  ]);