Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reworking of the config system #361

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .idea/Peacock.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion components/2016/legacyContractHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { json as jsonMiddleware } from "body-parser"
import { enqueueEvent, newSession } from "../eventHandler"
import { _legacyBull, _theLastYardbirdScpc, controller } from "../controller"
import { log, LogLevel } from "../loggingInterop"
import { getConfig } from "../configSwizzleManager"
import { getConfig } from "../configManager"
import type { GameChanger, RequestWithJwt } from "../types/types"
import { randomUUID } from "crypto"
import { getFlag } from "../flags"
Expand Down
2 changes: 1 addition & 1 deletion components/2016/legacyMenuData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import { Router } from "express"
import { RequestWithJwt } from "../types/types"
import { getConfig } from "../configSwizzleManager"
import { getConfig } from "../configManager"
import { getDefaultSuitFor, uuidRegex } from "../utils"
import { json as jsonMiddleware } from "body-parser"
import { controller } from "../controller"
Expand Down
2 changes: 1 addition & 1 deletion components/2016/legacyProfileRouter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import type {
RequestWithJwt,
} from "../types/types"
import { log, LogLevel } from "../loggingInterop"
import { getConfig } from "../configSwizzleManager"
import { getConfig } from "../configManager"

import { Router } from "express"
import { controller } from "../controller"
Expand Down
4 changes: 2 additions & 2 deletions components/candle/challengeService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ import {
mergeSavedChallengeGroups,
} from "./challengeHelpers"
import assert from "assert"
import { getVersionedConfig } from "../configSwizzleManager"
import { SyncHook } from "../hooksImpl"
import { getVersionedConfig } from "../configManager"
import { getUserEscalationProgress } from "../contracts/escalations/escalationService"

import { getUnlockableById } from "../inventory"
import { SyncHook } from "tapable"

type ChallengeDefinitionLike = {
Context?: Record<string, unknown>
Expand Down
2 changes: 1 addition & 1 deletion components/candle/masteryService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
getSubLocationByName,
} from "../contracts/dataGen"
import { log, LogLevel } from "../loggingInterop"
import { getConfig, getVersionedConfig } from "../configSwizzleManager"
import { getConfig, getVersionedConfig } from "../configManager"
import { getUserData } from "../databaseHandler"
import {
MasteryData,
Expand Down
Loading