refactor: Generics for Guild commands

Author: LightDestory

Commands/Commands_Char.lua

@@ -211,49 +211,34 @@ CHAR_genericCommands = {
     [GENERICS_command] = ".teleport group ",
     [GENERICS_message] = "logCHAR_teleportGroup"
   },
+  [CHAR_createGuildCommand] = {
+    [GENERICS_isParametersNeeded] = true,
+    [GENERICS_command] = ".guild create ",
+    [GENERICS_message] = "logCHAR_createGuild"
+  },
+  [CHAR_deleteGuildCommand] = {
+    [GENERICS_isParametersNeeded] = true,
+    [GENERICS_command] = ".guild delete ",
+    [GENERICS_message] = "logCHAR_deleteGuild"
+  },
+  [CHAR_inviteGuildCommand] = {
+    [GENERICS_isParametersNeeded] = true,
+    [GENERICS_command] = ".guild invite ",
+    [GENERICS_message] = "logCHAR_inviteGuild"
+  },
+  [CHAR_uninviteGuildCommand] = {
+    [GENERICS_isParametersNeeded] = true,
+    [GENERICS_command] = ".guild uninvite ",
+    [GENERICS_message] = "logCHAR_uninviteGuild"
+  },
+  [CHAR_rankGuildCommand] = {
+    [GENERICS_isParametersNeeded] = true,
+    [GENERICS_command] = ".guild rank ",
+    [GENERICS_message] = "logCHAR_rankGuild"
+  },
 }
 -- Delete
 
-function CreateGuildButton()
-  local cname = ma_charactertarget:GetText()
-  local npccname = ma_npccharactertarget:GetText()
-  MangAdmin:ChatMsg(".guild create "..cname)
-  MangAdmin:LogAction("Created Guild: "..cname..".")
-
-end
-
-function GuildInviteButton()
-  local cname = ma_charactertarget:GetText()
-  local npccname = ma_npccharactertarget:GetText()
-  MangAdmin:ChatMsg(".guild invite "..cname)
-  MangAdmin:LogAction("Guild invitation: "..cname..".")
-
-end
-
-function GuildRankButton()
-  local cname = ma_charactertarget:GetText()
-  local npccname = ma_npccharactertarget:GetText()
-  MangAdmin:ChatMsg(".guild rank "..cname)
-  MangAdmin:LogAction("Guild rank change: "..cname..".")
-
-end
-
-function GuildDeleteButton()
-  local cname = ma_charactertarget:GetText()
-  local npccname = ma_npccharactertarget:GetText()
-  MangAdmin:ChatMsg(".guild delete "..cname)
-  MangAdmin:LogAction("Deleted guild: "..cname..".")
-
-end
-
-function GuildUninviteButton()
-  local cname = ma_charactertarget:GetText()
-  local npccname = ma_npccharactertarget:GetText()
-  MangAdmin:ChatMsg(".guild uninvite "..cname)
-  MangAdmin:LogAction("Removed from guild: "..cname..".")
-
-end
-
 --
 
 function InitModelFrame()

Commands/declarations/command_keys.lua

@@ -83,7 +83,6 @@ CHAR_freezeCommand = "freeze"
 CHAR_unfreezeCommand = "unfreeze"
 CHAR_possessCommand = "possess"
 CHAR_unpossessCommand = "unpossess"
-
 CHAR_repairItemsCommand = "repairItems"
 CHAR_banCommand = "ban"
 CHAR_unbanCommand = "unban"
@@ -94,4 +93,9 @@ CHAR_summonCommand = "summon"
 CHAR_groupSummonCommand = "groupSummon"
 CHAR_teleportNameCommand = "teleportName"
 CHAR_teleportGroupCommand = "teleportGroup"
+CHAR_createGuildCommand = "createGuild"
+CHAR_deleteGuildCommand = "deleteGuild"
+CHAR_inviteGuildCommand = "inviteGuild"
+CHAR_uninviteGuildCommand = "uninviteGuild"
+CHAR_rankGuildCommand = "rankGuild"
 

Frames/MangFrames_SectionChar.lua

@@ -834,11 +834,11 @@ function MangAdmin:CreateCharSection()
     })
 
     FrameLib:BuildButton({
-        name = "ma_createguildbutton",
+        name = "CHAR_createGuildButton",
         group = "char",
         parent = ma_midframe,
         texture = {
-            name = "ma_createguildbutton_texture",
+            name = "CHAR_createGuildButton_texture",
             color = { color.btn.r, color.btn.g, color.btn.b, transparency.btn }
         },
         size = {
@@ -850,7 +850,7 @@ function MangAdmin:CreateCharSection()
             offX = 548, --charColSix
             offY = -52 --charRowTwo
         },
-        text = Locale["ma_createguildbutton"]
+        text = Locale["labelCHAR_createGuildButton"]
     })
 
     FrameLib:BuildButton({
@@ -894,11 +894,11 @@ function MangAdmin:CreateCharSection()
     })
 
     FrameLib:BuildButton({
-        name = "ma_guildinvitebutton",
+        name = "CHAR_inviteGuildButton",
         group = "char",
         parent = ma_midframe,
         texture = {
-            name = "ma_guildinvitebutton_texture",
+            name = "CHAR_inviteGuildButton_texture",
             color = { color.btn.r, color.btn.g, color.btn.b, transparency.btn }
         },
         size = {
@@ -910,7 +910,7 @@ function MangAdmin:CreateCharSection()
             offX = 548, --charColSix
             offY = -74  --charRowThree
         },
-        text = Locale["ma_guildinvitebutton"]
+        text = Locale["labelCHAR_inviteGuildButton"]
     })
 
     FrameLib:BuildButton({
@@ -954,11 +954,11 @@ function MangAdmin:CreateCharSection()
     })
 
     FrameLib:BuildButton({
-        name = "ma_guildrankbutton",
+        name = "CHAR_rankGuildButton",
         group = "char",
         parent = ma_midframe,
         texture = {
-            name = "ma_guildrankbutton_texture",
+            name = "CHAR_rankGuildButton_texture",
             color = { color.btn.r, color.btn.g, color.btn.b, transparency.btn }
         },
         size = {
@@ -970,7 +970,7 @@ function MangAdmin:CreateCharSection()
             offX = 548, --charColSix
             offY = -95 --charRowFour
         },
-        text = Locale["ma_guildrankbutton"]
+        text = Locale["labelCHAR_rankGuildButton"]
     })
 
     FrameLib:BuildButton({
@@ -1014,11 +1014,11 @@ function MangAdmin:CreateCharSection()
     })
 
     FrameLib:BuildButton({
-        name = "ma_guilddeletebutton",
+        name = "CHAR_deleteGuildButton",
         group = "char",
         parent = ma_midframe,
         texture = {
-            name = "ma_guilddeletebutton_texture",
+            name = "CHAR_deleteGuildButton_texture",
             color = { color.btn.r, color.btn.g, color.btn.b, transparency.btn }
         },
         size = {
@@ -1030,15 +1030,15 @@ function MangAdmin:CreateCharSection()
             offX = 467, --charColFive
             offY = -117 --charRowFive
         },
-        text = Locale["ma_guilddeletebutton"]
+        text = Locale["labelCHAR_deleteGuildButton"]
     })
 
     FrameLib:BuildButton({
-        name = "ma_guilduninvitebutton",
+        name = "CHAR_uninviteGuildButton",
         group = "char",
         parent = ma_midframe,
         texture = {
-            name = "ma_guilduninvitebutton_texture",
+            name = "CHAR_uninviteGuildButton_texture",
             color = { color.btn.r, color.btn.g, color.btn.b, transparency.btn }
         },
         size = {
@@ -1050,7 +1050,7 @@ function MangAdmin:CreateCharSection()
             offX = 548, --charColSix
             offY = -117 --charRowFive
         },
-        text = Locale["ma_guilduninvitebutton"]
+        text = Locale["labelCHAR_uninviteGuildButton"]
     })
 
     FrameLib:BuildButton({

FunctionInit.lua

@@ -802,10 +802,10 @@ function InitControls()
             end
     )
     MangAdmin:PrepareScript(
-            ma_createguildbutton,
-            Locale["tt_createguildbutton"],
+            CHAR_createGuildButton,
+            Locale["ttCHAR_createGuild"],
             function()
-                CreateGuildButton()
+                genericCaller(CHAR_KEY, CHAR_createGuildCommand)
             end
     )
     MangAdmin:PrepareScript(
@@ -823,10 +823,10 @@ function InitControls()
             end
     )
     MangAdmin:PrepareScript(
-            ma_guildinvitebutton,
-            Locale["tt_guildinvitebutton"],
+            CHAR_inviteGuildButton,
+            Locale["ttCHAR_inviteGuild"],
             function()
-                GuildInviteButton()
+                genericCaller(CHAR_KEY, CHAR_inviteGuildCommand)
             end
     )
     MangAdmin:PrepareScript(
@@ -844,10 +844,10 @@ function InitControls()
             end
     )
     MangAdmin:PrepareScript(
-            ma_guildrankbutton,
-            Locale["tt_guildrankbutton"],
+            CHAR_rankGuildButton,
+            Locale["ttCHAR_rankGuild"],
             function()
-                GuildRankButton()
+                genericCaller(CHAR_KEY, CHAR_rankGuildCommand)
             end
     )
     MangAdmin:PrepareScript(
@@ -865,17 +865,17 @@ function InitControls()
             end
     )
     MangAdmin:PrepareScript(
-            ma_guilddeletebutton,
-            Locale["tt_guilddeletebutton"],
+            CHAR_deleteGuildButton,
+            Locale["ttCHAR_deleteGuild"],
             function()
-                GuildDeleteButton()
+                genericCaller(CHAR_KEY, CHAR_deleteGuildCommand)
             end
     )
     MangAdmin:PrepareScript(
-            ma_guilduninvitebutton,
-            Locale["tt_guilduninvitebutton"],
+            CHAR_uninviteGuildButton,
+            Locale["ttCHAR_uninviteGuild"],
             function()
-                GuildUninviteButton()
+                genericCaller(CHAR_KEY, CHAR_uninviteGuildCommand)
             end
     )
     MangAdmin:PrepareScript(

Locales/enUS.lua

@@ -312,6 +312,11 @@ function Return_enUS()
     ["ttCHAR_groupSummon"] = "Teleports the specified character and his/her group to your location [[Parameters: $charactername]]",
     ["ttCHAR_teleportName"] = "Teleports the specified character to the specified location [[Parameters: $charactername $telename]]",
     ["ttCHAR_teleportGroup"] = "Teleports the **selected** character and his/her group to the specified location [[Parameters: $telename]]",
+    ["ttCHAR_createGuild"] = "Creates a guild named with the specified name with the specified leader. Guild name must in quotes. [[Parameters: $GuildLeaderName $GuildName]]",
+    ["ttCHAR_deleteGuild"] = "Deletes the specifies guild. Guild name must in quotes. [[Parameters: $GuildName]]",
+    ["ttCHAR_inviteGuild"] = "Adds the specified character to the specified guild. Guild name must in quotes. [[Parameters: $charactername $guildname]]",
+    ["ttCHAR_uninviteGuild"] = "Kicks the specified character from his/her guild [[Parameters: $charactername]]",
+    ["ttCHAR_rankGuild"] = "Sets to the specified character the specified guild rank [[Parameters: $charactername #ranknumber]]",
 
     --[[CHAR-Control-Labels]]
     ["labelCHAR_killButton"] = "Kill",
@@ -348,6 +353,11 @@ function Return_enUS()
     ["labelCHAR_groupSummonButton"] = "GroupSumm",
     ["labelCHAR_teleportNameButton"] = "TeleName",
     ["labelCHAR_teleportGroupButton"] = "TeleGroup",
+    ["labelCHAR_createGuildButton"] = "G Create",
+    ["labelCHAR_deleteGuildButton"] = "G Delete",
+    ["labelCHAR_inviteGuildButton"] = "G Invite",
+    ["labelCHAR_uninviteGuildButton"] = "G UnInv",
+    ["labelCHAR_rankGuildButton"] = "G Rank",
 
     --[[CHAR-Commands Output]]
     ["logCHAR_kill"] = "_T_ has been killed",
@@ -384,6 +394,11 @@ function Return_enUS()
     ["logCHAR_groupSummon"] = "Teleported _V1_ and his/her group to you",
     ["logCHAR_teleportName"] = "Teleported _V1_ to _V2_",
     ["logCHAR_teleportGroup"] = "Teleported _T_ and his/her group to _V1_",
+    ["logCHAR_createGuild"] = "Created a guild named _V2_ lead by _V1_",
+    ["logCHAR_deleteGuild"] = "Deleted the guild _V1_",
+    ["logCHAR_inviteGuild"] = "Added _V1_ to the guild _V2_",
+    ["logCHAR_uninviteGuild"] = "Kicked _V1_ from his/her guild",
+    ["logCHAR_rankGuild"] = "Set rank _V2_ to _V1_",
 
     ["tt_RotateLeft"] = "Rotate left.",
     ["tt_RotateRight"] = "Rotate right.",
@@ -394,12 +409,7 @@ function Return_enUS()
     ["tt_resetbutton"] = "Reset the selected attribute",
     ["tt_modelzoominbutton"] = "Zoom in the selected model",
     ["tt_modelzoomoutbutton"] = "Zoom out the selected model",
-    ["tt_createguildbutton"] = "Parameters= $GuildLeaderName $GuildName  [[Creates a guild named $GuildName, with $GuildLeaderName as leader]]",
-    ["tt_guildinvitebutton"] = "Parameters= $charactername $guildname   [[Adds $charactername to the guild $guildname]]",
-    ["tt_guildrankbutton"] = "Parameters= $charactername #ranknumber   [[Sets the character specified to the rank specified in his/her guild]]",
 
-    ["tt_guilddeletebutton"] = "Parameter= $guildname  [[Deletes the specified Guild]]",
-    ["tt_guilduninvitebutton"] = "Parameter= $charactername  [[Kicks the specified character out of his/her guild]]",
     ["tt_mutebutton"] = "Parameters= $charactername #minutes  [[Disables chat for $charactername's entire account for #minutes]]",
     ["tt_charaurabutton"] = "Parameters = #AuraID [[Enter the AuraID of the aura you want to apply]]",
     ["tt_charunaurabutton"] = "Parameters = #AuraID [[Enter the AuraID of the aura you want to remove]]",
@@ -425,15 +435,6 @@ function Return_enUS()
     ["ma_Learn"] = "Learn",
     ["ma_Modify"] = "Modify",
     ["ma_Reset"] = "Reset",
-
-    ["ma_createguildbutton"] = "G Create",
-    ["ma_guildinvitebutton"] = "G Invite",
-
-    ["ma_guildrankbutton"] = "G Rank",
-
-    ["ma_guilddeletebutton"] = "G Delete",
-    ["ma_guilduninvitebutton"] = "G UnInv",
-
     ["ma_mutebutton"] = "Mute",
     ["ma_Aura"] = "Aura",
     ["ma_UnAura"] = "UnAura",