[CORL-1155] Fix theming for rebranded stream/admin (#3012)

* Repair theming and CSS variables for the rebrand

This separates the CSS variables into three sections
for admin, stream, as well as a shared set between
them.

This also adds injection of the raw colours from the
design team into post css variables.

Lastly, this re-maps the existing theme variables to
a new consolidated set with fallbacks for compatibility.

Since this is a singular commit from various WIP commits,
I am crediting @cvle as well as myself for this work.

Thank you all who helped make this rebrand with theming
possible!

CORL-1155

Co-authored-by: Chi Vinh Le <vinh@vinh.tech>

* Convert old css variables in CallOut

* Rename postive/negative => success/error

CORL-1155

* Change some CSS Variable names

* fix TextField/PasswordField colors

Co-authored-by: Chi Vinh Le <vinh@vinh.tech>

src/core/server/app/handlers/api/account/confirm.ts

@@ -8,7 +8,6 @@ import {
   UserForbiddenError,
   UserNotFoundError,
 } from "coral-server/errors";
-import { GQLUSER_ROLE } from "coral-server/graph/schema/__generated__/types";
 import { retrieveUser, User } from "coral-server/models/user";
 import { decodeJWT, extractTokenFromRequest } from "coral-server/services/jwt";
 import {
@@ -18,6 +17,8 @@ import {
 } from "coral-server/services/users/auth/confirm";
 import { RequestHandler } from "coral-server/types/express";
 
+import { GQLUSER_ROLE } from "coral-server/graph/schema/__generated__/types";
+
 export type ConfirmRequestOptions = Pick<
   AppOptions,
   "mongo" | "mailerQueue" | "signingConfig" | "redis" | "config"

src/core/server/app/handlers/api/install.ts

@@ -2,7 +2,6 @@ import Joi from "@hapi/joi";
 import { v4 as uuid } from "uuid";
 
 import { LanguageCode, LOCALES } from "coral-common/helpers/i18n/locales";
-
 import { AppOptions } from "coral-server/app";
 import { validate } from "coral-server/app/request/body";
 import { RequestLimiter } from "coral-server/app/request/limiter";

src/core/server/app/handlers/api/version.ts

@@ -1,6 +1,7 @@
-import { revision, version } from "coral-common/version";
 import { RequestHandler } from "express";
 
+import { revision, version } from "coral-common/version";
+
 export const versionHandler: RequestHandler = (req, res, next) => {
   res.json({ version, revision });
 };

src/core/server/app/helpers/entrypoints.ts

@@ -1,6 +1,7 @@
-import logger from "coral-server/logger";
 import fs from "fs";
 
+import logger from "coral-server/logger";
+
 export interface Asset {
   src: string;
   integrity: string;

src/core/server/app/middleware/graphql/graphqlMiddleware.ts

@@ -1,12 +1,11 @@
 import { GraphQLExtension, GraphQLOptions } from "apollo-server-express";
-import { Handler } from "express";
-import { FieldDefinitionNode, GraphQLError, ValidationContext } from "graphql";
-
 // TODO: when https://github.com/apollographql/apollo-server/pull/1907 is merged, update this import path
 import {
   ExpressGraphQLOptionsFunction,
   graphqlExpress,
 } from "apollo-server-express/dist/expressApollo";
+import { Handler } from "express";
+import { FieldDefinitionNode, GraphQLError, ValidationContext } from "graphql";
 
 import { Config } from "coral-server/config";
 import {

src/core/server/app/middleware/graphql/persistedQueryMiddleware.ts

@@ -1,9 +1,10 @@
 import { AppOptions } from "coral-server/app";
 import { RawQueryNotAuthorized } from "coral-server/errors";
 import { getPersistedQuery } from "coral-server/graph/persisted";
-import { GQLUSER_ROLE } from "coral-server/graph/schema/__generated__/types";
 import { RequestHandler } from "coral-server/types/express";
 
+import { GQLUSER_ROLE } from "coral-server/graph/schema/__generated__/types";
+
 type PersistedQueryMiddlewareOptions = Pick<
   AppOptions,
   "persistedQueryCache" | "persistedQueriesRequired"

src/core/server/app/middleware/passport/strategies/local.ts

@@ -1,4 +1,5 @@
 import Joi from "@hapi/joi";
+import { Redis } from "ioredis";
 import { Db } from "mongodb";
 import { Strategy as LocalStrategy } from "passport-local";
 
@@ -11,7 +12,6 @@ import {
   verifyUserPassword,
 } from "coral-server/models/user";
 import { Request } from "coral-server/types/express";
-import { Redis } from "ioredis";
 
 const verifyFactory = (
   mongo: Db,

src/core/server/app/router/index.ts

@@ -2,7 +2,6 @@ import express, { Router } from "express";
 
 import { LanguageCode } from "coral-common/helpers/i18n/locales";
 import { AppOptions } from "coral-server/app";
-
 import playground from "coral-server/app/middleware/playground";
 import { RouterOptions } from "coral-server/app/router/types";
 import logger from "coral-server/logger";

src/core/server/app/url.spec.ts

@@ -1,9 +1,10 @@
+import { Request } from "express";
+
 import {
   doesRequireSchemePrefixing,
   extractParentsOrigin,
   prefixSchemeIfRequired,
 } from "coral-server/app/url";
-import { Request } from "express";
 
 it("extracts the url when the parentUrl is not provided", () => {
   const req = { headers: {}, query: {} } as Request;

src/core/server/app/url.ts

@@ -1,7 +1,8 @@
+import { URL } from "url";
+
 import { Config } from "coral-server/config";
 import { Tenant } from "coral-server/models/tenant";
 import { Request } from "coral-server/types/express";
-import { URL } from "url";
 
 export function reconstructURL(req: Request, path = "/"): string {
   const scheme = req.secure ? "https" : "http";

src/core/server/cron/notificationDigesting.ts

@@ -2,13 +2,14 @@ import { Db } from "mongodb";
 import path from "path";
 
 import { Config } from "coral-server/config";
-import { GQLDIGEST_FREQUENCY } from "coral-server/graph/schema/__generated__/types";
 import { MailerQueue } from "coral-server/queue/tasks/mailer";
 import { DigestibleTemplate } from "coral-server/queue/tasks/mailer/templates";
 import { JWTSigningConfig } from "coral-server/services/jwt";
 import NotificationContext from "coral-server/services/notifications/context";
 import { TenantCache } from "coral-server/services/tenant/cache";
 
+import { GQLDIGEST_FREQUENCY } from "coral-server/graph/schema/__generated__/types";
+
 import {
   ScheduledJob,
   ScheduledJobCommand,

src/core/server/errors/index.spec.ts

@@ -1,6 +1,6 @@
 import { VError } from "verror";
 
-import { CoralError, DuplicateUserError, WrappedInternalError } from ".";
+import { CoralError, DuplicateUserError, WrappedInternalError } from "./";
 
 it("has the right inheritance chain", () => {
   const err = new DuplicateUserError();

src/core/server/events/listeners/slack/slack.ts

@@ -1,7 +1,7 @@
 import logger from "coral-server/logger";
 import { createFetch } from "coral-server/services/fetch";
 
-import SlackPublishEvent, { Trigger } from "./publishEvent";
+import { GQLMODERATION_QUEUE } from "coral-server/graph/schema/__generated__/types";
 
 import {
   CommentCreatedCoralEventPayload,
@@ -13,8 +13,8 @@ import {
   CoralEventPublisherFactory,
 } from "../../publisher";
 import { CoralEventType } from "../../types";
+import SlackPublishEvent, { Trigger } from "./publishEvent";
 
-import { GQLMODERATION_QUEUE } from "coral-server/graph/schema/__generated__/types";
 type SlackCoralEventListenerPayloads =
   | CommentFeaturedCoralEventPayload
   | CommentEnteredModerationQueueCoralEventPayload

src/core/server/graph/extensions/ErrorWrappingExtension.ts

@@ -9,6 +9,7 @@ import {
   WrappedInternalError,
 } from "coral-server/errors";
 import GraphContext from "coral-server/graph/context";
+
 import { getOriginalError } from "./helpers";
 
 function hoistCoralErrorExtensions(

src/core/server/graph/loaders/CommentModerationActions.ts

@@ -1,11 +1,12 @@
 import { defaultTo } from "lodash";
 
 import GraphContext from "coral-server/graph/context";
+import { retrieveCommentModerationActionConnection } from "coral-server/models/action/moderation/comment";
+
 import {
   CommentToStatusHistoryArgs,
   UserToCommentModerationActionHistoryArgs,
 } from "coral-server/graph/schema/__generated__/types";
-import { retrieveCommentModerationActionConnection } from "coral-server/models/action/moderation/comment";
 
 export default (ctx: GraphContext) => ({
   forModerator: (

src/core/server/graph/loaders/Users.ts

@@ -2,11 +2,6 @@ import DataLoader from "dataloader";
 import { defaultTo } from "lodash";
 
 import Context from "coral-server/graph/context";
-import {
-  GQLUSER_ROLE,
-  GQLUSER_STATUS,
-  QueryToUsersArgs,
-} from "coral-server/graph/schema/__generated__/types";
 import { Connection } from "coral-server/models/helpers";
 import {
   retrieveManyUsers,
@@ -15,6 +10,12 @@ import {
   UserConnectionInput,
 } from "coral-server/models/user";
 
+import {
+  GQLUSER_ROLE,
+  GQLUSER_STATUS,
+  QueryToUsersArgs,
+} from "coral-server/graph/schema/__generated__/types";
+
 type UserConnectionFilterInput = UserConnectionInput["filter"];
 
 const roleFilter = (role?: GQLUSER_ROLE): UserConnectionFilterInput => {

src/core/server/graph/mutators/Sites.ts

@@ -1,10 +1,11 @@
 import TenantContext from "coral-server/graph/context";
+import { Site } from "coral-server/models/site";
+import { create, update } from "coral-server/services/sites";
+
 import {
   GQLCreateSiteInput,
   GQLUpdateSiteInput,
 } from "coral-server/graph/schema/__generated__/types";
-import { Site } from "coral-server/models/site";
-import { create, update } from "coral-server/services/sites";
 
 export const Sites = (ctx: TenantContext) => ({
   create: async (input: GQLCreateSiteInput): Promise<Readonly<Site> | null> =>

src/core/server/graph/resolvers/BanStatus.ts

@@ -1,6 +1,7 @@
-import { GQLBanStatusTypeResolver } from "coral-server/graph/schema/__generated__/types";
 import * as user from "coral-server/models/user";
 
+import { GQLBanStatusTypeResolver } from "coral-server/graph/schema/__generated__/types";
+
 export type BanStatusInput = user.ConsolidatedBanStatus & {
   userID: string;
 };

src/core/server/graph/resolvers/BanStatusHistory.ts

@@ -1,6 +1,7 @@
-import { GQLBanStatusHistoryTypeResolver } from "coral-server/graph/schema/__generated__/types";
 import * as user from "coral-server/models/user";
 
+import { GQLBanStatusHistoryTypeResolver } from "coral-server/graph/schema/__generated__/types";
+
 export const BanStatusHistory: Required<GQLBanStatusHistoryTypeResolver<
   user.BanStatusHistory
 >> = {

src/core/server/graph/resolvers/CloseCommenting.ts

@@ -1,7 +1,8 @@
-import { GQLCloseCommentingTypeResolver } from "coral-server/graph/schema/__generated__/types";
 import * as settings from "coral-server/models/settings";
 import { translate } from "coral-server/services/i18n";
 
+import { GQLCloseCommentingTypeResolver } from "coral-server/graph/schema/__generated__/types";
+
 export const CloseCommenting: GQLCloseCommentingTypeResolver<settings.CloseCommenting> = {
   message: (closeCommenting, input, ctx) => {
     if (closeCommenting.message) {

src/core/server/graph/resolvers/CommentRevision.ts

@@ -1,7 +1,8 @@
-import { GQLCommentRevisionTypeResolver } from "coral-server/graph/schema/__generated__/types";
 import { decodeActionCounts } from "coral-server/models/action/comment";
 import { Comment, Revision } from "coral-server/models/comment";
 
+import { GQLCommentRevisionTypeResolver } from "coral-server/graph/schema/__generated__/types";
+
 export interface WrappedCommentRevision {
   revision: Revision;
   comment: Comment;

src/core/server/graph/resolvers/DisableCommenting.ts

@@ -1,7 +1,8 @@
-import { GQLDisableCommentingTypeResolver } from "coral-server/graph/schema/__generated__/types";
 import * as settings from "coral-server/models/settings";
 import { translate } from "coral-server/services/i18n";
 
+import { GQLDisableCommentingTypeResolver } from "coral-server/graph/schema/__generated__/types";
+
 export const DisableCommenting: GQLDisableCommentingTypeResolver<settings.DisableCommenting> = {
   message: (disableCommenting, input, ctx) => {
     if (disableCommenting.message) {

src/core/server/graph/resolvers/Flag.ts

@@ -1,8 +1,9 @@
+import * as actions from "coral-server/models/action/comment";
+
 import {
   GQLCOMMENT_FLAG_REASON,
   GQLFlagTypeResolver,
 } from "coral-server/graph/schema/__generated__/types";
-import * as actions from "coral-server/models/action/comment";
 
 export const Flag: GQLFlagTypeResolver<actions.CommentAction> = {
   reason: ({ id, reason }, args, ctx) => {

src/core/server/graph/resolvers/Invite.ts

@@ -1,6 +1,7 @@
-import { GQLInviteTypeResolver } from "coral-server/graph/schema/__generated__/types";
 import * as invite from "coral-server/models/invite";
 
+import { GQLInviteTypeResolver } from "coral-server/graph/schema/__generated__/types";
+
 export const Invite: GQLInviteTypeResolver<invite.Invite> = {
   createdBy: ({ createdBy }, args, ctx) =>
     ctx.loaders.Users.user.load(createdBy),

src/core/server/graph/resolvers/ModerationQueue.ts

@@ -4,6 +4,7 @@ import {
   CommentConnectionInput,
   retrieveCommentConnection,
 } from "coral-server/models/comment";
+
 import {
   GQLCOMMENT_SORT,
   GQLModerationQueueTypeResolver,

src/core/server/graph/resolvers/ModeratorNote.ts

@@ -1,6 +1,7 @@
-import { GQLModeratorNoteTypeResolver } from "coral-server/graph/schema/__generated__/types";
 import * as user from "coral-server/models/user";
 
+import { GQLModeratorNoteTypeResolver } from "coral-server/graph/schema/__generated__/types";
+
 export const ModeratorNote: Required<GQLModeratorNoteTypeResolver<
   user.ModeratorNote
 >> = {

src/core/server/graph/resolvers/PremodStatus.ts

@@ -1,6 +1,7 @@
-import { GQLPremodStatusTypeResolver } from "coral-server/graph/schema/__generated__/types";
 import * as user from "coral-server/models/user";
 
+import { GQLPremodStatusTypeResolver } from "coral-server/graph/schema/__generated__/types";
+
 export type PremodStatusInput = user.ConsolidatedPremodStatus & {
   userID: string;
 };

src/core/server/graph/resolvers/PremodStatusHistory.ts

@@ -1,6 +1,7 @@
-import { GQLPremodStatusHistoryTypeResolver } from "coral-server/graph/schema/__generated__/types";
 import * as user from "coral-server/models/user";
 
+import { GQLPremodStatusHistoryTypeResolver } from "coral-server/graph/schema/__generated__/types";
+
 export const PremodStatusHistory: Required<GQLPremodStatusHistoryTypeResolver<
   user.PremodStatusHistory
 >> = {

src/core/server/graph/resolvers/Profile.ts

@@ -1,6 +1,7 @@
-import { GQLProfileTypeResolver } from "coral-server/graph/schema/__generated__/types";
 import * as user from "coral-server/models/user";
 
+import { GQLProfileTypeResolver } from "coral-server/graph/schema/__generated__/types";
+
 const resolveType: GQLProfileTypeResolver<user.Profile> = (profile) => {
   switch (profile.type) {
     case "local":

src/core/server/graph/resolvers/SuspensionStatus.ts

@@ -1,6 +1,7 @@
-import { GQLSuspensionStatusTypeResolver } from "coral-server/graph/schema/__generated__/types";
 import * as user from "coral-server/models/user";
 
+import { GQLSuspensionStatusTypeResolver } from "coral-server/graph/schema/__generated__/types";
+
 export type SuspensionStatusInput = user.ConsolidatedSuspensionStatus & {
   userID: string;
 };

src/core/server/graph/resolvers/SuspensionStatusHistory.ts

@@ -1,6 +1,7 @@
-import { GQLSuspensionStatusHistoryTypeResolver } from "coral-server/graph/schema/__generated__/types";
 import * as user from "coral-server/models/user";
 
+import { GQLSuspensionStatusHistoryTypeResolver } from "coral-server/graph/schema/__generated__/types";
+
 export const SuspensionStatusHistory: Required<GQLSuspensionStatusHistoryTypeResolver<
   user.SuspensionStatusHistory
 >> = {

src/core/server/graph/resolvers/Tag.ts

@@ -1,6 +1,7 @@
-import { GQLTagTypeResolver } from "coral-server/graph/schema/__generated__/types";
 import { CommentTag } from "coral-server/models/comment/tag";
 
+import { GQLTagTypeResolver } from "coral-server/graph/schema/__generated__/types";
+
 export const Tag: GQLTagTypeResolver<CommentTag> = {
   code: ({ type }) => type,
   createdBy: ({ createdBy }, input, ctx) => {

src/core/server/graph/resolvers/UserStatus.ts

@@ -1,8 +1,9 @@
+import * as user from "coral-server/models/user";
+
 import {
   GQLUSER_STATUS,
   GQLUserStatusTypeResolver,
 } from "coral-server/graph/schema/__generated__/types";
-import * as user from "coral-server/models/user";
 
 import { BanStatusInput } from "./BanStatus";
 import { PremodStatusInput } from "./PremodStatus";

src/core/server/graph/resolvers/UsernameHistory.ts

@@ -1,6 +1,7 @@
-import { GQLUsernameHistoryTypeResolver } from "coral-server/graph/schema/__generated__/types";
 import * as user from "coral-server/models/user";
 
+import { GQLUsernameHistoryTypeResolver } from "coral-server/graph/schema/__generated__/types";
+
 export const UsernameHistory: Required<GQLUsernameHistoryTypeResolver<
   user.UsernameHistory
 >> = {

src/core/server/graph/resolvers/UsernameStatus.ts

@@ -1,6 +1,7 @@
-import { GQLUsernameStatusTypeResolver } from "coral-server/graph/schema/__generated__/types";
 import * as user from "coral-server/models/user";
 
+import { GQLUsernameStatusTypeResolver } from "coral-server/graph/schema/__generated__/types";
+
 export type UsernameStatusInput = user.ConsolidatedUsernameStatus & {
   userID: string;
 };

src/core/server/graph/scalars/locale.ts

@@ -1,7 +1,8 @@
-import { LOCALES } from "coral-common/helpers/i18n";
 import { GraphQLScalarType } from "graphql";
 import { Kind } from "graphql/language";
 
+import { LOCALES } from "coral-common/helpers/i18n";
+
 function assertSupportLocale(locale: string) {
   if (!LOCALES.includes(locale as any)) {
     throw new Error(`Supported locales are ${JSON.stringify(LOCALES)}`);

src/core/server/logger/serializers.ts

@@ -1,9 +1,9 @@
 import { stdSerializers } from "bunyan";
 import { GraphQLError } from "graphql";
 import StackUtils from "stack-utils";
+import VError from "verror";
 
 import { CoralError, CoralErrorContext } from "coral-server/errors";
-import VError from "verror";
 
 interface SerializedError {
   id?: string;

src/core/server/logger/streams/index.ts

@@ -1,6 +1,7 @@
+import PrettyStream from "@coralproject/bunyan-prettystream";
+
 import config from "coral-server/config";
 
-import PrettyStream from "@coralproject/bunyan-prettystream";
 import { SecretStream } from "./SecretStream";
 
 export function getStreams() {

src/core/server/models/action/comment.ts

@@ -4,15 +4,6 @@ import { Db } from "mongodb";
 import { v4 as uuid } from "uuid";
 
 import { Sub } from "coral-common/types";
-import {
-  GQLActionPresence,
-  GQLCOMMENT_FLAG_DETECTED_REASON,
-  GQLCOMMENT_FLAG_REASON,
-  GQLCOMMENT_FLAG_REPORTED_REASON,
-  GQLDontAgreeActionCounts,
-  GQLFlagActionCounts,
-  GQLReactionActionCounts,
-} from "coral-server/graph/schema/__generated__/types";
 import logger from "coral-server/logger";
 import {
   Connection,
@@ -24,6 +15,16 @@ import {
 import { TenantResource } from "coral-server/models/tenant";
 import { commentActions as collection } from "coral-server/services/mongodb/collections";
 
+import {
+  GQLActionPresence,
+  GQLCOMMENT_FLAG_DETECTED_REASON,
+  GQLCOMMENT_FLAG_REASON,
+  GQLCOMMENT_FLAG_REPORTED_REASON,
+  GQLDontAgreeActionCounts,
+  GQLFlagActionCounts,
+  GQLReactionActionCounts,
+} from "coral-server/graph/schema/__generated__/types";
+
 export enum ACTION_TYPE {
   /**
    * REACTION corresponds to a reaction to a comment from a user.

src/core/server/models/action/moderation/comment.ts

@@ -2,7 +2,6 @@ import { Db } from "mongodb";
 import { v4 as uuid } from "uuid";
 
 import { Sub } from "coral-common/types";
-import { GQLCOMMENT_STATUS } from "coral-server/graph/schema/__generated__/types";
 import {
   Connection,
   ConnectionInput,
@@ -12,6 +11,8 @@ import {
 import { TenantResource } from "coral-server/models/tenant";
 import { commentModerationActions as collection } from "coral-server/services/mongodb/collections";
 
+import { GQLCOMMENT_STATUS } from "coral-server/graph/schema/__generated__/types";
+
 /**
  * CommentModerationAction stores information around a moderation action that
  * was created for a given Comment Revision.

src/core/server/models/helpers/query.ts

@@ -1,5 +1,4 @@
 import { isUndefined, omitBy } from "lodash";
-
 import { Collection, Cursor, FilterQuery as MongoFilterQuery } from "mongodb";
 
 import { Writable } from "coral-common/types";

src/core/server/models/invite.ts

@@ -2,10 +2,11 @@ import { Db } from "mongodb";
 import { v4 as uuid } from "uuid";
 
 import { Sub } from "coral-common/types";
-import { GQLUSER_ROLE } from "coral-server/graph/schema/__generated__/types";
 import { TenantResource } from "coral-server/models/tenant";
 import { invites as collection } from "coral-server/services/mongodb/collections";
 
+import { GQLUSER_ROLE } from "coral-server/graph/schema/__generated__/types";
+
 export interface Invite extends TenantResource {
   readonly id: string;
   email: string;

src/core/server/queue/tasks/mailer/content.ts

@@ -3,12 +3,12 @@ import nunjucks, { Environment, ILoader } from "nunjucks";
 import path from "path";
 
 import { Config } from "coral-server/config";
+import { Tenant } from "coral-server/models/tenant";
 import {
   TenantCache,
   TenantCacheAdapter,
 } from "coral-server/services/tenant/cache";
 
-import { Tenant } from "coral-server/models/tenant";
 import { EmailTemplate } from "./templates";
 
 // templateDirectory is the directory containing the email templates.

src/core/server/services/comments/actions.ts

@@ -29,6 +29,7 @@ import {
 } from "coral-server/stacks/helpers";
 
 import { GQLCOMMENT_FLAG_REPORTED_REASON } from "coral-server/graph/schema/__generated__/types";
+
 import {
   publishCommentFlagCreated,
   publishCommentReactionCreated,

src/core/server/services/comments/comments.ts

@@ -2,7 +2,6 @@ import { DateTime } from "luxon";
 import { Db } from "mongodb";
 
 import { CommentNotFoundError } from "coral-server/errors";
-import { GQLTAG } from "coral-server/graph/schema/__generated__/types";
 import {
   addCommentTag,
   removeCommentTag,
@@ -12,6 +11,8 @@ import { getLatestRevision } from "coral-server/models/comment/helpers";
 import { Tenant } from "coral-server/models/tenant";
 import { User } from "coral-server/models/user";
 
+import { GQLTAG } from "coral-server/graph/schema/__generated__/types";
+
 /**
  * getCommentEditableUntilDate will return the date that the given comment is
  * still editable until.

src/core/server/services/comments/moderation/counts.spec.ts

@@ -1,4 +1,5 @@
 import { GQLCOMMENT_STATUS } from "coral-server/graph/schema/__generated__/types";
+
 import { calculateCountsDiff } from "./counts";
 
 it("allows transition from NONE to APPROVED", () => {

src/core/server/services/comments/pipeline/phases/detectLinks.ts

@@ -1,8 +1,4 @@
 import { DeepPartial } from "coral-common/types";
-import {
-  GQLCOMMENT_FLAG_REASON,
-  GQLCOMMENT_STATUS,
-} from "coral-server/graph/schema/__generated__/types";
 import { ACTION_TYPE } from "coral-server/models/action/comment";
 import { RevisionMetadata } from "coral-server/models/comment";
 import { GlobalModerationSettings } from "coral-server/models/settings";
@@ -11,6 +7,11 @@ import {
   IntermediatePhaseResult,
 } from "coral-server/services/comments/pipeline";
 
+import {
+  GQLCOMMENT_FLAG_REASON,
+  GQLCOMMENT_STATUS,
+} from "coral-server/graph/schema/__generated__/types";
+
 const testPremodLinksEnable = (
   settings: DeepPartial<GlobalModerationSettings>,
   metadata: RevisionMetadata

src/core/server/services/comments/pipeline/phases/preModerate.ts

@@ -1,14 +1,15 @@
 import { DeepPartial } from "coral-common/types";
-import {
-  GQLCOMMENT_STATUS,
-  GQLMODERATION_MODE,
-} from "coral-server/graph/schema/__generated__/types";
 import { GlobalModerationSettings } from "coral-server/models/settings";
 import {
   IntermediateModerationPhase,
   IntermediatePhaseResult,
 } from "coral-server/services/comments/pipeline";
 
+import {
+  GQLCOMMENT_STATUS,
+  GQLMODERATION_MODE,
+} from "coral-server/graph/schema/__generated__/types";
+
 const testModerationMode = (settings: DeepPartial<GlobalModerationSettings>) =>
   settings.moderation === GQLMODERATION_MODE.PRE;
 

src/core/server/services/comments/pipeline/phases/preModerateUser.ts

@@ -1,9 +1,10 @@
-import { GQLCOMMENT_STATUS } from "coral-server/graph/schema/__generated__/types";
 import {
   IntermediateModerationPhase,
   IntermediatePhaseResult,
 } from "coral-server/services/comments/pipeline";
 
+import { GQLCOMMENT_STATUS } from "coral-server/graph/schema/__generated__/types";
+
 // If a given user is set to always premod, set to premod.
 export const premodUser: IntermediateModerationPhase = ({
   author,

src/core/server/services/comments/pipeline/phases/premodNewCommenter.ts

@@ -1,13 +1,14 @@
-import {
-  GQLCOMMENT_FLAG_REASON,
-  GQLCOMMENT_STATUS,
-} from "coral-server/graph/schema/__generated__/types";
 import { ACTION_TYPE } from "coral-server/models/action/comment";
 import {
   IntermediatePhaseResult,
   ModerationPhaseContext,
 } from "coral-server/services/comments/pipeline";
 
+import {
+  GQLCOMMENT_FLAG_REASON,
+  GQLCOMMENT_STATUS,
+} from "coral-server/graph/schema/__generated__/types";
+
 export const premodNewCommenter = async ({
   tenant,
   author,

src/core/server/services/comments/pipeline/phases/recentCommentHistory.ts

@@ -1,9 +1,5 @@
 import { DateTime } from "luxon";
 
-import {
-  GQLCOMMENT_FLAG_REASON,
-  GQLCOMMENT_STATUS,
-} from "coral-server/graph/schema/__generated__/types";
 import { ACTION_TYPE } from "coral-server/models/action/comment";
 import {
   calculateRejectionRate,
@@ -14,6 +10,11 @@ import {
   ModerationPhaseContext,
 } from "coral-server/services/comments/pipeline";
 
+import {
+  GQLCOMMENT_FLAG_REASON,
+  GQLCOMMENT_STATUS,
+} from "coral-server/graph/schema/__generated__/types";
+
 export const recentCommentHistory = async ({
   tenant,
   author,

src/core/server/services/comments/pipeline/phases/storyClosed.spec.ts

@@ -1,7 +1,8 @@
 import { DateTime } from "luxon";
 
 import { storyClosed } from "coral-server/services/comments/pipeline/phases/storyClosed";
-import { ModerationPhaseContext } from "..";
+
+import { ModerationPhaseContext } from "../";
 
 describe("storyClosed", () => {
   it("throws an error when the story is closed", () => {

src/core/server/services/comments/pipeline/pipeline.spec.ts

@@ -1,8 +1,9 @@
+import { ACTION_TYPE } from "coral-server/models/action/comment";
+
 import {
   GQLCOMMENT_FLAG_REASON,
   GQLCOMMENT_STATUS,
 } from "coral-server/graph/schema/__generated__/types";
-import { ACTION_TYPE } from "coral-server/models/action/comment";
 
 import { compose, ModerationPhaseContext } from "./pipeline";
 

src/core/server/services/i18n/translation.spec.ts

@@ -1,4 +1,4 @@
-import { I18n } from ".";
+import { I18n } from "./";
 
 it("loads the translations without error", async () => {
   const translation = new I18n("en-US");

src/core/server/services/jwt/index.ts

@@ -7,7 +7,6 @@ import { Bearer, BearerOptions } from "permit";
 import { v4 as uuid } from "uuid";
 
 import { DEFAULT_SESSION_DURATION } from "coral-common/constants";
-
 import {
   AuthenticationError,
   JWTRevokedError,

src/core/server/services/migrate/migration_sample.ts

@@ -3,7 +3,6 @@ import { Db } from "mongodb";
 // Use the following collections reference to interact with specific
 // collections.
 // import collections from "coral-server/services/mongodb/collections";
-
 import Migration from "coral-server/services/migrate/migration";
 
 export default class extends Migration {

src/core/server/services/notifications/context.ts

@@ -2,7 +2,6 @@ import DataLoader from "dataloader";
 import { Db } from "mongodb";
 
 import { Config } from "coral-server/config";
-import { GQLDIGEST_FREQUENCY } from "coral-server/graph/schema/__generated__/types";
 import logger, { Logger } from "coral-server/logger";
 import { Comment, retrieveManyComments } from "coral-server/models/comment";
 import { retrieveManyStories, Story } from "coral-server/models/story";
@@ -16,6 +15,8 @@ import {
 import { DigestibleTemplate } from "coral-server/queue/tasks/mailer/templates";
 import { JWTSigningConfig } from "coral-server/services/jwt";
 
+import { GQLDIGEST_FREQUENCY } from "coral-server/graph/schema/__generated__/types";
+
 import { generateUnsubscribeURL } from "./categories/unsubscribe";
 
 interface Options {

src/core/server/services/users/auth/reset.ts

@@ -4,6 +4,8 @@ import { DateTime } from "luxon";
 import { Db } from "mongodb";
 import { v4 as uuid } from "uuid";
 
+import { constructTenantURL } from "coral-server/app/url";
+import { Config } from "coral-server/config";
 import {
   LocalProfileNotSetError,
   PasswordResetTokenExpired,
@@ -26,8 +28,6 @@ import {
   verifyJWT,
 } from "coral-server/services/jwt";
 
-import { constructTenantURL } from "coral-server/app/url";
-import { Config } from "coral-server/config";
 import { validatePassword } from "../helpers";
 
 export interface ResetToken extends Required<StandardClaims> {