Blogpost stuff

Author: enchantinggg4

src/database/migrations/1739471947194-BlogpostDescription.ts

@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class BlogpostDescription1739471947194 implements MigrationInterface {
+  name = "BlogpostDescription1739471947194";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "blogpost_entity" ADD "short_description" text NOT NULL DEFAULT ''`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "blogpost_entity" DROP COLUMN "short_description"`,
+    );
+  }
+}

src/entity/blogpost.entity.ts

@@ -18,6 +18,13 @@ export class BlogpostEntity {
   @Column({ name: "image_key" })
   imageKey: string;
 
+  @Column({
+    type: "text",
+    name: "short_description",
+    default: "",
+  })
+  shortDescription: string;
+
   @Column({
     type: "text",
     name: "content",

src/rest/blogpost/blogpost.controller.ts

@@ -26,6 +26,8 @@ import { BlogpostMapper } from "./blogpost.mapper";
 import { WithPagination } from "../../utils/decorator/pagination";
 import { NullableIntPipe } from "../../utils/pipes";
 import { makePage } from "../../gateway/util/make-page";
+import { ForumApi } from "../../generated-api/forum";
+import { ThreadType } from "../../gateway/shared-types/thread-type";
 
 @Controller("blog")
 @ApiTags("blog")
@@ -34,6 +36,7 @@ export class BlogpostController {
     @InjectRepository(BlogpostEntity)
     private readonly blogpostEntityRepository: Repository<BlogpostEntity>,
     private readonly mapper: BlogpostMapper,
+    private readonly forumApi: ForumApi,
   ) {}
 
   @ModeratorGuard()
@@ -45,16 +48,20 @@ export class BlogpostController {
   ): Promise<BlogpostDto> {
     let blogpost: BlogpostEntity;
     if (dto.id) {
-      blogpost = await this.blogpostEntityRepository.findOne({
+      blogpost = await this.blogpostEntityRepository.findOneOrFail({
         where: { id: dto.id },
       });
     } else {
       blogpost = new BlogpostEntity();
       blogpost.author = user.steam_id;
+      blogpost.imageKey = `upload/dotaold.jpg`; // Very bad hack but wcyd
     }
     blogpost.content = dto.content;
-    blogpost.imageKey = dto.imageKey;
+    if (dto.imageKey) {
+      blogpost.imageKey = dto.imageKey;
+    }
     blogpost.title = dto.title;
+    blogpost.shortDescription = dto.shortDescription;
 
     return this.blogpostEntityRepository
       .save(blogpost)
@@ -68,10 +75,19 @@ export class BlogpostController {
     @CurrentUser() user: CurrentUserDto,
     @Param("id", ParseIntPipe) id: number,
   ): Promise<BlogpostDto> {
-    const blog = await this.blogpostEntityRepository.findOne({ where: { id } });
+    const blog = await this.blogpostEntityRepository.findOneOrFail({
+      where: { id },
+    });
+
+    if (blog.published) return this.mapper.mapPost(blog);
 
     blog.published = true;
     blog.publishedAt = new Date();
+    await this.forumApi.forumControllerGetThreadForKey({
+      threadType: ThreadType.BLOGPOST,
+      externalId: blog.id.toString(),
+      title: blog.title,
+    });
     return this.blogpostEntityRepository.save(blog).then(this.mapper.mapPost);
   }
 
@@ -80,7 +96,7 @@ export class BlogpostController {
     @Param("id", ParseIntPipe) id: number,
   ): Promise<BlogpostDto> {
     return this.blogpostEntityRepository
-      .findOne({
+      .findOneOrFail({
         where: { id, published: true },
       })
       .then(this.mapper.mapPost);
@@ -94,7 +110,7 @@ export class BlogpostController {
   ): Promise<BlogpostDto> {
     return this.blogpostEntityRepository
       .findOne({
-        where: { id, published: false },
+        where: { id },
       })
       .then(this.mapper.mapPost);
   }

src/rest/blogpost/blogpost.dto.ts

@@ -7,13 +7,15 @@ export class UpdateBlogpostDraftDto {
 
   content: string;
   title: string;
-  imageKey: string;
+  shortDescription: string;
+  imageKey?: string;
 }
 
 export class BlogpostDto {
   id: number;
   content: string;
   title: string;
+  shortDescription: string;
   image: UploadedImageDto;
 
   published: boolean;

src/rest/blogpost/blogpost.mapper.ts

@@ -17,6 +17,7 @@ export class BlogpostMapper {
     id: post.id,
     content: post.content,
     title: post.title,
+    shortDescription: post.shortDescription,
     image: this.storageMapper.mapS3Item(post.imageKey),
 
     published: post.published,

src/rest/forum/forum.controller.ts

@@ -59,6 +59,9 @@ import { PlayerId } from "../../gateway/shared-types/player-id";
 import { ReqLoggingInterceptor } from "../../middleware/req-logging.interceptor";
 import { LiveMatchService } from "../../cache/live-match.service";
 import { WithOptionalUser } from "../../utils/decorator/with-optional-user";
+import { BlogpostEntity } from "../../entity/blogpost.entity";
+import { InjectRepository } from "@nestjs/typeorm";
+import { Repository } from "typeorm";
 
 @UseInterceptors(ReqLoggingInterceptor)
 @Controller("forum")
@@ -71,6 +74,8 @@ export class ForumController {
     private readonly api: ForumApi,
     private readonly matchApi: MatchApi,
     private readonly liveMatchService: LiveMatchService,
+    @InjectRepository(BlogpostEntity)
+    private readonly blogpostEntityRepository: Repository<BlogpostEntity>,
   ) {}
 
   @ApiParam({
@@ -253,6 +258,21 @@ export class ForumController {
       return this.api
         .forumControllerGetThread(`${threadType}_${id}`)
         .then(this.mapper.mapThread);
+    } else if (threadType === ThreadType.BLOGPOST) {
+      await this.blogpostEntityRepository.findOneOrFail({
+        where: {
+          id: Number(id),
+          published: true,
+        },
+      });
+      return this.api
+        .forumControllerGetThreadForKey({
+          threadType: ThreadType.BLOGPOST,
+          externalId: id,
+          title: `Пост ${id}`,
+          op: undefined, // Make player author of its own thread
+        })
+        .then(this.mapper.mapThread);
     } else if (threadType === ThreadType.LOBBY) {
       return this.api
         .forumControllerGetThreadForKey({

src/rest/storage/storage.controller.ts

@@ -88,7 +88,9 @@ export class StorageController {
       Bucket: this.config.get("s3.bucket"),
       Prefix: this.config.get("s3.uploadPrefix"),
       ContinuationToken: ctoken,
+      MaxKeys: 50,
     } satisfies ListObjectsV2CommandInput);
+    console.log(response.KeyCount, response.Contents.length);
 
     return {
       items: response.Contents.map((it) => it.Key).map(this.mapper.mapS3Item),

src/utils/logger.ts

@@ -49,7 +49,7 @@ export class WinstonWrapper implements LoggerService {
   }
 
   error(message: any, ...optionalParams: any[]): any {
-    console.trace(optionalParams[0]);
+    console.trace(message, optionalParams[0]);
     this.winstonInstance.error(this.wrap(message, optionalParams[0]));
   }