Merge pull request #48 from Aperture-Development/bugfix-#46

Bugfix #46

Author: ApertureDevelopment

lua/msync/server/modules/sv_mrsync.lua

@@ -36,12 +36,12 @@ function MSync.modules.MRSync.init( transaction )
     ]] ))
 
     --[[
-        Description: Function to save a players rank
+        Description: Function to save a players rank using steamid and group name
         Returns: nothing
     ]]
-    function MSync.modules.MRSync.saveRank(ply)
+    function MSync.modules.MRSync.saveRankByID(steamid, group)
 
-        if MSync.modules.MRSync.settings.nosync[ply:GetUserGroup()] then return end;
+        if MSync.modules.MRSync.settings.nosync[group] then return end;
 
         local addUserRankQ = MSync.DBServer:prepare( [[
             INSERT INTO `tbl_mrsync` (user_id, rank, server_group)
@@ -52,10 +52,10 @@ function MSync.modules.MRSync.init( transaction )
             )
             ON DUPLICATE KEY UPDATE rank=VALUES(rank);
         ]] )
-        addUserRankQ:setString(1, ply:SteamID())
-        addUserRankQ:setString(2, ply:SteamID64())
-        addUserRankQ:setString(3, ply:GetUserGroup())
-        if not MSync.modules.MRSync.settings.syncall[ply:GetUserGroup()] then
+        addUserRankQ:setString(1, steamid)
+        addUserRankQ:setString(2, util.SteamIDTo64( steamid ))
+        addUserRankQ:setString(3, group)
+        if not MSync.modules.MRSync.settings.syncall[group] then
             addUserRankQ:setString(4, MSync.settings.data.serverGroup)
         else
             addUserRankQ:setString(4, "allservers")
@@ -65,32 +65,42 @@ function MSync.modules.MRSync.init( transaction )
     end
 
     --[[
-        Description: Function to save a players rank using steamid and group name
-        Returns: nothing
+        Description: Function to validate user rank in DB is correct
+        Arguments:
+            - steamid [STRING] - the steamid of the user to validate
+            - group [STRING] - the group of the user to validate
     ]]
-    function MSync.modules.MRSync.saveRankByID(steamid, group)
+    function MSync.modules.MRSync.validateData( steamid, group )
 
         if MSync.modules.MRSync.settings.nosync[group] then return end;
 
-        local addUserRankQ = MSync.DBServer:prepare( [[
-            INSERT INTO `tbl_mrsync` (user_id, rank, server_group)
-            VALUES (
-                (SELECT p_user_id FROM tbl_users WHERE steamid=? AND steamid64=?), 
-            ?, 
-                (SELECT p_group_id FROM tbl_server_grp WHERE group_name=?)
-            )
-            ON DUPLICATE KEY UPDATE rank=VALUES(rank);
-        ]] )
-        addUserRankQ:setString(1, steamid)
-        addUserRankQ:setString(2, util.SteamIDTo64( steamid ))
-        addUserRankQ:setString(3, group)
+        local removeOldRanksQ
+
         if not MSync.modules.MRSync.settings.syncall[group] then
-            addUserRankQ:setString(4, MSync.settings.data.serverGroup)
+
+            removeOldRanksQ = MSync.DBServer:prepare( [[
+                DELETE FROM `tbl_mrsync` WHERE user_id=(SELECT p_user_id FROM tbl_users WHERE steamid=? AND steamid64=?) AND server_group=(SELECT p_group_id FROM tbl_server_grp WHERE group_name='allservers');
+            ]] )
+            removeOldRanksQ:setString(1, steamid)
+            removeOldRanksQ:setString(2, util.SteamIDTo64(steamid))
+
+            removeOldRanksQ.onSuccess = function( q, data )
+                MSync.modules.MRSync.saveRankByID(steamid, group)
+            end
         else
-            addUserRankQ:setString(4, "allservers")
+
+            removeOldRanksQ = MSync.DBServer:prepare( [[
+                DELETE FROM `tbl_mrsync` WHERE user_id=(SELECT p_user_id FROM tbl_users WHERE steamid=? AND steamid64=?) AND server_group<>(SELECT p_group_id FROM tbl_server_grp WHERE group_name='allservers');
+            ]] )
+            removeOldRanksQ:setString(1, steamid)
+            removeOldRanksQ:setString(2, util.SteamIDTo64(steamid))
+
+            removeOldRanksQ.onSuccess = function( q, data )
+                MSync.modules.MRSync.saveRankByID(steamid, group)
+            end
         end
 
-        addUserRankQ:start()
+        removeOldRanksQ:start()
     end
 
     --[[
@@ -99,14 +109,15 @@ function MSync.modules.MRSync.init( transaction )
     ]]
     function MSync.modules.MRSync.loadRank(ply)
         local loadUserQ = MSync.DBServer:prepare( [[
-            SELECT rank FROM `tbl_mrsync` 
+            SELECT `rank` FROM `tbl_mrsync` 
             WHERE user_id=(
                 SELECT p_user_id FROM tbl_users WHERE steamid=? AND steamid64=?
             ) AND (server_group=(
                 SELECT p_group_id FROM tbl_server_grp WHERE group_name=?
             ) OR server_group=(
                 SELECT p_group_id FROM tbl_server_grp WHERE group_name='allservers'
-            ));
+            ))
+            LIMIT 1;
         ]] )
         loadUserQ:setString(1, ply:SteamID())
         loadUserQ:setString(2, ply:SteamID64())
@@ -226,12 +237,14 @@ function MSync.modules.MRSync.hooks()
 
     -- Save rank on disconnect
     hook.Add("PlayerDisconnected", "mrsync.H.saveRank", function(ply)
-        MSync.modules.MRSync.saveRank(ply)
+        --MSync.modules.MRSync.saveRank(ply)
+        MSync.modules.MRSync.validateData(ply:SteamID(), ply:GetUserGroup())
     end)
 
     -- Save rank on GroupChange
     hook.Add("ULibUserGroupChange", "mrsync.H.saveRankOnUpdate", function(sid, _, _, new_group, _)
-        MSync.modules.MRSync.saveRankByID(sid, new_group)
+        --MSync.modules.MRSync.saveRankByID(sid, new_group)
+        MSync.modules.MRSync.validateData(sid, new_group)
     end)
 end