Fixes

Author: enchantinggg4

src/app.module.ts

@@ -20,12 +20,12 @@ import { outerQuery } from 'gateway/util/outerQuery';
 import { QueryCache } from 'rcache';
 import { CacheModule } from '@nestjs/cache-manager';
 import { MatchService } from 'rest/match/match.service';
-import { CrimeController } from 'rest/crime.controller';
 import { MatchMapper } from 'rest/match/match.mapper';
 import { MatchController } from 'rest/match/match.controller';
 import { MetaMapper } from 'rest/meta/meta.mapper';
 import { InfoMapper } from 'rest/info/info.mapper';
 import { InfoService } from 'rest/info/info.service';
+import { CrimeController } from 'rest/crime/crime.controller';
 
 
 export function qCache<T, B>() {

src/gameserver/event-handler/crime-log-created.handler.ts

@@ -26,6 +26,21 @@ export const getBasePunishment = (crime: BanReason) => {
   }
 };
 
+export const getPunishmentCumulativeInterval = (crime: BanReason): string => {
+  switch (crime) {
+    case BanReason.INFINITE_BAN:
+      return "1y";
+    case BanReason.GAME_DECLINE:
+      return "4h";
+    case BanReason.LOAD_FAILURE:
+      return "24h";
+    case BanReason.ABANDON:
+      return "7d";
+    default:
+      return "1m";
+  }
+};
+
 export const countCrimes = (crimes: PlayerCrimeLogEntity[]) => {
   const grouped: Map<BanReason, number> = new Map();
   for (let crime of crimes) {
@@ -71,12 +86,13 @@ export class CrimeLogCreatedHandler
       return;
     }
 
-    // TODO: make this SQL based with interval
+    const cumInterval = getPunishmentCumulativeInterval(thisCrime.crime);
+
     const frequentCrimesCount = await this.playerCrimeLogEntityRepository
       .createQueryBuilder("pc")
       .select()
       .where("pc.steam_id = :sid", { sid: thisCrime.steam_id })
-      .andWhere("pc.created_at >= now() - '24h'::interval") // interval here
+      .andWhere(`pc.created_at >= now() - ${cumInterval}::interval`) // interval here
       .getMany();
 
     // total crimes done within 24 hours
@@ -86,7 +102,13 @@ export class CrimeLogCreatedHandler
     const basePunishment = getBasePunishment(thisCrime.crime);
     let punishmentDuration = basePunishment * totalPunishmentCount;
 
-    console.log(countedCrimes, totalPunishmentCount, basePunishment, punishmentDuration, thisCrime)
+    console.log(
+      countedCrimes,
+      totalPunishmentCount,
+      basePunishment,
+      punishmentDuration,
+      thisCrime,
+    );
 
     this.logger.log(
       `Punishment: ${punishmentDuration / 1000 / 60} minutes for ${

src/gameserver/model/leaderboard.view.ts

@@ -3,6 +3,7 @@ import { Index, ViewColumn, ViewEntity } from 'typeorm';
 @ViewEntity({
   expression: `with cte as (select plr."playerId"                                                                   as steam_id,
                     count(*)::int                                                                    as any_games,
+                    sum((m.winner = plr.team)::int)::int                                             as bot_wins,
                     sum((m.matchmaking_mode in (0, 1))::int)::int                                    as games,
                     sum((m.winner = plr.team and m.matchmaking_mode in (0, 1))::int)::int            as wins,
                     sum((m.matchmaking_mode = 0 and m.timestamp > now() - '14 days'::interval)::int) as recent_ranked_games,
@@ -15,6 +16,7 @@ select p.steam_id,
        p.wins,
        p.games,
        p.any_games,
+       p.bot_wins,
        p.mmr                                                                        as mmr,
        avg(pim.kills)::float                                                        as kills,
        avg(pim.deaths)::float                                                       as deaths,
@@ -25,7 +27,7 @@ select p.steam_id,
 from cte p
          inner join player_in_match pim on pim."playerId" = p.steam_id
          inner join finished_match m on pim."matchId" = m.id
-group by p.steam_id, p.recent_ranked_games, p.mmr, p.games, p.wins, p.any_games
+group by p.steam_id, p.recent_ranked_games, p.mmr, p.games, p.wins, p.any_games, p.bot_wins
 order by rank, games desc`,
   materialized: true,
 })
@@ -44,6 +46,9 @@ export class LeaderboardView {
   @ViewColumn()
   any_games: number;
 
+  @ViewColumn()
+  bot_wins: number;
+
   @Index()
   @ViewColumn()
   games: number;

src/rest/crime.controller.ts src/rest/crime/crime.controller.ts

@@ -0,0 +1,19 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { PlayerCrimeLogEntity } from 'gameserver/model/player-crime-log.entity';
+import { Repository } from 'typeorm';
+
+@Injectable()
+export class CrimeService {
+  constructor(
+    @InjectRepository(PlayerCrimeLogEntity)
+    private readonly playerCrimeLogEntityRepository: Repository<PlayerCrimeLogEntity>,
+  ) {
+  }
+
+
+
+  public async getCrimePage(page: number, perPage: number, ){
+
+  }
+}

src/rest/crime/crime.service.ts

@@ -25,3 +25,10 @@ export class CrimeLogPageDto extends Page<CrimeLogDto> {
   perPage: number;
   page: number;
 }
+
+
+
+export class PageRequest<T = string | number> {
+  cursor?: T;
+  perPage: number;
+}

src/rest/dto/crime.dto.ts

@@ -30,6 +30,9 @@ export class PlayerSummaryDto extends LeaderboardEntryDto {
   newbieUnrankedGamesLeft: number;
   playedAnyGame: boolean;
   calibrationGamesLeft: number;
+
+
+  hasUnrankedAccess: boolean;
 }
 
 export class BanStatusDto {

src/rest/dto/player.dto.ts

@@ -93,11 +93,14 @@ export class PlayerController {
             (ach) => ach.achievement_key === AchievementKey[key],
           ) === -1,
       )
-      .map((key) => ({
-        steam_id: steamId,
-        progress: 0,
-        achievement_key: AchievementKey[key],
-      } as AchievementEntity));
+      .map(
+        (key) =>
+          ({
+            steam_id: steamId,
+            progress: 0,
+            achievement_key: AchievementKey[key],
+          }) as AchievementEntity,
+      );
 
     return achievements.concat(paddedAchievements).map((t) => {
       if (t.match) {
@@ -198,6 +201,9 @@ offset $2 limit $3`,
 
         play_time: lb.play_time,
         playedAnyGame: lb.any_games > 0,
+
+        hasUnrankedAccess: lb.bot_wins > 0,
+
         newbieUnrankedGamesLeft:
           lb.ranked_games > 0
             ? 0
@@ -230,6 +236,8 @@ offset $2 limit $3`,
 
       playedAnyGame: summary && summary.any_games > 0,
 
+      hasUnrankedAccess: (summary?.bot_wins || 0) > 0,
+
       newbieUnrankedGamesLeft:
         (summary?.ranked_games || 0) > 0
           ? 0

src/rest/player.controller.ts

@@ -16,6 +16,7 @@ export type Summary =
       ranked_games: number;
       unranked_games: number;
       any_games: number;
+      bot_wins: number;
     });
 
 // TODO: we probably need to orm this shit up
@@ -160,6 +161,7 @@ order by score desc`;
     const some = await this.playerInMatchRepository.query(
       `with cte as (select plr."playerId"                                                                   as steam_id,
                     count(*)::int                                                                    as any_games,
+                    sum((m.winner = plr.team )::int)::int                                            as bot_wins,
                     sum((m.matchmaking_mode in (0, 1))::int)::int                                    as games,
                     sum((m.winner = plr.team and m.matchmaking_mode in (0, 1))::int)::int            as wins,
                     sum((m.matchmaking_mode = 0 and m.timestamp > now() - '14 days'::interval)::int) as recent_ranked_games,
@@ -173,6 +175,7 @@ select p.steam_id,
        p.wins,
        p.games,
        p.any_games,
+       p.bot_wins,
        p.mmr                                                                        as mmr,
        avg(pim.kills)::float                                                        as kills,
        avg(pim.deaths)::float                                                       as deaths,
@@ -183,7 +186,7 @@ select p.steam_id,
 from cte p
          inner join player_in_match pim on pim."playerId" = p.steam_id
          inner join finished_match m on pim."matchId" = m.id
-group by p.steam_id, p.recent_ranked_games, p.mmr, p.games, p.wins, p.any_games`,
+group by p.steam_id, p.recent_ranked_games, p.mmr, p.games, p.wins, p.any_games, p.bot_wins`,
       [steam_id, MatchmakingMode.RANKED, MatchmakingMode.UNRANKED],
     );