Improve Trello behavior (#1928)

* Update Trello plugin

- Add better debug logs
- Add warning message for empty AppKey

* Remove legacy board remover

No longer needed

* Add debug logs for HTTP

* Made trello api print use print

* Allow pooling HttpService from API

* Fix?

* Fix HttpService reference in TrelloAPI

Author: ccuser44

MainModule/Server/Core/HTTP.luau

@@ -30,17 +30,19 @@ return function(Vargs, GetEnv)
 
 		if Settings.Trello_Enabled then
 			HTTP.Trello.API = require(server.Deps.TrelloAPI)(Settings.Trello_AppKey, Settings.Trello_Token)
+			Logs:AddLog("Script", `Loaded Trello API as {HTTP.Trello.API}`)
 		end
 
 		-- Check HTTP asynchronously
 		task.spawn(function()
 			if service.RunService:IsStudio() then
-				server.HTTP.HttpEnabled = service.HttpService.HttpEnabled
+				HTTP.HttpEnabled = service.HttpService.HttpEnabled
+				Logs:AddLog("Script", `Pooled HttpEnabled from service as {HTTP.HttpEnabled}`)
 			else
 				local success, res = pcall(service.HttpService.GetAsync, service.HttpService, Variables.HTTPCheckUrl)
-				server.HTTP.HttpEnabled = not (not success and res:find("Http requests are not enabled.")) or true
+				HTTP.HttpEnabled = not (not success and res:find("Http requests are not enabled.")) or true
+				Logs:AddLog("Script", `Pooled HttpEnabled from request as {HTTP.HttpEnabled}. Status {success}`)
 			end
-			Logs:AddLog("Script", "Successfully pooled HttpEnabled")
 		end)
 
 		HTTP.Init = nil;

MainModule/Server/Dependencies/TrelloAPI.luau

@@ -42,7 +42,7 @@ end
 local HttpFunctions; HttpFunctions = {
 	Decode = function(str)
 		local success, tab = pcall(function()
-			return HttpService:JSONDecode(str)
+			return HttpFunctions.HttpService:JSONDecode(str)
 		end)
 
 		if success then
@@ -54,7 +54,7 @@ local HttpFunctions; HttpFunctions = {
 
 	Encode = function(tab)
 		local success, str = pcall(function()
-			return HttpService:JSONEncode(tab)
+			return HttpFunctions.HttpService:JSONEncode(tab)
 		end)
 
 		if success then
@@ -65,19 +65,19 @@ local HttpFunctions; HttpFunctions = {
 	end;
 
 	UrlEncode = function(str)
-		return HttpService:UrlEncode(str)
+		return HttpFunctions.HttpService:UrlEncode(str)
 	end;
 
 	Request = function(Url, Method, Headers, Body)
-		local RequestID = HttpService:GenerateGUID(false)
+		local RequestID = HttpFunctions.HttpService:GenerateGUID(false)
 		local ran, response = pcall(function()
 			local Request = {
 				Url = Url;
 				Method = Method;
 				Headers = {
 					["Content-Type"] = "application/json"
 				};
-				Body = HttpService:JSONEncode(Body);
+				Body = HttpFunctions.HttpService:JSONEncode(Body);
 			}
 
 			Queue[RequestID] = Request
@@ -87,7 +87,7 @@ local HttpFunctions; HttpFunctions = {
 			end
 
 			RateLimit()
-			return HttpService:RequestAsync(Request)
+			return HttpFunctions.HttpService:RequestAsync(Request)
 		end)
 
 		Queue[RequestID] = nil
@@ -100,12 +100,12 @@ local HttpFunctions; HttpFunctions = {
 	end;
 
 	Get = function(Url)
-		local RequestID = HttpService:GenerateGUID(false)
+		local RequestID = HttpFunctions.HttpService:GenerateGUID(false)
 		Queue[RequestID] = Url
 		RateLimit()
 
 		local ran, response = pcall(function()
-			return HttpService:GetAsync(Url, true)
+			return HttpFunctions.HttpService:GetAsync(Url, true)
 		end)
 
 		Queue[RequestID] = nil
@@ -118,12 +118,12 @@ local HttpFunctions; HttpFunctions = {
 	end;
 
 	Post = function(Url, Data, Type)
-		local RequestID = HttpService:GenerateGUID(false)
+		local RequestID = HttpFunctions.HttpService:GenerateGUID(false)
 		Queue[RequestID] = Url
 		RateLimit()
 
 		local ran, response = pcall(function()
-			return HttpService:PostAsync(Url, Data, Type)
+			return HttpFunctions.HttpService:PostAsync(Url, Data, Type)
 		end)
 
 		Queue[RequestID] = nil
@@ -155,12 +155,18 @@ local HttpFunctions; HttpFunctions = {
 			end
 		end
 	end;
+
+	HttpService = HttpService;
 }
 
-return function(AppKey, Token)
+return function(AppKey, Token, HttpService)
 	AppKey = AppKey or ""
 	Token = Token or ""
 
+	if HttpService and HttpService.IsA and HttpService:IsA("HttpService") then
+		HttpFunctions.HttpService = HttpService
+	end
+
 	local Arguments = `key={AppKey}&token={Token}`
 
 	local GetUrl = function(str)
@@ -175,13 +181,14 @@ return function(AppKey, Token)
 
 	local CheckHttp = function()
 		local enabled, err = pcall(function()
-			HttpService:GetAsync(GetUrl("members/trello?fields=id"))
+			HttpFunctions.HttpService:GetAsync(GetUrl("members/trello?fields=id"))
 		end)
 
 		return enabled
 	end;
 
-	if not HttpService.HttpEnabled then -- https://devforum.roblox.com/t/allow-scripts-to-access-httpenabled/73975/
+
+	if not HttpFunctions.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;
@@ -368,7 +375,7 @@ return function(AppKey, Token)
 		API[ind] = func
 	end
 
-	API.http = HttpService
+	API.http = HttpFunctions.HttpService
 	API.getListObj = API.GetListObject
 	API.checkHttp = CheckHttp
 	API.CheckHttp = CheckHttp
@@ -400,7 +407,7 @@ return function(AppKey, Token)
 			return HttpFunctions.Decode(HttpFunctions.Get(GetUrl(subUrl)))
 		end
 	end;
-
+	API.httpFunctions = HttpFunctions
 	API.getUrl = GetUrl
 
 	return API

MainModule/Server/Plugins/Misc_Features.luau

@@ -8,14 +8,6 @@ return function(Vargs, GetEnv)
 	local Functions, Commands, Admin, Anti, Core, HTTP, Logs, Remote, Process, Variables, Deps =
 		server.Functions, server.Commands, server.Admin, server.Anti, server.Core, server.HTTP, server.Logs, server.Remote, server.Process, server.Variables, server.Deps
 
-	-- // Remove legacy trello board
-	local epix_board_index = type(Settings.Trello_Secondary) == "table" and table.find(Settings.Trello_Secondary, "9HH6BEX2")
-	
-	if epix_board_index then
-		table.remove(Settings.Trello_Secondary, epix_board_index)
-		Logs:AddLog("Script", "Removed legacy trello board")
-	end
-
 	--// AutoClean
 	if Settings.AutoClean then
 		service.StartLoop("AUTO_CLEAN", Settings.AutoCleanDelay, Functions.CleanWorkspace, true)

MainModule/Server/Plugins/Trello.luau

@@ -1,3 +1,7 @@
+-- Trello plugin
+type Card = {id: string, name: string, desc: string, labels: {any}?}
+type List = {id: string, name: string, cards: {Card}}
+
 return function(Vargs, GetEnv)
 	local server = Vargs.Server;
 	local service = Vargs.Service;
@@ -8,11 +12,13 @@ return function(Vargs, GetEnv)
 
 	HTTP.Trello.Update = function()
 		if not HTTP.Trello.API or not Settings.Trello_Enabled then
+			Logs:AddLog("Script", "Not running Trello API update")
 			return
 		end
 
 		if not HTTP.HttpEnabled then
 			warn("Unable to connect to Trello. Make sure HTTP Requests are enabled in Game Settings.")
+			Logs:AddLog("Script", "Not running Trello API update due to HTTP request being disabled.")
 			return
 		else
 			local data = {
@@ -41,6 +47,7 @@ return function(Vargs, GetEnv)
 					for _, override in HTTP.Trello.Overrides do
 						if table.find(override.Lists, list.name) then
 							foundOverride = true
+							Logs:AddLog("Script", `Found override {list.name} for board {board} with {type(list.cards) == "table" and #list.cards or list.cards} cards.`)
 							for _, card in list.cards do
 								override.Process(card, data)
 							end
@@ -58,6 +65,7 @@ return function(Vargs, GetEnv)
 								table.insert(users, card.name)
 							end
 							data.Ranks[list.name] = users
+							Logs:AddLog("Script", `Found custom rank override {list.name} for board {board} with {type(list.cards) == "table" and #list.cards or list.cards} cards.`)
 						end
 					end
 				end
@@ -68,15 +76,19 @@ return function(Vargs, GetEnv)
 				Settings.Trello_Primary,
 				unpack(Settings.Trello_Secondary)
 			}
-			for i,v in boards do
+			for _, v in boards do
 				if not v or service.Trim(v) == "" then
 					continue
 				end
+				Logs:AddLog("Script", `Attempting to pool data from Trello board {v}.`)
 				local ran, err = pcall(grabData, v)
 				if not ran then
 					warn("Unable to reach Trello. Ensure your board IDs, Trello key, and token are all correct. If issue persists, try increasing HttpWait in your Adonis settings.")
+					Logs:AddLog("Script", `Failed to pool data from Trello board {v} due to {err}.`)
 					success = false
 					break
+				else
+					Logs:AddLog("Script", `Successfully pooled data from Trello board {v}.`)
 				end
 			end
 
@@ -108,7 +120,7 @@ return function(Vargs, GetEnv)
 					}
 				end
 
-				for i, v in service.GetPlayers() do
+				for _, v in service.GetPlayers() do
 					local isBanned, Reason = Admin.CheckBan(v)
 					if isBanned then
 						v:Kick(string.format("%s | Reason: %s", Variables.BanMessage, (Reason or "No reason provided")))
@@ -128,8 +140,8 @@ return function(Vargs, GetEnv)
 
 	Remote.Commands.TrelloOperation = function(p: Player, args: {[number]: any})
 		local adminLevel = Admin.GetLevel(p)
-
 		local data = args[1]
+
 		if data.Action == "MakeCard" then
 			local command = Commands.MakeCard
 			if command and Admin.CheckComLevel(adminLevel, command.AdminLevel) then
@@ -141,7 +153,7 @@ return function(Vargs, GetEnv)
 
 				for _, overrideList in HTTP.Trello.GetOverrideLists() do
 					if service.Trim(string.lower(overrideList)) == service.Trim(string.lower(listName)) then
-						Functions.Hint("You cannot create a card in that list", {p})
+						Functions.Hint("You cannot create a card in that list", {p}) -- Why??
 						return
 					end
 				end
@@ -172,15 +184,15 @@ return function(Vargs, GetEnv)
 		TrelloRequired = true;
 		AdminLevel = "Moderators";
 		ListUpdater = function(plr: Player)
-			local tab = table.create(#HTTP.Trello.Bans)
+			local tab = table.create(#HTTP.Trello.Bans + 2)
+			tab[1] = `# Banned Users: {#HTTP.Trello.Bans}`
+			tab[2] = "―――――――――――――――――――――――"
 			for _, banData in HTTP.Trello.Bans do
 				table.insert(tab, {
 					Text = banData.Name,
 					Desc = banData.Reason or "No reason specified",
 				})
 			end
-			table.insert(tab, 1, `# Banned Users: {#HTTP.Trello.Bans}`)
-			table.insert(tab, 2, "―――――――――――――――――――――――")
 			return tab
 		end;
 		Function = function(plr: Player, args: {string})
@@ -252,19 +264,17 @@ return function(Vargs, GetEnv)
 		TrelloRequired = true;
 		AdminLevel = "HeadAdmins";
 		Function = function(plr: Player, args: {string})
-			assert(args[1], "You need to supply a list name.")
-
 			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
 
-			local list = trello.Boards.MakeList(Settings.Trello_Primary, args[1])
+			local list = trello.Boards.MakeList(Settings.Trello_Primary, assert(args[1], "You need to supply a list name."))
 			Functions.Hint(`Made list {list.name}`, {plr})
 		end
 	}
 
 	Commands.ViewList = {
 		Prefix = Settings.Prefix;
-		Commands = {"viewlist", "viewtrellolist"};
+		Commands = {"viewtrellolist", "viewlist"};
 		Args = {"name"};
 		Description = "Views the specified Trello list from the primary board set in Settings.";
 		TrelloRequired = true;
@@ -298,6 +308,29 @@ return function(Vargs, GetEnv)
 	-- // Initialization
 	if Settings.Trello_Enabled then
 		service.StartLoop("TRELLO_UPDATER", Settings.HttpWait, HTTP.Trello.Update, true)
+		Logs:AddLog("Script", `Trello update loop has been started to run every {Settings.HttpWait} seconds.`)
+
+		if not Settings.Trello_AppKey or Settings.Trello_AppKey == "" then
+			table.insert(server.Messages, {
+				Level = 301;
+				Title = "Potential Trello issue!";
+				Message = "You have enabled Trello without having an AppKey and thus Trello will likely not work! For better behavior it is adviced to also add a Trello Token. Click to see more";
+				Time = 15;
+				Icon = "MatIcon://Description";
+				onClick = (server.Data and server.Data.NightlyMode) and Core.Bytecode([[ -- TODO: Upload image for this tutorial
+					local window = client.UI.Make("Window", {
+						Title = "How to change the DataStore key";
+						Size = {700,300};
+						Icon = "rbxassetid://7510994359";
+					})
+
+					window:Add("ImageLabel", {
+						Image = "rbxassetid://1059543904";
+					})
+
+					window:Ready()
+			]]) or nil})
+		end
 	end
 	Logs:AddLog("Script", "Trello Module Loaded")
 end