Skip to content
This repository has been archived by the owner on May 15, 2019. It is now read-only.

Commit

Permalink
Asynchronous image loading
Browse files Browse the repository at this point in the history 
Skulls are now loaded asynchronously, but are still disabled by default;
the long load times when skulls are enabled is due to username->UUID
conversion and does not have to do with loading images; the body image
when searching for a user is now disabled when skulls are disabled
  • Loading branch information
mathhulk committed Jan 29, 2018
1 parent 88388a7 commit 519b793
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 6 deletions.
3 changes: 3 additions & 0 deletions assets/js/ab-web-addon.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,7 @@ $(document).on("click", ".clipboard", function() {
*/
$(document).ready(function() {
new Clipboard(".clipboard");
$(".img-async").each(function(index, value) {
$(value).attr("src", $(value).attr("data-src-async"));
});
});
4 changes: 2 additions & 2 deletions inc/include/variables.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
"api"=>array(

// API : Skull
"skull"=>"https://visage.surgeplay.com/head/48/{UUID}",
"skull"=>"https://mc-heads.net/head/{UUID}/20",

// API : Body
"body"=>"https://visage.surgeplay.com/full/512/{UUID}",
"body"=>"https://mc-heads.net/body/{UUID}",

// API : UUID
"uuid"=>"https://mcapi.cloudprotected.net/uuid/{USERNAME}"
Expand Down
2 changes: 1 addition & 1 deletion pages/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
$operator = json_decode(file_get_contents(str_replace("{USERNAME}", $row["operator"], $__global["api"]["uuid"]), false, stream_context_create(array("http"=>array("ignore_errors"=>true)))), true)["result"][0]["uuid"];
$user = json_decode(file_get_contents(str_replace("{USERNAME}", $row["name"], $__global["api"]["uuid"]), false, stream_context_create(array("http"=>array("ignore_errors"=>true)))), true)["result"][0]["uuid"];
}
echo "<tr>".($info["skulls"] == true ? "<td class=\"text-center\"><img src=\"".str_replace("{UUID}", (strlen($user) == 32 ? $user : "8667ba71b85a4004af54457a9734eed7"), $__global["api"]["skull"])."\" alt=\"".$row["name"]."\"></td>" : "")."<td>".(strpos($row["name"], ".") === false ? "<a href=\"./?s=user&user=".$row["name"]."\">" : "").$row["name"].(strpos($row["name"], ".") === false ? "</a>" : "")."</td><td>".$row["reason"]."</td>".($info["skulls"] == true ? "<td class=\"text-center\"><img src=\"".str_replace("{UUID}", (strlen($operator) == 32 ? $operator : "8667ba71b85a4004af54457a9734eed7"), $__global["api"]["skull"])."\" alt=\"".$row["operator"]."\"></td>" : "")."<td>".$row["operator"]."</td><td>".getLocalDate($row["start"] / 1000, "F jS, Y")."<br><span class=\"badge\">".getLocalDate($row["start"] / 1000, "g:i A")."</span></td><td>".($row["end"] == "-1" ? $lang["error_not_evaluated"] : getLocalDate($row["end"] / 1000, "F jS, Y")."<br><span class=\"badge\">".getLocalDate($row["end"] / 1000, "g:i A")."</span>")."</td><td>".$lang[strtolower($row["punishmentType"])]."</td><td>".(in_array($row["punishmentType"], array("BAN", "TEMP_BAN", "MUTE", "TEMP_MUTE", "IP_BAN", "WARNING", "TEMP_WARNING")) ? (mysqli_num_rows(mysqli_query($con, "SELECT * FROM `".$info["table"]."` WHERE punishmentType='".$row["punishmentType"]."' AND start='".$row["start"]."'")) > 0 && ($row["end"] == "-1" || getLocalDate(round(microtime(true) * 1000) / 1000, "U") < getLocalDate($row["end"] / 1000, "U")) ? $lang["active"] : $lang["inactive"]) : $lang["error_not_evaluated"])."</td></tr>";
echo "<tr>".($info["skulls"] == true ? "<td class=\"text-center\"><img class=\"img-async\" data-src-async=\"".str_replace("{UUID}", (strlen($user) == 32 ? $user : "8667ba71b85a4004af54457a9734eed7"), $__global["api"]["skull"])."\" alt=\"".$row["name"]."\"></td>" : "")."<td>".(strpos($row["name"], ".") === false ? "<a href=\"./?s=user&user=".$row["name"]."\">" : "").$row["name"].(strpos($row["name"], ".") === false ? "</a>" : "")."</td><td>".$row["reason"]."</td>".($info["skulls"] == true ? "<td class=\"text-center\"><img class=\"img-async\" data-src-async=\"".str_replace("{UUID}", (strlen($operator) == 32 ? $operator : "8667ba71b85a4004af54457a9734eed7"), $__global["api"]["skull"])."\" alt=\"".$row["operator"]."\"></td>" : "")."<td>".$row["operator"]."</td><td>".getLocalDate($row["start"] / 1000, "F jS, Y")."<br><span class=\"badge\">".getLocalDate($row["start"] / 1000, "g:i A")."</span></td><td>".($row["end"] == "-1" ? $lang["error_not_evaluated"] : getLocalDate($row["end"] / 1000, "F jS, Y")."<br><span class=\"badge\">".getLocalDate($row["end"] / 1000, "g:i A")."</span>")."</td><td>".$lang[strtolower($row["punishmentType"])]."</td><td>".(in_array($row["punishmentType"], array("BAN", "TEMP_BAN", "MUTE", "TEMP_MUTE", "IP_BAN", "WARNING", "TEMP_WARNING")) ? (mysqli_num_rows(mysqli_query($con, "SELECT * FROM `".$info["table"]."` WHERE punishmentType='".$row["punishmentType"]."' AND start='".$row["start"]."'")) > 0 && ($row["end"] == "-1" || getLocalDate(round(microtime(true) * 1000) / 1000, "U") < getLocalDate($row["end"] / 1000, "U")) ? $lang["active"] : $lang["inactive"]) : $lang["error_not_evaluated"])."</td></tr>";
}
}
?>
Expand Down
12 changes: 9 additions & 3 deletions pages/user.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@
if($info["skulls"] == true) {
$operator = json_decode(file_get_contents(str_replace("{USERNAME}", $row["operator"], $__global["api"]["uuid"]), false, stream_context_create(array("http"=>array("ignore_errors"=>true)))), true)["result"][0]["uuid"];
}
echo "<tr><td>".$row["reason"]."</td>".($info["skulls"] == true ? "<td class=\"text-center\"><img src=\"".str_replace("{UUID}", (strlen($operator) == 32 ? $operator : "8667ba71b85a4004af54457a9734eed7"), $__global["api"]["skull"])."\" alt=\"".$row["operator"]."\"></td>" : "")."<td>".$row["operator"]."</td><td>".getLocalDate($row["start"] / 1000, "F jS, Y")."<br><span class=\"badge\">".getLocalDate($row["start"] / 1000, "g:i A")."</span></td><td>".($row["end"] == "-1" ? $lang["error_not_evaluated"] : getLocalDate($row["end"] / 1000, "F jS, Y")."<br><span class=\"badge\">".getLocalDate($row["end"] / 1000, "g:i A")."</span>")."</td><td>".$lang[strtolower($row["punishmentType"])]."</td><td>".(in_array($row["punishmentType"], array("BAN", "TEMP_BAN", "MUTE", "TEMP_MUTE", "IP_BAN", "WARNING", "TEMP_WARNING")) ? (mysqli_num_rows(mysqli_query($con, "SELECT * FROM `".$info["table"]."` WHERE uuid='".$row["uuid"]."' AND start='".$row["start"]."'")) > 0 && ($row["end"] == "-1" || getLocalDate(round(microtime(true) * 1000) / 1000, "U") < getLocalDate($row["end"] / 1000, "U")) ? $lang["active"] : $lang["inactive"]) : $lang["error_not_evaluated"])."</td></tr>";
echo "<tr><td>".$row["reason"]."</td>".($info["skulls"] == true ? "<td class=\"text-center\"><img class=\"img-async\" data-src-async=\"".str_replace("{UUID}", (strlen($operator) == 32 ? $operator : "8667ba71b85a4004af54457a9734eed7"), $__global["api"]["skull"])."\" alt=\"".$row["operator"]."\"></td>" : "")."<td>".$row["operator"]."</td><td>".getLocalDate($row["start"] / 1000, "F jS, Y")."<br><span class=\"badge\">".getLocalDate($row["start"] / 1000, "g:i A")."</span></td><td>".($row["end"] == "-1" ? $lang["error_not_evaluated"] : getLocalDate($row["end"] / 1000, "F jS, Y")."<br><span class=\"badge\">".getLocalDate($row["end"] / 1000, "g:i A")."</span>")."</td><td>".$lang[strtolower($row["punishmentType"])]."</td><td>".(in_array($row["punishmentType"], array("BAN", "TEMP_BAN", "MUTE", "TEMP_MUTE", "IP_BAN", "WARNING", "TEMP_WARNING")) ? (mysqli_num_rows(mysqli_query($con, "SELECT * FROM `".$info["table"]."` WHERE uuid='".$row["uuid"]."' AND start='".$row["start"]."'")) > 0 && ($row["end"] == "-1" || getLocalDate(round(microtime(true) * 1000) / 1000, "U") < getLocalDate($row["end"] / 1000, "U")) ? $lang["active"] : $lang["inactive"]) : $lang["error_not_evaluated"])."</td></tr>";
}
}
?>
Expand All @@ -216,9 +216,15 @@
</div>
</div>
<div class="col-md-4 col-sm-12 text-center">
<div class="text-center">
<span class="badge">Search</span>
</div>
<h2><?php echo htmlspecialchars($_GET["user"]); ?></h2>
<br>
<img src="<?php echo str_replace("{UUID}", ($user["status"] == "error" ? "8667ba71b85a4004af54457a9734eed7" : $user), $__global["api"]["body"]); ?>" alt="<?php echo htmlspecialchars($_GET["user"]); ?>"></img>
<?php
if($info["skulls"] == true) {
echo "<img class=\"img-async\" data-src-async=\"".str_replace("{UUID}", ($user["status"] == "error" ? "8667ba71b85a4004af54457a9734eed7" : $user), $__global["api"]["body"])."\" alt=\"".htmlspecialchars($_GET["user"])."\"></img>";
}
?>
</div>
</div>
</div>
Expand Down

0 comments on commit 519b793

Please sign in to comment.