Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for timings command #2317

Closed
wants to merge 4 commits into from
Closed

Fix for timings command #2317

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f43bc7
Fix for timings
Frago9876543210 Jul 22, 2018
0492de7
Update TimingsCommand.php
Frago9876543210 Jul 23, 2018
c7d65dd
Update TimingsCommand.php
Frago9876543210 Jul 25, 2018
bb9dc60
Update TimingsCommand.php
Frago9876543210 Jul 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 23 additions & 16 deletions src/pocketmine/command/defaults/TimingsCommand.php
View file
Open in desktop
Expand Up @@ -98,21 +98,33 @@ public function execute(CommandSender $sender, string $commandLabel, array $args
if($paste){
fseek($fileTimings, 0);
$data = [
"syntax" => "text",
"poster" => $sender->getServer()->getName(),
"content" => stream_get_contents($fileTimings)
"browser" => $agent = $sender->getServer()->getName() . " " . $sender->getServer()->getPocketMineVersion(),
"data" => $content = stream_get_contents($fileTimings)
];
fclose($fileTimings);

$host = $sender->getServer()->getProperty("timings.host", "timings.pmmp.io");

$sender->getServer()->getAsyncPool()->submitTask(new class([
["page" => "http://paste.ubuntu.com", "extraOpts" => [
CURLOPT_HTTPHEADER => ["User-Agent: " . $sender->getServer()->getName() . " " . $sender->getServer()->getPocketMineVersion()],
CURLOPT_POST => 1,
CURLOPT_POSTFIELDS => $data,
["page" => "https://$host?upload=true", "extraOpts" => [
CURLOPT_HTTPHEADER => [
"User-Agent: $agent",
"Content-Type: application/x-www-form-urlencoded"
],
CURLOPT_POST => true,
CURLOPT_POSTFIELDS => http_build_query($data),
CURLOPT_AUTOREFERER => false,
CURLOPT_FOLLOWLOCATION => false
]]
], $sender) extends BulkCurlTask{
], $sender, $host) extends BulkCurlTask{
/** @var string */
private $host;

public function __construct(array $operations, $complexData = null, string $host){
parent::__construct($operations, $complexData);
$this->host = $host;
}

public function onCompletion(Server $server){
$sender = $this->fetchLocal();
if($sender instanceof Player and !$sender->isOnline()){ // TODO replace with a more generic API method for checking availability of CommandSender
Expand All @@ -123,17 +135,12 @@ public function onCompletion(Server $server){
$server->getLogger()->logException($result);
return;
}
list(, $headers) = $result;
foreach($headers as $headerGroup){
if(isset($headerGroup["location"]) and preg_match('#^http://paste\\.ubuntu\\.com/([A-Za-z0-9+\/=]+)/#', trim($headerGroup["location"]), $match)){
$pasteId = $match[1];
break;
}
if(isset($result[0])){
$pasteId = json_decode($result[0])->id ?? 0;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and if json_decode() returns false, what then?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dktapps try this code

$obj = (object) false;
var_dump($obj);
var_dump($obj->id ?? 0);

?? will work as isset and prevent error

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

your error handling should be explicit... and the paste ID should not become zero otherwise a broken link will be reported.

}
if(isset($pasteId)){
$sender->sendMessage(new TranslationContainer("pocketmine.command.timings.timingsUpload", ["http://paste.ubuntu.com/" . $pasteId . "/"]));
$sender->sendMessage(new TranslationContainer("pocketmine.command.timings.timingsRead",
["http://" . $sender->getServer()->getProperty("timings.host", "timings.pmmp.io") . "/?url=" . urlencode($pasteId)]));
["https://" . $this->host . "/?id=" . $pasteId]));
}else{
$sender->sendMessage(new TranslationContainer("pocketmine.command.timings.pasteError"));
}
Expand Down