diff --git a/src/lib/server/database.ts b/src/lib/server/database.ts index 35982a8..3a427a8 100644 --- a/src/lib/server/database.ts +++ b/src/lib/server/database.ts @@ -27,8 +27,8 @@ export class User extends Model { declare telephone: string; @Column({ type: DataTypes.STRING, allowNull: false }) declare username: string; - @Column({ type: DataTypes.ENUM('java', 'bedrock', 'cracked'), allowNull: false }) - declare playertype: 'java' | 'bedrock' | 'cracked'; + @Column({ type: DataTypes.ENUM('java', 'bedrock', 'noauth'), allowNull: false }) + declare playertype: 'java' | 'bedrock' | 'noauth'; @Column({ type: DataTypes.STRING }) declare password: string; @Column({ type: DataTypes.UUIDV4 }) @@ -47,7 +47,7 @@ export class Report extends Model { declare body: string; @Column({ type: DataTypes.BOOLEAN, allowNull: false }) declare draft: boolean; - @Column({ type: DataTypes.ENUM('java', 'bedrock', 'cracked'), allowNull: false }) + @Column({ type: DataTypes.ENUM('java', 'bedrock', 'noauth'), allowNull: false }) declare status: 'none' | 'review' | 'reviewed'; @Column({ type: DataTypes.STRING }) declare notice: string; diff --git a/src/lib/server/minecraft.test.ts b/src/lib/server/minecraft.test.ts index c1dafec..42f1bf3 100644 --- a/src/lib/server/minecraft.test.ts +++ b/src/lib/server/minecraft.test.ts @@ -1,5 +1,5 @@ import { describe, expect, test } from 'vitest'; -import { getBedrockUuid, getCrackedUuid, getJavaUuid } from '$lib/server/minecraft'; +import { getBedrockUuid, getJavaUuid, getNoAuthUuid } from '$lib/server/minecraft'; describe('java username', () => { test('is valid', async () => { @@ -19,9 +19,9 @@ describe('bedrock username', () => { }); }); -describe('cracked username', () => { +describe('noauth username', () => { // every username can be converted to an uuid so every user id automatically valid test('is valid', () => { - expect(getCrackedUuid('bytedream')).toBe('88de3863-bf47-30f9-a7f4-ab6134feb49a'); + expect(getNoAuthUuid('bytedream')).toBe('88de3863-bf47-30f9-a7f4-ab6134feb49a'); }); }); diff --git a/src/lib/server/minecraft.ts b/src/lib/server/minecraft.ts index 4212995..139e23c 100644 --- a/src/lib/server/minecraft.ts +++ b/src/lib/server/minecraft.ts @@ -68,7 +68,7 @@ export async function getBedrockUuid(username: string): Promise { } // https://gist.github.com/yushijinhun/69f68397c5bb5bee76e80d192295f6e0 -export function getCrackedUuid(username: string): string { +export function getNoAuthUuid(username: string): string { const data = createHash('md5').update(`OfflinePlayer:${username}`).digest('binary').split(''); data[6] = String.fromCharCode((data[6].charCodeAt(0) & 0x0f) | 0x30); data[8] = String.fromCharCode((data[8].charCodeAt(0) & 0x3f) | 0x80); diff --git a/src/routes/admin/users/+page.svelte b/src/routes/admin/users/+page.svelte index a90c17e..833fa1b 100644 --- a/src/routes/admin/users/+page.svelte +++ b/src/routes/admin/users/+page.svelte @@ -147,7 +147,7 @@ diff --git a/src/routes/admin/users/+server.ts b/src/routes/admin/users/+server.ts index 52b7f77..863d354 100644 --- a/src/routes/admin/users/+server.ts +++ b/src/routes/admin/users/+server.ts @@ -16,7 +16,7 @@ export const POST = (async ({ request, cookies }) => { from: number | null; name: string | null; - playertype: 'java' | 'bedrock' | 'cracked' | null; + playertype: 'java' | 'bedrock' | 'noauth' | null; search: string | null; slim: boolean | null; diff --git a/src/routes/admin/users/HeaderBar.svelte b/src/routes/admin/users/HeaderBar.svelte index 533d790..7c5f27b 100644 --- a/src/routes/admin/users/HeaderBar.svelte +++ b/src/routes/admin/users/HeaderBar.svelte @@ -19,7 +19,7 @@ - + diff --git a/src/routes/register/+server.ts b/src/routes/register/+server.ts index f3836c5..4efd4ca 100644 --- a/src/routes/register/+server.ts +++ b/src/routes/register/+server.ts @@ -1,7 +1,7 @@ import { getBedrockUuid, - getCrackedUuid, getJavaUuid, + getNoAuthUuid, UserNotFoundError } from '$lib/server/minecraft'; import { error, type RequestHandler } from '@sveltejs/kit'; @@ -12,7 +12,7 @@ export const POST = (async ({ request }) => { let uuid: string; try { - // available playertypes are 'java', 'bedrock' and 'cracked' + // available playertypes are 'java', 'bedrock' and 'noauth' switch (data.get('playertype')) { case 'java': uuid = await getJavaUuid(data.get('username') as string); @@ -20,8 +20,8 @@ export const POST = (async ({ request }) => { case 'bedrock': uuid = await getBedrockUuid(data.get('username') as string); break; - case 'cracked': - uuid = getCrackedUuid(data.get('username') as string); + case 'noauth': + uuid = getNoAuthUuid(data.get('username') as string); break; default: throw new Error(`invalid player type (${data.get('playertype')})`); diff --git a/src/routes/register/Register.svelte b/src/routes/register/Register.svelte index 43fdb1e..7cea9b3 100644 --- a/src/routes/register/Register.svelte +++ b/src/routes/register/Register.svelte @@ -122,22 +122,7 @@ > - - {#if playertype === 'cracked'} -
- - Passwort - - Da Du cracked spielst, musst Du ein Passwort festlegen, mit welchem Du Dich auf dem - Server authentifizierst! Das Passwort wird im Klartext gespeichert und ist in deinen - Clientlogs sowie in Serverlogs für Admins sichtbar. Verwende daher ein neues Passwort, - welches Du nirgends sonst verwendest! Merke Dir das Passwort gut, ohne kannst Du Dich - nicht auf dem Server einloggen - - -
- {/if}
diff --git a/src/routes/report/+server.ts b/src/routes/report/+server.ts index 889952c..4b1a104 100644 --- a/src/routes/report/+server.ts +++ b/src/routes/report/+server.ts @@ -13,7 +13,9 @@ export const POST = (async ({ request, url }) => { if (data.reporter == null || data.reason == null) return new Response(null, { status: 400 }); const reporter = await User.findOne({ where: { uuid: data.reporter } }); - const reported = data.reported ? await User.findOne({ where: { uuid: data.reported } }) : undefined; + const reported = data.reported + ? await User.findOne({ where: { uuid: data.reported } }) + : undefined; if (reporter == null || reported === null) return new Response(null, { status: 400 });