From d79bf18f37255682950d9ccce5b55c13775c50f8 Mon Sep 17 00:00:00 2001
From: Astrologies <superativeroblox@gmail.com>
Date: Tue, 21 Dec 2021 18:52:40 -0500
Subject: [PATCH] Users\Render PendingRender update

---
 globals/Dependencies/Users/Outfit.php   |  6 ++--
 globals/Dependencies/Users/Render.php   |  2 +-
 globals/functions.php                   | 42 +------------------------
 html/avatar/renderstatus.php            |  4 ++-
 html_api/user/avatar/renderstatus.php   |  4 ++-
 html_api/user/avatar/updatesettings.php |  2 +-
 6 files changed, 12 insertions(+), 48 deletions(-)

diff --git a/globals/Dependencies/Users/Outfit.php b/globals/Dependencies/Users/Outfit.php
index b4857c7..616459d 100644
--- a/globals/Dependencies/Users/Outfit.php
+++ b/globals/Dependencies/Users/Outfit.php
@@ -67,7 +67,7 @@ namespace Alphaland\Users {
             else if (Outfit::UserOutfitCount($userid) >= 24) {
                 throw new Exception('Limit of 24 outfits');
             }
-            else if (Render::PendingRendering($userid)) {
+            else if (Render::PendingRender($userid)) {
                 throw new Exception('Please wait for the current render');
             } else {
                 //queries
@@ -140,7 +140,7 @@ namespace Alphaland\Users {
                 throw new Exception('Name too long, must be less than 50 characters 1');
             } else if (!Outfit::UserOwnsOutfit($userid, $outfitid)) {
                 throw new Exception('Error occurred');
-            } else if (Render::PendingRendering($userid)) {
+            } else if (Render::PendingRender($userid)) {
                 throw new Exception('Please wait for the current render');
             } else if (!Outfit::DeleteOutfit($userid, $outfitid)) {
                 throw new Exception('Failed to update outfit, contact an Administrator');
@@ -155,7 +155,7 @@ namespace Alphaland\Users {
         {
             if (!Outfit::UserOwnsOutfit($userid, $outfitid)) {
                 throw new Exception('Error occurred');
-            } else if (Render::PendingRendering($userid)) {
+            } else if (Render::PendingRender($userid)) {
                 throw new Exception('Please wait for the current render');
             } else {
                 $outfit = $GLOBALS['pdo']->prepare('SELECT * FROM user_outfits WHERE userid = :uid AND id = :id');
diff --git a/globals/Dependencies/Users/Render.php b/globals/Dependencies/Users/Render.php
index b6caaf4..2dcc640 100644
--- a/globals/Dependencies/Users/Render.php
+++ b/globals/Dependencies/Users/Render.php
@@ -38,7 +38,7 @@ namespace Alphaland\Users {
             return false;
         }
 
-        public static function PendingRendering(int $userid)
+        public static function PendingRender(int $userid)
         {
             $pending = $GLOBALS['pdo']->prepare("SELECT * FROM users WHERE id = :u");
             $pending->bindParam(":u", $userid, PDO::PARAM_INT);
diff --git a/globals/functions.php b/globals/functions.php
index fcc5b2c..90586af 100644
--- a/globals/functions.php
+++ b/globals/functions.php
@@ -1440,46 +1440,6 @@ function rerenderutility()
 	UsersRender::RenderPlayer($localplayer);
 }
 
-function checkUserPendingRender($player)
-{
-	$check = $GLOBALS['pdo']->prepare("SELECT * FROM users WHERE id = :u");
-	$check->bindParam(":u", $player, PDO::PARAM_INT);
-	$check->execute();
-	$checkdata = $check->fetch(PDO::FETCH_OBJ);
-	
-	$waspendingrender = false;
- 
-	if ($checkdata->pendingRender == true) //render pending
-	{
-		if (($checkdata->lastRender + 15) < time()) //last render still pending after 15 seconds
-		{
-			$update = $GLOBALS['pdo']->prepare("UPDATE users SET pendingRender = 0 WHERE id = :u");
-			$update->bindParam(":u", $player, PDO::PARAM_INT);
-			$update->execute();
-		}
-		else
-		{
-			$waspendingrender = true;
-	}
-	}
-
-	if ($checkdata->pendingHeadshotRender == true) //headshot render pending
-	{
-		if (($checkdata->lastHeadshotRender + 15) < time()) //last render still pending after 15 seconds
-		{
-			$update = $GLOBALS['pdo']->prepare("UPDATE users SET pendingHeadshotRender = 0 WHERE id = :u");
-			$update->bindParam(":u", $player, PDO::PARAM_INT);
-			$update->execute();
-		}
-		else
-		{
-			$waspendingrender = true;
-	}
-	}
-
-	return $waspendingrender;
-}
-
 //end local user render utility functions
 
 //asset functions
@@ -3008,7 +2968,7 @@ function getImageFromAsset($id)
 function getPlayerRender($uid, $headshot=false)
 {
 	//check if the user has a stalled render
-	checkUserPendingRender($uid);
+	UsersRender::PendingRender($uid);
 	
 	$player = userInfo($uid);
 
diff --git a/html/avatar/renderstatus.php b/html/avatar/renderstatus.php
index dbcb615..aba27ce 100644
--- a/html/avatar/renderstatus.php
+++ b/html/avatar/renderstatus.php
@@ -1,6 +1,8 @@
 <?php
 
-if (checkUserPendingRender($user->id))
+use Alphaland\Users\Render;
+
+if (Render::PendingRender($user->id))
 {
 	echo 'pending';
 }
\ No newline at end of file
diff --git a/html_api/user/avatar/renderstatus.php b/html_api/user/avatar/renderstatus.php
index 3b85364..75265af 100644
--- a/html_api/user/avatar/renderstatus.php
+++ b/html_api/user/avatar/renderstatus.php
@@ -5,7 +5,9 @@
 Alphaland 2021 
 */
 
-if (checkUserPendingRender($user->id))
+use Alphaland\Users\Render;
+
+if (Render::PendingRender($user->id))
 {
 	echo 'pending';
 }
\ No newline at end of file
diff --git a/html_api/user/avatar/updatesettings.php b/html_api/user/avatar/updatesettings.php
index f79b7c8..2812e9b 100644
--- a/html_api/user/avatar/updatesettings.php
+++ b/html_api/user/avatar/updatesettings.php
@@ -24,7 +24,7 @@ else
 {
 	$alert = false;
 
-	if (!checkUserPendingRender($user->id))
+	if (!Render::PendingRender($user->id))
 	{
 		if ($angleRight) {
 			if (setHeadshotAngleRight($user->id)) {