Merge pull request #192 from game-node-app/dev

Dev

Author: Lamarcke

.env.example

@@ -4,8 +4,8 @@ DB_PORT=3306
 DB_USER=root
 DB_PASS=root
 DB_DATABASE=gamenode
-DOMAIN_API=localhost:5000
-DOMAIN_WEBSITE=localhost:3000
+DOMAIN_API=http://localhost:5000
+DOMAIN_WEBSITE=http://localhost:3000
 SUPERTOKENS_CORE_URI=http://localhost:3567
 REDIS_URL=redis://localhost:6379
 BULLMQ_REDIS_URL=redis://localhost:6379

package.json

@@ -48,7 +48,7 @@
     "@types/async-retry": "^1.4.9",
     "@types/bad-words": "^3.0.3",
     "@types/multer": "^1.4.12",
-    "@xboxreplay/xboxlive-auth": "^4.1.0",
+    "@xboxreplay/xboxlive-auth": "^5.1.0",
     "async-retry": "^1.3.3",
     "axios": "^1.9.0",
     "bad-words": "^4.0.0",
@@ -73,7 +73,7 @@
     "steamapi": "^3.0.12",
     "supertokens-node": "^22.0.1",
     "ts-pattern": "^5.6.2",
-    "typeorm": "^0.3.21",
+    "typeorm": "^0.3.27",
     "typeorm-transactional": "^0.5.0",
     "unique-username-generator": "^1.4.0"
   },

public/icons/awards_2025.png

@@ -9,6 +9,7 @@ export enum AchievementCategory {
     REVIEWS,
     COMMENTS,
     MISC,
+    EVENTS,
 }
 
 export const ACHIEVEMENTS_GAME_IDS = {

server_swagger.json

@@ -0,0 +1,24 @@
+import { AwardsVote } from "src/awards/entity/awards-vote.entity";
+import { AchievementCategory } from "../achievements.constants";
+import { Achievement } from "../models/achievement.model";
+
+export const achievementsEventsData: Achievement[] = [
+    {
+        id: "awards_2025",
+        name: "Awards 2025",
+        description: "Participate in the 2025 Game Awards event",
+        expGainAmount: 1000,
+        category: AchievementCategory.EVENTS,
+        checkEligibility: async (dataSource, targetUserId) => {
+            const awardsVote = dataSource.getRepository(AwardsVote);
+            return awardsVote.existsBy({
+                profileUserId: targetUserId,
+                category: {
+                    event: {
+                        year: 2025,
+                    },
+                },
+            });
+        },
+    },
+];

src/achievements/achievements.constants.ts

@@ -3,10 +3,12 @@ import { achievementsReviewsData } from "./achievements-reviews.data";
 import { achievementsFollowersData } from "./achievements-followers.data";
 import { achievementsCollectionsData } from "./achievements-collections.data";
 import { achievementsMiscData } from "./achievements-misc.data";
+import { achievementsEventsData } from "./achievements-events.data";
 
 export const achievementsData: Achievement[] = [
     ...achievementsReviewsData,
     ...achievementsFollowersData,
     ...achievementsCollectionsData,
     ...achievementsMiscData,
+    ...achievementsEventsData,
 ];

src/achievements/data/achievements-events.data.ts

@@ -12,11 +12,11 @@ import { PaginationInterceptor } from "../../interceptor/pagination.interceptor"
 import { ActivitiesFeedPaginatedResponseDto } from "./dto/activities-feed-paginated-response.dto";
 import { Session } from "../../auth/session.decorator";
 import { SessionContainer } from "supertokens-node/recipe/session";
-import { CacheTTL } from "@nestjs/cache-manager";
-import { minutes } from "@nestjs/throttler";
 import { Public } from "../../auth/public.decorator";
 import { AuthGuard } from "../../auth/auth.guard";
 import { SessionAwareCacheInterceptor } from "../../interceptor/session-aware-cache/session-aware-cache.interceptor";
+import { CacheTTL } from "@nestjs/cache-manager";
+import { minutes } from "@nestjs/throttler";
 
 @ApiTags("activities-feed")
 @Controller("activities/feed")

src/achievements/data/achievements.data.ts

@@ -6,14 +6,11 @@ import {
 } from "./dto/activities-feed-request.dto";
 import { ActivitiesRepositoryService } from "../activities-repository/activities-repository.service";
 import { TPaginationData } from "../../utils/pagination/pagination-response.dto";
-import { ActivityType } from "../activities-queue/activities-queue.constants";
 import { FollowService } from "../../follow/follow.service";
 import { In } from "typeorm";
 import { minutes } from "@nestjs/throttler";
 import { buildBaseFindOptions } from "../../utils/buildBaseFindOptions";
 
-export const ACTIVITY_FEED_CACHE_KEY = "queue-feed";
-
 @Injectable()
 export class ActivitiesFeedService {
     constructor(
@@ -31,7 +28,9 @@ export class ActivitiesFeedService {
 
     private async buildGeneralActivitiesFeed(dto: ActivitiesFeedRequestDto) {
         const findOptions = buildBaseFindOptions(dto);
-        return await this.activitiesRepositoryService.findLatestBy(findOptions);
+        const results =
+            await this.activitiesRepositoryService.findLatestBy(findOptions);
+        return results;
     }
 
     private async buildFollowingActivitiesFeed(

src/activities/activities-feed/activities-feed.controller.ts

@@ -8,7 +8,7 @@ import { GameFilterModule } from "../../game/game-filter/game-filter.module";
 import { SuspensionModule } from "../../suspension/suspension.module";
 import { ReviewsModule } from "../../reviews/reviews.module";
 import { CollectionsEntriesModule } from "../../collections/collections-entries/collections-entries.module";
-import { GameRepositoryModule } from "../../game/game-repository/game-repository.module";
+import { PostsModule } from "../../posts/posts.module";
 
 @Module({
     imports: [
@@ -18,6 +18,7 @@ import { GameRepositoryModule } from "../../game/game-repository/game-repository
         SuspensionModule,
         forwardRef(() => ReviewsModule),
         forwardRef(() => CollectionsEntriesModule),
+        forwardRef(() => PostsModule),
     ],
     providers: [ActivitiesRepositoryService],
     exports: [ActivitiesRepositoryService],