Merge v266 into release

Author: Dimenpsyonal

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
     name: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.2
 
       - name: Layout file name
         id: naming
@@ -56,7 +56,7 @@ jobs:
       - name: Build
         run: rojo build -o ${{ steps.naming.outputs.output_name }}.rbxm .github/build.project.json
 
-      - uses: actions/upload-artifact@v4.3.6
+      - uses: actions/upload-artifact@v4.6.2
         with:
           name: ${{ steps.naming.outputs.output_name }}
           path: ${{ steps.naming.outputs.output_name }}.rbxm
@@ -68,14 +68,14 @@ jobs:
         run: rojo build -o module.rbxm .github/module.deploy.project.json
 
       - name: Send file nightly build to Discord channel
-        uses: tsickert/discord-webhook@v6.0.0
+        uses: tsickert/discord-webhook@v7.0.0
         if: github.repository == 'Epix-Incorporated/Adonis' && github.event_name == 'push' && github.ref_name == 'master'
         with:
           webhook-url: ${{ secrets.NIGHTLY_WEBHOOK }}
           filename: ${{ steps.naming.outputs.output_name }}.rbxm
 
       - name: Publish Nightly MainModule
-        uses: fjogeleit/http-request-action@v1.16.1
+        uses: fjogeleit/http-request-action@v1.16.4
         if: github.repository == 'Epix-Incorporated/Adonis' && github.event_name == 'push' && github.ref_name == 'master'
         with:
           url: "${{ secrets.PUBURL2 }}/?assetId=${{ secrets.NIGHTLY_MODULE_ID }}"

Loader/Version.model.json

@@ -1,6 +1,6 @@
 {
 	"ClassName": "NumberValue",
 	"Properties": {
-		"Value": 265
+		"Value": 266
 	}
 }

MainModule/Client/Core/UI.luau

@@ -63,6 +63,13 @@ return function(Vargs, GetEnv)
 		UI.RunLast = nil;
 	end
 
+	local function TruncatedCompare(s1: str, s2: str)
+		local minLength = math.min(string.len(s1), string.len(s2))
+		local s1Truncated = string.sub(s1, 1, minLength)
+		local s2Truncated = string.sub(s2, 1, minLength)
+		return s1Truncated == s2Truncated
+	end 
+
 	getfenv().client = nil
 	getfenv().service = nil
 	getfenv().script = nil
@@ -546,7 +553,23 @@ return function(Vargs, GetEnv)
 			gTable:Register(gui)
 
 			return gTable,gIndex
-		end
+		end;
+
+		Autocomplete = function(provided: string, arg: string)
+			local matches = {}
+			if not provided or not arg then
+				return matches
+			end
+
+			for _, player in service.Players:GetPlayers() do
+				local name = player.Name
+				if provided == "$" or TruncatedCompare(string.lower(name), string.lower(provided)) then
+					table.insert(matches, name)
+				end
+			end
+
+			return matches
+		end;
 	}
 
 	client.UI.RegisterGui = client.UI.Register

MainModule/Client/UI/Default/Console.rbxmx

@@ -124,7 +124,7 @@
 					<token name="HorizontalScrollBarInset">0</token>
 					<int name="LayoutOrder">0</int>
 					<Content name="MidImage"><url>http://roblox.com/asset?id=158348114</url></Content>
-					<string name="Name">PlayerList</string>
+					<string name="Name">AutocompleteList</string>
 					<Ref name="NextSelectionDown">null</Ref>
 					<Ref name="NextSelectionLeft">null</Ref>
 					<Ref name="NextSelectionRight">null</Ref>
@@ -560,7 +560,7 @@ return function(data, env)
 	local frame = gui.Frame
 	local text = frame.TextBox
 	local scroll = frame.ScrollingFrame
-	local players = frame.PlayerList
+	local autoList = frame.AutocompleteList
 	local entry = gui.Entry
 
 	local Settings = Remote.Get("Setting", {"SplitKey", "ConsoleKeyCode", "BatchKey", "Prefix"})
@@ -654,7 +654,7 @@ return function(data, env)
 			scroll.ScrollingEnabled = false
 			frame.Size = UDim2.new(1,0,0,40)
 			scroll.Visible = false
-			players.Visible = false
+			autoList.Visible = false
 			scrollOpen = false
 
 			if Variables.ChatEnabled then
@@ -687,15 +687,15 @@ return function(data, env)
 		service.StarterGui:SetCoreGuiEnabled(Enum.CoreGuiType.PlayerList, false)
 
 		scroll.ScrollingEnabled = true
-		players.ScrollingEnabled = true
+		autoList.ScrollingEnabled = true
 
 		hideGuis()
 
 		consoleOpenTween:Play()
 
 		frame.Size = UDim2.new(1, 0, 0, 40)
 		scroll.Visible = false
-		players.Visible = false
+		autoList.Visible = false
 		scrollOpen = false
 		text.Text = ""
 		frame.Visible = true
@@ -728,58 +728,40 @@ return function(data, env)
 
 	text:GetPropertyChangedSignal("Text"):Connect(function()
 		if text.Text ~= "" and openConsole then
-			if string.sub(text.Text, string.len(text.Text)) == "	" then
-				if players:FindFirstChild("Entry 0") then
-					local args = string.split(tostring(text.Text), " ") -- Get command args
+			local tabWhiteSpace = "	"
+			if string.sub(text.Text, string.len(text.Text)) == tabWhiteSpace then
+				if autoList:FindFirstChild("Entry 0") then
+					local args = string.split(text.Text, splitKey) -- Get command args
 					local textWithoutLastArg = string.sub(text.Text, 1, string.len(text.Text) - string.len(args[#args])) -- Remove the last arg
 
-					text.Text = `{textWithoutLastArg}{players["Entry 0"].Text} ` -- Combine the text witout the last arg and the player name
+					text.Text = `{textWithoutLastArg}{autoList["Entry 0"].Text} ` -- Combine the text witout the last arg and the player name
 				elseif scroll:FindFirstChild("Entry 0") then
 					text.Text = string.split(scroll["Entry 0"].Text, "<")[1]
-				else
-					text.Text = text.Text..prefix
 				end
+				
 				text.CursorPosition = string.len(text.Text) + 1
-				text.Text = string.gsub(text.Text, "	", "")
+				text.Text = string.gsub(text.Text, tabWhiteSpace, "")
 			end
 			scroll:ClearAllChildren()
-			players:ClearAllChildren()
+			autoList:ClearAllChildren()
 
 			local nText = text.Text
-			if string.match(nText, `.*{batchKey}([^']+)`) then
-				nText = string.match(nText, `.*{batchKey}([^']+)`)
-				nText = string.match(nText, "^%s*(.-)%s*$")
+			local fullCmdStr = string.match(nText, `.*{batchKey}([^']+)`)
+			if fullCmdStr then
+				nText = string.match(fullCmdStr, "^%s*(.-)%s*$")
 			end
 
-			local pNum = 0
-			local pMatch = string.match(nText, `.+{splitKey}(.*)$`)
-			for _, v in service.Players:GetPlayers() do
-				if (pMatch and string.sub(string.lower(tostring(v)),1,#pMatch) == string.lower(pMatch)) or string.match(nText,`{splitKey}$`) then
-					local new = entry:Clone()
-					new.Text = tostring(v)
-					new.Name = `Entry {pNum}`
-					new.TextXAlignment = "Right"
-					new.Visible = true
-					new.Parent = players
-					new.Position = UDim2.new(0,0,0,20*pNum)
-					new.MouseButton1Down:Connect(function()
-						text.Text = text.Text..tostring(v)
-						text:CaptureFocus()
-					end)
-					pNum += 1
-				end
-			end
-
-			players.CanvasSize = UDim2.new(0,0,0,pNum*20)
-
 			local num = 0
+			local selectedCmd = ""
 			for _, v in commands do
-				if string.sub(string.lower(v),1,#nText) == string.lower(nText) or string.find(string.lower(v), string.match(string.lower(nText), `^(.-){splitKey}`) or string.lower(nText), 1, true) then
+				local cmdName = string.match(string.lower(nText), `^(.-){splitKey}`) or string.lower(nText)
+				if string.sub(string.lower(v), 1, #nText) == string.lower(nText) or string.find(string.lower(v), cmdName, 1, true) then
+					selectedCmd = v 
 					if not scrollOpen then
 						scrollOpenTween:Play()
 						--frame.Size = UDim2.new(1,0,0,140)
 						scroll.Visible = true
-						players.Visible = true
+						autoList.Visible = true
 						scrollOpen = true
 					end
 					local b = entry:Clone()
@@ -795,13 +777,38 @@ return function(data, env)
 					num += 1
 				end
 			end
-			frame.Size = UDim2.new(1, 0, 0, math.clamp((num*20)+40, 40, 140))
-			scroll.CanvasSize = UDim2.fromOffset(0, num*20)
+			
+			local aNum = 0
+			local fullSplit = string.split(nText, splitKey)
+			if num > 0 and #fullSplit > 1 then
+				local provided = string.match(nText, `.+{splitKey}(.*)$`)
+				local selectedSplit = string.split(selectedCmd, splitKey)
+				
+				local arg = selectedSplit[#fullSplit]
+				for _, v in UI.Autocomplete(provided, arg) do
+					local new = entry:Clone()
+					new.Text = v
+					new.Name = `Entry {aNum}`
+					new.TextXAlignment = "Right"
+					new.Visible = true
+					new.Parent = autoList
+					new.Position = UDim2.new(0, 0, 0, 20 * aNum)
+					new.MouseButton1Down:Connect(function()
+						text.Text = text.Text..tostring(v)
+						text:CaptureFocus()
+					end)
+					
+					aNum += 1
+				end
+			end
+			
+			frame.Size = UDim2.new(1, 0, 0, math.clamp((math.max(num, aNum) * 20) + 40, 40, 140))
+			scroll.CanvasSize = UDim2.fromOffset(0, num * 20)
 		elseif text.Text == "" and opened then
 			scrollCloseTween:Play()
 			--service.SafeTweenSize(frame,UDim2.new(1,0,0,40), nil, nil,0.3, nil,function() if scrollOpen then frame.Size = UDim2.new(1,0,0,140) end end)
 			scroll.Visible = false
-			players.Visible = false
+			autoList.Visible = false
 			scrollOpen = false
 			scroll:ClearAllChildren()
 			scroll.CanvasSize = UDim2.new()

MainModule/Server/Core/Admin.luau

@@ -1461,15 +1461,22 @@ return function(Vargs, GetEnv)
 
 		StringToComLevel = function(str)
 			local strType = type(str)
-			if strType == "string" and string.lower(str) == "players" then
-				return 0
-			end
 			if strType == "number" then
 				return str
+			elseif strType == "string" then
+				if string.lower(str) == "players" then
+					return 0
+				end
+
+				local lvl = Settings.Ranks[str]
+				if not lvl then
+					return -1
+				end
+
+				return lvl.Level
 			end
 
-			local lvl = Settings.Ranks[str]
-			return (lvl and lvl.Level) or tonumber(str)
+			return tonumber(str)
 		end;
 
 		CheckComLevel = function(plrAdminLevel, comLevel)

MainModule/Server/Core/Commands.luau

@@ -112,7 +112,13 @@ return function(Vargs, GetEnv)
 
 			local lvl = cmd.AdminLevel
 			if type(lvl) == "string" and lvl ~= "Donors" then
-				cmd.AdminLevel = Admin.StringToComLevel(lvl)
+				local resp = Admin.StringToComLevel(lvl)
+				if resp == nil or resp == -1 then
+					warn(`'AdminLevel' for command {ind} is provided as '{lvl}' but is invalid. Defaulting to 0.`)
+					resp = 0
+				end
+
+				cmd.AdminLevel = resp
 			elseif type(lvl) == "table" then
 				for b, v in lvl do
 					lvl[b] = Admin.StringToComLevel(v)

MainModule/Server/Core/Logs.luau

@@ -146,7 +146,7 @@ return function(Vargs, GetEnv)
 					end)
 				end
 
-				local temp = table.create(#oldLogs + #logsToSave + (Logs.Commands.__meta == "DLL" and Logs.Commands.count or 0))
+				local temp = table.create((oldLogs and #oldLogs or 0) + #logsToSave + (Logs.Commands.__meta == "DLL" and Logs.Commands.count or 0))
 
 				local function insertLog(log)
 					local isTable = type(log) == "table"

MainModule/Server/Shared/Changelog.luau

@@ -1,8 +1,14 @@
 return {
-	"Version: 265";
+	"Version: 266";
 	"*Drag edges to expand*";
 	"*Report bugs/issues on our GitHub repository*";
 	"";
+	"[v266 2025-03-31 18:28 UTC] @Dimenpsyonal";
+	"(Git/StayBlue) Refactor Autocomplete suggestions in Default theme (#1853)";
+	"(Git/convxors) Fix :oldlogs command (#1867)";
+	"(Git/StayBlue) Fix invalid admin level giving no warning (#1852)";
+	"(Git/EasternBloxxer) Blank message fix (#1868)";
+	"";
 	"[v265 2025-03-22 19:42 UTC] @Dimenpsyonal";
 	"Change client dump to use print";
     "(Git/Raineko826) Fixed :sword team kill argument not working (#1860)";

MainModule/Server/Shared/Service.luau

@@ -595,7 +595,7 @@ return function(errorHandler, eventChecker, fenceSpecific, env)
 			local new = table.create(#lines)
 			for i = 1, #lines do
 				local ran, newl = pcall(function()
-					return service.TextService:FilterStringAsync(lines[i], from.UserId):GetChatForUserAsync(to.UserId)
+					return service.TextService:FilterStringAsync(lines[i], from.UserId):GetNonChatStringForUserAsync(to.UserId)
 				end)
 				new[i] = ran and newl or lines[i] or ""
 			end