Skip to content

Commit 7e18607

Browse files
committed
Return sript to join localhost when no client ticket is provided
1 parent 78f1cc3 commit 7e18607

1 file changed

Lines changed: 16 additions & 3 deletions

File tree

Site/src/routes/(rbxclient)/game/join/+server.ts

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,20 @@ export async function GET({ url }) {
3939
const clientTicket = url.searchParams.get("ticket")
4040
const privateServer = url.searchParams.get("privateServer") as string
4141

42-
if (!clientTicket) error(400, "Invalid Request")
42+
if (!clientTicket) {
43+
const scriptFile = Bun.file("../data/server/loadscripts/join.lua")
44+
const script = (await scriptFile.text())
45+
.replaceAll("_PLACE_ID", "0")
46+
.replaceAll("_SERVER_ADDRESS", `"localhost"`)
47+
.replaceAll("_SERVER_PORT", "53640")
48+
.replaceAll("_USER_ID", "0")
49+
.replaceAll("_USERNAME", `"Player1"`)
50+
.replaceAll("_MEMBERSHIP_TYPE", membershipType(0))
51+
.replaceAll("_CHAR_APPEARANCE", `""`)
52+
.replaceAll("_PING_URL", `""`)
53+
54+
return new Response(await SignData(script))
55+
}
4356

4457
const foundPrivatePlace = await findWhere(
4558
"place",
@@ -57,15 +70,15 @@ export async function GET({ url }) {
5770
const { place, user } = gameSession
5871
const { serverAddress, serverPort } = serverInfo(place)
5972

60-
const creatorUsername = place.ownerUser?.username
73+
// const creatorUsername = place.ownerUser?.username;
6174
const charApp = `http://${config.Domain}/asset/characterfetch/${user.username}`
6275
const pingUrl = `http://${config.Domain}/game/clientpresence?ticket=${clientTicket}`
6376
const scriptFile = Bun.file("../data/server/loadscripts/join.lua")
6477
const script = (await scriptFile.text())
6578
.replaceAll("_PLACE_ID", place.id.toString())
6679
.replaceAll("_SERVER_ADDRESS", `"${serverAddress}"`)
6780
.replaceAll("_SERVER_PORT", serverPort.toString())
68-
.replaceAll("_CREATOR_ID", creatorUsername)
81+
// .replaceAll("_CREATOR_ID", creatorUsername)
6982
.replaceAll("_USER_ID", Math.floor(Math.random() * 1e9).toString()) // todo: tho not rly used 4 much atm
7083
.replaceAll("_USERNAME", `"${user.username}"`)
7184
.replaceAll("_MEMBERSHIP_TYPE", membershipType(user.permissionLevel))

0 commit comments

Comments
 (0)