Update logic for multiple commands & Cross_Server module (#1874)

* Fix spelling error in API.luau

* Fix global shutdown

* Update Cross_Server.luau

* finishing touches

* convert quotes to doubles

* fix GlobalSoftShutdown usage

* update trello api

* oops

* revert 2 old msg

* better messages

* better messages

* Fix typo in CONTRIBUTING.md

* aaa

* revert

* testing signing

* yeah

* change !abortrestart

* fix possible error

* display reason

* fix countdown number

* revert if change

* add reason to formatted msg

* update AddLog & :restart

* use functions.message()

* i forgot

* wait until client is ready before sending msg

* use ceil instead of floor & fix desc clipping

* fix desc in transblack theme

* add backwards compatibility

* fix compatibility

* fix conflicts

---------

Co-authored-by: nichole <[email protected]>

Author: ddust1n

CONTRIBUTING.md

@@ -7,8 +7,6 @@
 Adonis is an ever-expanding, frequently updated, and sometimes complex system.
 To keep Adonis functional and somewhat readable rather than a tangled mess, this document sets out the policies governing contributions to consider before submitting a pull request:
 
-</div>
-
 ## 1. Governance
 
 - Pull requests (PRs) are reviewed and approved by [@Sceleratis](https://github.com/Sceleratis) or any of the appointed community maintainers:  

MainModule/Client/UI/Default/Window.rbxmx

@@ -1063,7 +1063,7 @@ return function(data, env)
 				local maxWidth = 400
 				local bounds = service.TextService:GetTextSize(sizeText, label.TextSize, label.Font, Vector2.new(maxWidth, math.huge))
 
-				local sizeX, sizeY = bounds.X + 10, bounds.Y + 10
+				local sizeX, sizeY = bounds.X + 11, bounds.Y + 11
 				local posX = (x + 6 + sizeX) < GUI.AbsoluteSize.X and (x + 6) or (x - 6 - sizeX)
 				local posY = (y - 6 - sizeY) > 0 and (y - 6 - sizeY) or (y)
 

MainModule/Client/UI/TransBlack/Window.rbxmx

@@ -1176,7 +1176,7 @@ return function(data, env)
 				local maxWidth = 400
 				local bounds = service.TextService:GetTextSize(sizeText, label.TextSize, label.Font, Vector2.new(maxWidth, math.huge))
 
-				local sizeX, sizeY = bounds.X + 10, bounds.Y + 10
+				local sizeX, sizeY = bounds.X + 11, bounds.Y + 11
 				local posX = (x + 6 + sizeX) < GUI.AbsoluteSize.X and (x + 6) or (x - 6 - sizeX)
 				local posY = (y - 6 - sizeY) > 0 and (y - 6 - sizeY) or (y)
 

MainModule/Server/Commands/Moderators.luau

@@ -411,7 +411,7 @@ return function(Vargs, env)
 						if typeof(v) == "Instance" then
 							v:Kick(string.format("\n[Warning from %s]\nReason: %s", service.FormatPlayer(plr), reason))
 						else
-							Core.CrossServer("RemovePlayer", v.Name, `Warning from {service.FormatPlayer(plr)}`, reason)
+							Core.CrossServer("RemovePlayer", tonumber(v.UserId), `Warning from {service.FormatPlayer(plr)}`, reason)
 						end
 
 						Functions.Notification("Notification", `Kick-warned {service.FormatPlayer(v)}`, {plr}, 5, "MatIcons://Shield", Core.Bytecode(`client.Remote.Send('ProcessCommand','{Functions.GetMainPrefix()}warnings {v.Name}')`))

MainModule/Server/Core/Admin.luau

@@ -970,7 +970,7 @@ return function(Vargs, GetEnv)
 					Value = value;
 				})
 
-				Core.CrossServer("RemovePlayer", p.Name, Variables.BanMessage, value.Reason or "No reason provided")
+				Core.CrossServer("RemovePlayer", tonumber(p.UserId), Variables.BanMessage, value.Reason or "No reason provided")
 			end
 
 			if type(p) ~= "table" then
@@ -1001,7 +1001,7 @@ return function(Vargs, GetEnv)
 				Value = value;
 			})
 
-			Core.CrossServer("RemovePlayer", p.Name, Variables.BanMessage, value.Reason or "No reason provided")
+			Core.CrossServer("RemovePlayer", tonumber(p.UserId), Variables.BanMessage, value.Reason or "No reason provided")
 
 			if type(p) ~= "table" then
 				if not service.Players:FindFirstChild(p.Name) then

MainModule/Server/Dependencies/TrelloAPI.luau

@@ -9,9 +9,13 @@
 -- It is requested that existing credits remain here.																											 --
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-local print = function(...) warn("[Adonis TrelloAPI]: INFO:", ...) end
-local error = function(...) warn("[Adonis TrelloAPI]: ERROR:", ...) end
-local warn = function(...) warn("[Adonis TrelloAPI]: WARN:", ...) end
+local print = function(...)
+	print(":: Adonis ::", ...)
+end
+
+local warn = function(...)
+	warn(":: Adonis ::", ...)
+end
 
 local HttpService = game:GetService("HttpService")
 local Weeks = {"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"}
@@ -23,7 +27,7 @@ local WaitTime = 10
 
 local RateLimit = function()
 	if Requests >= MaxRequests then
-		warn("Trello RateLimit Reached! Waiting 10 seconds...")
+		warn("Trello rate limit reached! Waiting "..WaitTime.." seconds...")
 		task.wait(WaitTime)
 		Requests = 0
 	end
@@ -90,7 +94,7 @@ local HttpFunctions; HttpFunctions = {
 		if ran then
 			return response
 		else
-			warn(`RequestAsync failed: {response}`)
+			warn(`Trello RequestAsync failed: {response}`)
 			return false
 		end
 	end;
@@ -108,7 +112,7 @@ local HttpFunctions; HttpFunctions = {
 		if ran then
 			return response
 		else
-			warn(`GetAsync failed: {response}`)
+			warn(`Trello GetAsync failed: {response}`)
 			return false
 		end
 	end;
@@ -126,17 +130,17 @@ local HttpFunctions; HttpFunctions = {
 		if ran then
 			return response
 		else
-			warn(`PostAsync failed: {response}`)
+			warn(`Trello PostAsync failed: {response}`)
 			return false
 		end
 	end;
 
 	Trim = function(str)
 		return string.match(str, "^%s*(.-)%s*$")
 	end;
-
+	
 	GetListObject = function(Lists, Name)
-		if not Name then error("Missing search term") end
+		if not Name then warn("No search term for GetListObject() (Trello)") end
 		for _, List in Lists do
 			if type(Name)=="table" then
 				for _, Name in Name do
@@ -177,15 +181,13 @@ return function(AppKey, Token)
 		return enabled
 	end;
 
-	local HttpEnabled = pcall(HttpService.GetAsync, HttpService, "http://www.google.com/robots.txt");
-	
-	if not HttpEnabled then
-		error("Unable to connect to trello, Http requests are not enabled. Enable them via game settings.")
+	if not HttpService.HttpEnabled then -- https://devforum.roblox.com/t/allow-scripts-to-access-httpenabled/73975/
+		warn("Unable to connect to trello, Http requests are not enabled. Enable them via game settings.")
 		return
-	end
-	
+	end;
+
 	if not CheckHttp() then
-		error("Could not connect to Trello! Please check if your app-key/token are valid.")
+		warn("Unable to connect to trello. Please check if your app key and token are valid.")
 		return
 	end;