Move around fills

sylvanaar · Aug 28, 2019 · 139e839 · 139e839
1 parent 640eaa8
commit 139e839
Showing 1 changed file with 56 additions and 52 deletions.
diff --git a/modules/PlayerNames.lua b/modules/PlayerNames.lua
@@ -480,6 +480,62 @@ Prat:AddModuleToLoad(function()
     self:OnPlayerDataChanged()
   end
 
+  --[[------------------------------------------------
+    Fill Functions
+  ------------------------------------------------]] --
+
+  -- Use C_FriendList.GetNumWhoResults instead
+  local GetNumWhoResults = C_FriendList.GetNumWhoResults;
+
+  -- Use C_FriendList.GetWhoInfo instead
+  local function GetWhoInfo(index)
+    local info = C_FriendList.GetWhoInfo(index);
+    return info.fullName,
+      info.fullGuildName,
+      info.level,
+      info.raceStr,
+      info.classStr,
+      info.area,
+      info.filename,
+      info.gender;
+  end
+
+  -- Use C_FriendList.SendWho instead
+  local SendWho = C_FriendList.SendWho;
+
+  local function GetNumFriends()
+    return C_FriendList.GetNumFriends(),
+      C_FriendList.GetNumOnlineFriends();
+  end
+
+   -- Use C_FriendList.GetFriendInfo or C_FriendList.GetFriendInfoByIndex instead
+   local function GetFriendInfo(friend)
+    local info;
+    if type(friend) == "number" then
+      info = C_FriendList.GetFriendInfoByIndex(friend);
+    elseif type(friend) == "string" then
+      info = C_FriendList.GetFriendInfo(friend);
+    end
+
+    if info then
+      local chatFlag = "";
+      if info.dnd then
+        chatFlag = CHAT_FLAG_DND;
+      elseif info.afk then
+        chatFlag = CHAT_FLAG_AFK;
+      end
+      return info.name,
+        info.level,
+        info.className,
+        info.area,
+        info.connected,
+        chatFlag,
+        info.notes,
+        info.referAFriend,
+        info.guid;
+    end
+  end 
+
 
   --[[------------------------------------------------
     Core Functions
@@ -599,58 +655,6 @@ Prat:AddModuleToLoad(function()
   end
 
 
-  -- Use C_FriendList.GetNumWhoResults instead
-  local GetNumWhoResults = C_FriendList.GetNumWhoResults;
-
-  -- Use C_FriendList.GetWhoInfo instead
-  local function GetWhoInfo(index)
-    local info = C_FriendList.GetWhoInfo(index);
-    return info.fullName,
-      info.fullGuildName,
-      info.level,
-      info.raceStr,
-      info.classStr,
-      info.area,
-      info.filename,
-      info.gender;
-  end
-
-  -- Use C_FriendList.SendWho instead
-  local SendWho = C_FriendList.SendWho;
-
-  local function GetNumFriends()
-    return C_FriendList.GetNumFriends(),
-      C_FriendList.GetNumOnlineFriends();
-  end
-
-   -- Use C_FriendList.GetFriendInfo or C_FriendList.GetFriendInfoByIndex instead
-   local function GetFriendInfo(friend)
-    local info;
-    if type(friend) == "number" then
-      info = C_FriendList.GetFriendInfoByIndex(friend);
-    elseif type(friend) == "string" then
-      info = C_FriendList.GetFriendInfo(friend);
-    end
-
-    if info then
-      local chatFlag = "";
-      if info.dnd then
-        chatFlag = CHAT_FLAG_DND;
-      elseif info.afk then
-        chatFlag = CHAT_FLAG_AFK;
-      end
-      return info.name,
-        info.level,
-        info.className,
-        info.area,
-        info.connected,
-        chatFlag,
-        info.notes,
-        info.referAFriend,
-        info.guid;
-    end
-  end 
-
   function module:updateWho()
     if self.wholib then return end