added svg head, connections -> settings

PPLBandage · Aug 7, 2024 · 0736a4a · 0736a4a
1 parent 96b5f53
commit 0736a4a
Show file tree

Hide file tree

Showing 11 changed files with 186 additions and 83 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 /dist
 /node_modules
 /build
+/migrate
 
 # Logs
 logs

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -30,15 +30,23 @@ model User {
     discordId                  String          @unique @default("")
     sessions                   Sessions[]
     profile                    Minecraft?
+    UserSettings               UserSettings?
     Bandage                    Bandage[]       @relation("UserBandages")
     stars                      Bandage[]       @relation("UserStars")
-    admin                      Boolean         @default(false)
-    banned                     Boolean         @default(false)
     joined_at                  DateTime        @default(now())
-    autoload                   Boolean         @default(true)
     notifications              Notifications[] @relation("Notifications")
     has_unreaded_notifications Boolean         @default(false)
-    profile_theme              Int             @default(0)
+}
+
+model UserSettings {
+    id             Int     @id @default(autoincrement())
+    User           User    @relation(fields: [userId], references: [id])
+    userId         Int     @unique
+    admin          Boolean @default(false)
+    banned         Boolean @default(false)
+    profile_theme  Int     @default(0)
+    autoload       Boolean @default(true)
+    public_profile Boolean @default(true)
 }
 
 model Sessions {

diff --git a/src/app.service.ts b/src/app.service.ts
@@ -5,17 +5,14 @@ interface Bandage {
         username: string;
         name: string;
         discordId: string;
-        admin: boolean;
-        banned: boolean;
         joined_at: Date;
+        UserSettings: UserSettings | null
     } | null;
     stars: {
         id: number;
         username: string;
         name: string;
         discordId: string;
-        admin: boolean;
-        banned: boolean;
         joined_at: Date;
     }[];
     categories: {
@@ -36,7 +33,7 @@ export const generate_response = (data: Bandage[], session: Session | null) => {
     /* generate list of works response by provided array of bandages */
 
     const result = data.map((el) => {
-        if (el.User?.banned) return undefined;
+        if (el.User?.UserSettings?.banned) return undefined;
         const categories = el.categories.map((cat) => {
             return {
                 id: cat.id,
@@ -57,7 +54,8 @@ export const generate_response = (data: Bandage[], session: Session | null) => {
             author: {
                 id: el.User?.id,
                 name: el.User?.name,
-                username: el.User?.username
+                username: el.User?.username,
+                public: el.User?.UserSettings?.public_profile
             },
             categories: categories.filter((el) => el !== undefined)
         }

diff --git a/src/interfaces/interfaces.ts b/src/interfaces/interfaces.ts
@@ -99,8 +99,6 @@ interface User {
     username: string;
     name: string;
     discordId: string;
-    admin: boolean;
-    banned: boolean;
     joined_at: Date;
     profile: {
         id: number;
@@ -114,8 +112,18 @@ interface User {
         valid: boolean;
         userId: number | null;
     } | null;
-    autoload: boolean;
     notifications: Notifications[];
+    UserSettings: UserSettings | null
+}
+
+interface UserSettings {
+    id: number,
+    userId: number,
+    admin: boolean,
+    banned: boolean,
+    profile_theme: number,
+    autoload: boolean,
+    public_profile: boolean
 }
 
 interface Session {

diff --git a/src/minecraft/minecraft.controller.ts b/src/minecraft/minecraft.controller.ts
@@ -1,6 +1,8 @@
 import { Controller, Get, HttpStatus, Param, Query, Res, StreamableFile, HttpException } from '@nestjs/common';
 import type { Response } from 'express'
 import { MinecraftService } from 'src/minecraft/minecraft.service';
+import { generateSvg } from './svg.module';
+import * as sharp from 'sharp';
 
 @Controller('api')
 export class minecraftController {
@@ -74,4 +76,17 @@ export class minecraftController {
         }
         return cache;
     }
+
+    @Get('/beta/head/:name')
+    async beta_head(@Param('name') name: string, @Res({ passthrough: true }) res: Response, @Query() query: { pixel_width: number }) {
+        const pixel_width = Number(query.pixel_width) || 50;
+
+        const cache = await this.minecraftService.updateSkinCache(name);
+        if (!cache) {
+            throw new HttpException({ message: 'Profile not found' }, HttpStatus.NOT_FOUND);
+        }
+        const result = await generateSvg(sharp(Buffer.from(cache.data, "base64")), pixel_width);
+        res.set({ 'Content-Type': 'image/svg+xml' });
+        return result;
+    }
 }
diff --git a/src/minecraft/minecraft.service.ts b/src/minecraft/minecraft.service.ts
@@ -3,7 +3,6 @@ import * as sharp from 'sharp';
 import { PrismaService } from "../prisma/prisma.service";
 import { Injectable } from '@nestjs/common';
 import { Buffer } from "buffer";
-import { Prisma } from "@prisma/client";
 
 @Injectable()
 export class MinecraftService {
@@ -174,7 +173,7 @@ export class MinecraftService {
         if (fragment.length < 3) {
             return null;
         }
-        const filter_rule = { OR: [{ nickname: { contains: fragment } }, { uuid: { contains: fragment } }], valid: true }
+        const filter_rule = { OR: [{ nickname: { contains: fragment } }], valid: true }
         const cache = await this.prisma.minecraft.findMany({
             where: filter_rule,
             orderBy: { default_nick: "asc" },
@@ -217,20 +216,6 @@ export class MinecraftService {
         return { statusCode: 200, new_data: result.valid };
     }
 
-
-    async changeAutoload(session: Session, state: boolean) {
-        /* switch skin autoload in editor */
-
-        const result = await this.prisma.user.update({
-            where: {
-                id: session.user.id
-            }, data: {
-                autoload: state
-            }
-        })
-        return { statusCode: 200, new_data: result.autoload };
-    }
-
     async connect(session: Session, code: string) {
         /* connect minecraft account to a user profile */
 

diff --git a/src/minecraft/svg.module.ts b/src/minecraft/svg.module.ts
@@ -0,0 +1,29 @@
+import * as sharp from 'sharp';
+
+export const generateSvg = async (image: sharp.Sharp, pixel_width: number) => {
+    const { data, info } = await image.raw()
+        .ensureAlpha()
+        .toBuffer({ resolveWithObject: true });
+
+    const pixels = [];
+    for (let x = 8; x < 16; x++) {
+        for (let y = 8; y < 16; y++) {
+            const pixelIndex = (y * info.width + x) * info.channels;
+            pixels.push(`<rect x="${(x - 8) * (pixel_width * 0.865) + (pixel_width / 2)}" y="${(y - 8) * (pixel_width * 0.865) + (pixel_width / 2)}" width="${pixel_width}" height="${pixel_width}" fill="rgba(${data[pixelIndex]}, ${data[pixelIndex + 1]}, ${data[pixelIndex + 2]}, ${data[pixelIndex + 3]})" />`);
+        }
+    }
+
+    for (let x = 40; x < 48; x++) {
+        for (let y = 8; y < 16; y++) {
+            const pixelIndex = (y * info.width + x) * info.channels;
+            pixels.push(`<rect x="${(x - 40) * pixel_width}" y="${(y - 8) * pixel_width}" width="${pixel_width}" height="${pixel_width}" fill="rgba(${data[pixelIndex]}, ${data[pixelIndex + 1]}, ${data[pixelIndex + 2]}, ${data[pixelIndex + 3]})" />`);
+        }
+    }
+
+    const result =
+        `<svg width="${pixel_width * 8}" height="${pixel_width * 8}" xmlns="http://www.w3.org/2000/svg">\n` +
+        `${pixels.join('\n')}\n` +
+        `</svg>`;
+
+    return result;
+}
diff --git a/src/root/root.controller.ts b/src/root/root.controller.ts
@@ -49,7 +49,7 @@ export class RootController {
             { loc: 'https://pplbandage.ru/me', priority: 0.5 },
             { loc: 'https://pplbandage.ru/me/stars', priority: 0.5 },
             { loc: 'https://pplbandage.ru/me/notifications', priority: 0.5 },
-            { loc: 'https://pplbandage.ru/me/connections', priority: 0.5 },
+            { loc: 'https://pplbandage.ru/me/settings', priority: 0.5 },
             { loc: 'https://pplbandage.ru/tos', priority: 0.5 },
             { loc: 'https://pplbandage.ru/contacts', priority: 0.5 }
         ]
@@ -60,7 +60,7 @@ export class RootController {
             priority: 0.6
         })));
 
-        const users = await this.prisma.user.findMany({ where: { Bandage: { some: {} } } });
+        const users = await this.prisma.user.findMany({ where: { Bandage: { some: {} }, UserSettings: { banned: false } } });
         urls = urls.concat(users.map((user) => ({
             loc: `https://pplbandage.ru/users/${user.username}`,
             priority: 0.5

diff --git a/src/user/user.controller.ts b/src/user/user.controller.ts
@@ -59,12 +59,12 @@ export class UserController {
         res.status(data.statusCode).send(data.data);
     }
 
-    @Get("/user/me/connections")
+    @Get("/user/me/settings")
     @UseGuards(AuthGuard)
     async minecraft(@Req() request: RequestSession, @Res() res: Response): Promise<void> {
         /* get user's connections */
 
-        const data = await this.userService.getConnections(request.session);
+        const data = await this.userService.getUserSettings(request.session);
         res.status(data.statusCode).send(data);
     }
 
@@ -127,7 +127,7 @@ export class UserController {
             });
             return;
         }
-        const data = await this.minecraftService.changeAutoload(request.session, query.state === "true");
+        const data = await this.userService.changeAutoload(request.session, query.state === "true");
         res.status(data.statusCode).send(data);
     }
 
@@ -236,4 +236,21 @@ export class UserController {
         const data = await this.bandageService.setStar(request.session, query.set === "true", id);
         res.status(data.statusCode).send(data);
     }
+
+    @Put("/user/me/settings/set_public")
+    @UseGuards(AuthGuard)
+    async set_public(@Req() request: RequestSession, @Res() res: Response, @Query() query: SearchQuery): Promise<void> {
+        /* set skin autoload in editor */
+
+        if (!query.state || !["true", "false"].includes(query.state)) {
+            res.status(HttpStatus.BAD_REQUEST).send({
+                status: "error",
+                message: "`State` query param invalid",
+                statusCode: 400
+            });
+            return;
+        }
+        const data = await this.userService.setPublic(request.session, query.state === "true");
+        res.status(data.statusCode).send(data);
+    }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     /dist
     /node_modules
     /build
+    /migrate
     # Logs
     logs
@@ Expand Down @@