Skip to content

Commit

Permalink
Optimise assert, fix webpanel debug, fix gamegravity default, fix Tim…
Browse files Browse the repository at this point in the history 
…eHint (#1281)

* Fix lint error in webpanel client

This also fixes the error reporting system

* Remove legacy PointsService command

[PointsService has been disabled totally](https://devforum.roblox.com/t/retiring-pointsservice/2318767)

* `assert` optimisation

* `assert` optimise

* `assert` optimise

* `assert` optimise and gamegravity fix

* `assert` optimisation

* Remove artifact

* Fix TimeHint

* Update Moderators.lua

* Update Moderators.lua

* Cache old originalGravity

* Add back givpoints
  • Loading branch information
@ccuser44
ccuser44 authored Nov 17, 2023
1 parent a26e611 commit 727aba5
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 63 deletions.
6 changes: 2 additions & 4 deletions MainModule/Server/Commands/Admins.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,8 +468,7 @@ return function(Vargs, env)
Description = "Same as message but says SYSTEM MESSAGE instead of your name, or whatever system message title is server to...";
AdminLevel = "Admins";
Function = function(plr: Player, args: {string})
assert(args[1], "Missing message (argument #1)")
Functions.Message(Settings.SystemTitle, service.BroadcastFilter(args[1], plr), service.GetPlayers(), true)
Functions.Message(Settings.SystemTitle, service.BroadcastFilter(assert(args[1], "Missing message (argument #1)"), plr), service.GetPlayers(), true)
end
};

Expand Down Expand Up @@ -1278,8 +1277,7 @@ return function(Vargs, env)
Description = "Unbans the target user(s) from the server";
AdminLevel = "Admins";
Function = function(plr: Player, args: {string})
assert(args[1], "Missing user (argument #1)")
for _, v in service.GetPlayers(plr, args[1], {
for _, v in service.GetPlayers(plr, assert(args[1], "Missing user (argument #1)"), {
UseFakePlayer = true;
})
do
Expand Down
15 changes: 7 additions & 8 deletions MainModule/Server/Commands/Fun.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1955,7 +1955,7 @@ return function(Vargs, env)
Fun = true;
AdminLevel = "Moderators";
Function = function(plr: Player, args: {string})
assert(Settings.AgeRestrictedCommands, "This command is disabled due to age restrictions")
assert(Settings.AgeRestrictedCommands, "This command is disabled due to age restrictions")
for i, v in service.GetPlayers(plr, args[1]) do
task.spawn(pcall, function()
if not v:IsA("Player") or not v or not v.Character or not v.Character:FindFirstChild("Head") or v.Character:FindFirstChild("Epix Puke") then return end
Expand Down Expand Up @@ -4773,8 +4773,11 @@ return function(Vargs, env)
Fun = true;
AdminLevel = "Admins";
Function = function(plr: Player, args: {string})
local num = assert(tonumber(args[1]), "Missing gravity value (or enter 'fix' to reset to normal)'")
workspace.Gravity = num or 196.2
if not Variables.OriginalGravity then
Variables.OriginalGravity = workspace.Gravity
end

workspace.Gravity = args[1] == "fix" and Variables.OriginalGravity or assert(tonumber(args[1]), "Missing gravity value (or enter 'fix' to reset to normal)'")
end
};

Expand All @@ -4786,11 +4789,7 @@ return function(Vargs, env)
Fun = true;
AdminLevel = "Admins";
Function = function(plr: Player, args: {string})
assert(plr.Character ~= nil, "Character not found")
assert(typeof(plr.Character) == "Instance", "Character found fake")
assert(plr.Character:IsA("Model"), "Character isn't a model.")

local char = plr.Character
local char = assert(plr.Character, "Character not found")
assert(char:FindFirstChild("Head"), "Head isn't found in your character. How is it going to spawn?")

local soundid = (args[1] and tonumber(args[1])) or select(1, function()
Expand Down
9 changes: 3 additions & 6 deletions MainModule/Server/Commands/HeadAdmins.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@ return function(Vargs, env)
AdminLevel = "HeadAdmins";
Function = function(plr: Player, args: {string}, data: {})
assert(args[1], "Missing target user (argument #1)")
assert(args[2], "Missing duration (argument #2)")

local duration, valid = args[2]:gsub("^(%d+)([smhd])$", function(val, unit)
local duration, valid = assert(args[2], "Missing duration (argument #2)"):gsub("^(%d+)([smhd])$", function(val, unit)
return if unit == "s" then val
elseif unit == "m" then val * 60
elseif unit == "h" then val * 60 * 60
Expand Down Expand Up @@ -53,9 +52,8 @@ return function(Vargs, env)
Hidden = true;
Function = function(plr: Player, args: {string}, data: {})
assert(args[1], "Missing target user (argument #1)")
assert(args[2], "Missing duration (argument #2)")

local duration, valid = args[2]:gsub("^(%d+)([smhd])$", function(val, unit)
local duration, valid = assert(args[2], "Missing duration (argument #2)"):gsub("^(%d+)([smhd])$", function(val, unit)
return if unit == "s" then val
elseif unit == "m" then val * 60
elseif unit == "h" then val * 60 * 60
Expand Down Expand Up @@ -262,8 +260,7 @@ return function(Vargs, env)
Function = function(plr: Player, args: {string})
local trello = HTTP.Trello.API
if not Settings.Trello_Enabled or trello == nil then return Functions.Hint('Trello has not been configured in settings', {plr}) end
assert(args[1], "Enter a valid list name")
local list = assert(trello.Boards.GetList(Settings.Trello_Primary, args[1]), "List not found.")
local list = assert(trello.Boards.GetList(Settings.Trello_Primary, assert(args[1], "Enter a valid list name")), "List not found.")

local cards = trello.Lists.GetCards(list.id)
local temp = table.create(#cards)
Expand Down
56 changes: 15 additions & 41 deletions MainModule/Server/Commands/Moderators.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,9 @@ return function(Vargs, env)
Filter = true;
AdminLevel = "Moderators";
Function = function(plr: Player, args: {string})
assert(args[1], "Missing player name")
assert(args[2], "Missing message")

for _, v in service.GetPlayers(plr, args[1]) do
for _, v in service.GetPlayers(plr, assert(args[1], "Missing player name")) do
Functions.Notification("Notification", service.Filter(args[2], plr, v), {v})
end
end
Expand Down Expand Up @@ -241,10 +240,7 @@ return function(Vargs, env)
Description = "Make a message and makes it stay for the amount of time (in seconds) you supply";
AdminLevel = "Moderators";
Function = function(plr: Player, args: {string})
assert(tonumber(args[1]), "Invalid time amount (must be number)")
assert(args[2], "Missing message")

Functions.Message(`Message from {service.FormatPlayer(plr)}`, service.BroadcastFilter(args[2], plr), service.GetPlayers(), true, args[1])
Functions.Message(`Message from {service.FormatPlayer(plr)}`, service.BroadcastFilter(assert(args[2], "Missing message"), plr), service.GetPlayers(), true, assert(tonumber(args[1]), "Invalid time amount (must be number)"))
end
};

Expand All @@ -256,9 +252,7 @@ return function(Vargs, env)
Description = "Makes a message";
AdminLevel = "Moderators";
Function = function(plr: Player, args: {string})
assert(args[1], "Missing message")

Functions.Message(`Message from {service.FormatPlayer(plr)}`, service.BroadcastFilter(args[1], plr), service.GetPlayers(), true)
Functions.Message(`Message from {service.FormatPlayer(plr)}`, service.BroadcastFilter(assert(args[1], "Missing message"), plr), service.GetPlayers(), true)
end
};

Expand Down Expand Up @@ -288,9 +282,7 @@ return function(Vargs, env)
Description = "Makes a small message";
AdminLevel = "Moderators";
Function = function(plr: Player, args: {string})
assert(args[1], "Missing message")

Functions.Notify(`Message from {service.FormatPlayer(plr)}`, service.BroadcastFilter(args[1], plr), service.GetPlayers())
Functions.Notify(`Message from {service.FormatPlayer(plr)}`, service.BroadcastFilter(assert(args[1], "Missing message"), plr), service.GetPlayers())
end
};

Expand All @@ -302,10 +294,7 @@ return function(Vargs, env)
Description = `Same as {Settings.Prefix}n but says whatever you want the title to be instead of your name.`;
AdminLevel = "Moderators";
Function = function(plr: Player, args: {string})
assert(args[1], "Missing title")
assert(args[2], "Missing message")

Functions.Notify(service.BroadcastFilter(args[1], plr), service.BroadcastFilter(args[2], plr), service.GetPlayers())
Functions.Notify(service.BroadcastFilter(assert(args[1], "Missing title"), plr), service.BroadcastFilter(assert(args[2], "Missing message") , plr), service.GetPlayers())
end
};

Expand Down Expand Up @@ -334,9 +323,7 @@ return function(Vargs, env)
Description = "Makes a hint";
AdminLevel = "Moderators";
Function = function(plr: Player, args: {string})
assert(args[1], "Missing message")

Functions.Hint(service.BroadcastFilter(args[1], plr), service.GetPlayers(), nil, service.FormatPlayer(plr), `rbxthumb://type=AvatarHeadShot&id={plr.UserId}&w=48&h=48`)
Functions.Hint(service.BroadcastFilter(assert(args[1], "Missing message"), plr), service.GetPlayers(), nil, service.FormatPlayer(plr), `rbxthumb://type=AvatarHeadShot&id={plr.UserId}&w=48&h=48`)
end
};

Expand All @@ -348,10 +335,7 @@ return function(Vargs, env)
Description = "Makes a hint and make it stay on the screen for the specified amount of time";
AdminLevel = "Moderators";
Function = function(plr: Player, args: {string})
assert(tonumber(args[1]), "Invalid time amount (must be a number)")
assert(args[2], "Missing message")

Functions.Hint(service.BroadcastFilter(args[1], plr), service.GetPlayers(), tonumber(args[2]), service.FormatPlayer(plr), `rbxthumb://type=AvatarHeadShot&id={plr.UserId}&w=48&h=48`)
Functions.Hint(service.BroadcastFilter(assert(args[2], "Missing message"), plr), service.GetPlayers(), assert(tonumber(args[1]), "Invalid time amount (must be a number)"), service.FormatPlayer(plr), `rbxthumb://type=AvatarHeadShot&id={plr.UserId}&w=48&h=48`)
end
};

Expand Down Expand Up @@ -3873,8 +3857,7 @@ return function(Vargs, env)
color = BrickColor.random().Color
Functions.Hint("A color wasn't supplied. A random color will be used instead.", {plr})
else
color = Functions.ParseColor3(args[2])
assert(color, "Invalid color provided")
color = assert(Functions.ParseColor3(args[2]), "Invalid color provided")
end

for _, v: Player in service.GetPlayers(plr, args[1]) do
Expand Down Expand Up @@ -3979,9 +3962,7 @@ return function(Vargs, env)
AdminLevel = "Moderators";
Function = function(plr: Player, args: {string})
assert(args[1], "Argument 1 missing")

local color = Functions.ParseColor3(args[1])
assert(color, "Invalid color provided")
local color = assert(Functions.ParseColor3(args[1]), "Invalid color provided")

if args[2] then
for _, v in service.GetPlayers(plr, args[2]) do
Expand All @@ -4001,9 +3982,7 @@ return function(Vargs, env)
AdminLevel = "Moderators";
Function = function(plr: Player, args: {string})
assert(args[1], "Argument 1 missing")

local color = Functions.ParseColor3(args[1])
assert(color, "Invalid color provided")
local color = assert(Functions.ParseColor3(args[1]), "Invalid color provided")

if args[2] then
for _, v in service.GetPlayers(plr, args[2]) do
Expand Down Expand Up @@ -4102,8 +4081,7 @@ return function(Vargs, env)
AdminLevel = "Moderators";
Function = function(plr: Player, args: {string})
assert(args[1], "Argument 1 missing")
local color = Functions.ParseColor3(args[1])
assert(color, "Invalid color provided")
local color = assert(Functions.ParseColor3(args[1]), "Invalid color provided")

if service.Lighting:FindFirstChildWhichIsA("Atmosphere") then
Remote.SetAtmosphere(color)
Expand Down Expand Up @@ -5826,8 +5804,8 @@ return function(Vargs, env)
Description = "Change the volume of the currently playing song";
AdminLevel = "Moderators";
Function = function(plr: Player, args: {string})
local volume = tonumber(args[1])
assert(volume, "Volume must be a valid number")
local volume = assert(tonumber(args[1]), "Volume must be a valid number")

for i, v in service.SoundService:GetChildren() do
if v.Name=="ADONIS_SOUND" then
if string.sub(args[1], 1, 1) == "+" then
Expand Down Expand Up @@ -6341,9 +6319,7 @@ return function(Vargs, env)
AdminLevel = "Moderators";
Function = function(plr: Player, args: {string})
assert(args[1], "Missing player name")
assert(tonumber(args[2]), "Missing OutfitId")

local success, desc = pcall(service.Players.GetHumanoidDescriptionFromOutfitId, service.Players, tonumber(args[2]))
local success, desc = pcall(service.Players.GetHumanoidDescriptionFromOutfitId, service.Players, assert(tonumber(args[2]), "Missing OutfitId"))

if success then
for _, v in service.GetPlayers(plr, args[1]) do
Expand All @@ -6365,9 +6341,7 @@ return function(Vargs, env)
AdminLevel = "Moderators";
Function = function(plr: Player, args: {string})
assert(args[1], "Missing player name")
assert(args[2], "Missing username or UserId")

local target = service.GetPlayers(plr, args[2], {
local target = service.GetPlayers(plr, assert(args[2], "Missing username or UserId"), {
AllowUnknownUsers = true;
})
if target then
Expand Down
4 changes: 1 addition & 3 deletions MainModule/Server/Commands/Players.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,7 @@ return function(Vargs, env)
Description = "Sends yourself a notification";
AdminLevel = "Players";
Function = function(plr: Player, args: {string})
assert(args[1], "Missing time amount")
assert(args[2], "Missing message")
Functions.Notification("Notification", args[2], {plr}, tonumber(args[1]), "MatIcon://Notifications")
Functions.Notification("Notification", assert(args[2], "Missing message"), {plr}, tonumber(assert(args[1], "Missing time amount")), "MatIcon://Notifications")
end
};

Expand Down
3 changes: 2 additions & 1 deletion WebPanel.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,8 +475,9 @@ return function(Vargs)
continue
end

local code = res.StatusCode
if code ~= 520 and code ~= 524 then
local errorMessage = string.format("WebPanel Polling Error: %* (%*)", res.StatusMessage, res.StatusCode)
local errorMessage = string.format("WebPanel Polling Error: %* (%*)", res.StatusMessage, code)

Logs:AddLog("Script", errorMessage)
Logs:AddLog("Errors", errorMessage)
Expand Down

0 comments on commit 727aba5

Please sign in to comment.