From 052d7332fb25d5b931f87f7170b5d62ada465090 Mon Sep 17 00:00:00 2001 From: Terncode Date: Wed, 25 Mar 2026 23:26:08 +0100 Subject: [PATCH] Create what? Renamed create function to createReporter function --- src/ts/server/adminServerActions.ts | 4 ++-- src/ts/server/playerUtils.ts | 4 ++-- src/ts/server/reporter.ts | 4 ++-- src/ts/server/routes/auth.ts | 6 +++--- src/ts/server/start.ts | 6 +++--- src/ts/server/utils/socketErrorHandler.ts | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/ts/server/adminServerActions.ts b/src/ts/server/adminServerActions.ts index 3b918ca..6de3c9a 100644 --- a/src/ts/server/adminServerActions.ts +++ b/src/ts/server/adminServerActions.ts @@ -29,7 +29,7 @@ import { findPonies, removeCharactersAboveLimit, createCharacter, removeCharacter, assignCharacter, removeAllCharacters } from './api/ponies'; import { accountStatus, accountAround, getServer, getLoginServer, RemovedDocument, accountHidden } from './internal'; -import { create } from './reporter'; +import { createReporter } from './reporter'; import { system } from './logger'; import { AdminService } from './services/adminService'; import { getOriginStats, clearOrigins, removeAllOrigins, removeOrigins, addOrigin, clearOriginsForAccounts } from './api/origins'; @@ -185,7 +185,7 @@ export class AdminServerActions implements IAdminServerActions, SocketServer { } @Method({ promise: true }) async report(accountId: string) { - create(this.server, accountId).info(`Reported by ${this.account.name}`); + createReporter(this.server, accountId).info(`Reported by ${this.account.name}`); } @Method({ promise: true }) async notifyUpdate(server: string) { diff --git a/src/ts/server/playerUtils.ts b/src/ts/server/playerUtils.ts index b629069..76e9566 100644 --- a/src/ts/server/playerUtils.ts +++ b/src/ts/server/playerUtils.ts @@ -19,7 +19,7 @@ import { World } from './world'; import { centerCameraOn, createCamera } from '../common/camera'; import { findEntitiesInBounds } from './serverMap'; import { CounterService } from './services/counter'; -import { create } from './reporter'; +import { createReporter } from './reporter'; import { updateAccountState } from './accountUtils'; import { isMod } from '../common/accountUtils'; import { getOriginFromHTTP } from './originUtils'; @@ -61,7 +61,7 @@ export function createClientAndPony( ) { const { account, character } = client.tokenData as TokenData; const origin = client.originalRequest && getOriginFromHTTP(client.originalRequest); - const reporter = create(server, account._id, character._id, origin); + const reporter = createReporter(server, account._id, character._id, origin); const state = getAndFixCharacterState(server, character, world, states); client.characterState = state; diff --git a/src/ts/server/reporter.ts b/src/ts/server/reporter.ts index 94041b4..5d5d8aa 100644 --- a/src/ts/server/reporter.ts +++ b/src/ts/server/reporter.ts @@ -43,7 +43,7 @@ const createLogEvent = const ignoreWarnings = ['Suspicious message', 'Spam']; /* istanbul ignore next */ -export function create(server: ServerConfig, account?: ID, pony?: ID, originInfo?: IOriginInfo): Reporter { +export function createReporter(server: ServerConfig, account?: ID, pony?: ID, originInfo?: IOriginInfo): Reporter { const logEvent = createLogEvent(server); const accountId = `${account}`; @@ -99,5 +99,5 @@ export function createFromRequest(server: ServerConfig, req: Request, pony?: any const user = req && req.user as IAccount | undefined; const account = user?._id?.toString(); const origin = req ? getOrigin(req) : undefined; - return create(server, account, pony, origin); + return createReporter(server, account, pony, origin); } diff --git a/src/ts/server/routes/auth.ts b/src/ts/server/routes/auth.ts index 4f16d23..fbbe8d0 100644 --- a/src/ts/server/routes/auth.ts +++ b/src/ts/server/routes/auth.ts @@ -8,7 +8,7 @@ import { BannedMuted, Settings, ServerConfig, AccountFlags, ServerLiveSettings } import { Account, IAccount, Origin, IOrigin } from '../db'; import { limit, auth as authRequest, wrap } from '../requestUtils'; import { CreateAccountOptions, findOrCreateAccount, SuspiciousCheckers, getAccountAlertMessage } from '../accountUtils'; -import { create, createFromRequest } from '../reporter'; +import { createReporter, createFromRequest } from '../reporter'; import { logger, logServer, system } from '../logger'; import { providers, getProfile } from '../oauth'; import { accountChanged, RemovedDocument } from '../internal'; @@ -120,7 +120,7 @@ async function checkBanField( server: ServerConfig, account: IAccount, field: keyof BannedMuted, message: string, origin: IOrigin ) { if (isActive(origin[field]) && !isActive(account[field])) { - create(server, account._id, undefined, origin).warn(message); + createReporter(server, account._id, undefined, origin).warn(message); account[field] = origin[field]; await account.save(); } @@ -385,7 +385,7 @@ function createOptions( creationLocked: acl && acl > (new Date()).toISOString(), canCreateAccounts: !!settings.canCreateAccounts, reportPotentialDuplicates: !!settings.reportPotentialDuplicates, - warn: (accountId, message, desc) => create(server, accountId, undefined, origin).warn(message, desc), + warn: (accountId, message, desc) => createReporter(server, accountId, undefined, origin).warn(message, desc), ...checkers, }; } diff --git a/src/ts/server/start.ts b/src/ts/server/start.ts index 0973983..d2a0fb2 100644 --- a/src/ts/server/start.ts +++ b/src/ts/server/start.ts @@ -1,7 +1,7 @@ import { readFileSync } from 'fs'; import * as ctrl from './controllers'; import { World, goToMap } from './world'; -import { create } from './reporter'; +import { createReporter } from './reporter'; import { logger } from './logger'; import { SERVER_FPS } from '../common/constants'; import { ServerConfig } from '../common/adminInterfaces'; @@ -77,7 +77,7 @@ export function start(world: World, server: ServerConfig) { world.initialize(last); if (!DEVELOPMENT) { - create(server).info(`Server started`); + createReporter(server).info(`Server started`); } setInterval(() => { @@ -96,7 +96,7 @@ export function start(world: World, server: ServerConfig) { } } catch (e) { if (isErrorAlike(e)) { - create(server).danger(e.message); + createReporter(server).danger(e.message); } logger.error(e); } diff --git a/src/ts/server/utils/socketErrorHandler.ts b/src/ts/server/utils/socketErrorHandler.ts index b94f878..5a02690 100644 --- a/src/ts/server/utils/socketErrorHandler.ts +++ b/src/ts/server/utils/socketErrorHandler.ts @@ -5,7 +5,7 @@ import { IClient } from '../serverInterfaces'; import { logger } from '../logger'; import { isUserError, reportUserError2 } from '../userError'; import { includes } from '../../common/utils'; -import { create } from '../reporter'; +import { createReporter } from '../reporter'; import { ServerConfig } from '../../common/adminInterfaces'; import { getOriginFromHTTP } from '../originUtils'; import { ServerActions } from '../serverActions'; @@ -62,9 +62,9 @@ function reportError(rollbar: Rollbar | undefined, e: Error, client: IClient | u client.reporter.error(e); } else if (client && client.originalRequest) { const origin = client.originalRequest && getOriginFromHTTP(client.originalRequest); - create(config, undefined, undefined, origin).error(e); + createReporter(config, undefined, undefined, origin).error(e); } else { - create(config).error(e); + createReporter(config).error(e); } if (!rollbarIgnore.test(e.message)) {