fix: renamed, middleware fixes

src/core/server/app/middleware/error.ts

@@ -9,15 +9,9 @@ export const errorHandler: ErrorRequestHandler = (err, req, res, next) => {
   // TODO: handle better when we improve errors.
   if (err.message === "not found") {
     // TODO: handle better when we improve errors.
-    res
-      .status(404)
-      .send(err.message)
-      .end();
+    res.status(404).send(err.message);
   } else {
     // TODO: handle better when we improve errors.
-    res
-      .status(500)
-      .send(err.message)
-      .end();
+    res.status(500).send(err.message);
   }
 };

src/core/server/app/middleware/playground.ts

@@ -1,4 +1,17 @@
+import { RequestHandler } from "express";
 import { MiddlewareOptions } from "graphql-playground-html";
 import playground from "graphql-playground-middleware-express";
 
-export default (options: MiddlewareOptions) => playground(options);
+export default (options: MiddlewareOptions): RequestHandler => (
+  req,
+  res,
+  next
+) => {
+  try {
+    playground(options)(req, res, () => {
+      // The playground calls next() when it's not supposed to.
+    });
+  } catch (err) {
+    return next(err);
+  }
+};

src/core/server/graph/tenant/loaders/comments.ts

@@ -10,7 +10,7 @@ import {
 import {
   ACTION_ITEM_TYPE,
   retrieveManyUserActionPresence,
-} from "talk-server/models/actions";
+} from "talk-server/models/action";
 import {
   retrieveCommentAssetConnection,
   retrieveCommentRepliesConnection,

src/core/server/graph/tenant/resolvers/asset.ts

@@ -1,5 +1,5 @@
 import { GQLAssetTypeResolver } from "talk-server/graph/tenant/schema/__generated__/types";
-import { decodeActionCounts } from "talk-server/models/actions";
+import { decodeActionCounts } from "talk-server/models/action";
 import { Asset } from "talk-server/models/asset";
 
 const Asset: GQLAssetTypeResolver<Asset> = {

src/core/server/graph/tenant/resolvers/comment.ts

@@ -1,5 +1,5 @@
 import { GQLCommentTypeResolver } from "talk-server/graph/tenant/schema/__generated__/types";
-import { decodeActionCounts } from "talk-server/models/actions";
+import { decodeActionCounts } from "talk-server/models/action";
 import { Comment } from "talk-server/models/comment";
 
 const Comment: GQLCommentTypeResolver<Comment> = {

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

@@ -6,7 +6,7 @@ import {
   decodeActionCounts,
   encodeActionCounts,
   validateAction,
-} from "talk-server/models/actions";
+} from "talk-server/models/action";
 
 describe("#encodeActionCounts", () => {
   it("generates the action counts correctly", () => {

src/core/server/models/action.ts

@@ -186,6 +186,7 @@ export async function createActions(
   tenantID: string,
   inputs: CreateActionInput[]
 ): Promise<CreateActionResultObject[]> {
+  // TODO: (wyattjoh) replace with a batch write.
   return Promise.all(inputs.map(input => createAction(mongo, tenantID, input)));
 }
 

src/core/server/models/asset.ts

@@ -3,7 +3,7 @@ import uuid from "uuid";
 
 import { Omit } from "talk-common/types";
 import { dotize } from "talk-common/utils/dotize";
-import { EncodedActionCounts } from "talk-server/models/actions";
+import { EncodedActionCounts } from "talk-server/models/action";
 import { ModerationSettings } from "talk-server/models/settings";
 import { TenantResource } from "talk-server/models/tenant";
 

src/core/server/models/comment.ts

@@ -7,7 +7,7 @@ import {
   GQLCOMMENT_SORT,
   GQLCOMMENT_STATUS,
 } from "talk-server/graph/tenant/schema/__generated__/types";
-import { EncodedActionCounts } from "talk-server/models/actions";
+import { EncodedActionCounts } from "talk-server/models/action";
 import {
   Connection,
   Cursor,

src/core/server/models/user.ts

@@ -7,7 +7,7 @@ import {
   GQLUSER_ROLE,
   GQLUSER_USERNAME_STATUS,
 } from "talk-server/graph/tenant/schema/__generated__/types";
-import { EncodedActionCounts } from "talk-server/models/actions";
+import { EncodedActionCounts } from "talk-server/models/action";
 import { FilterQuery } from "talk-server/models/query";
 import { TenantResource } from "talk-server/models/tenant";
 

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

@@ -6,7 +6,7 @@ import {
   CreateActionInput,
   createActions,
   encodeActionCounts,
-} from "talk-server/models/actions";
+} from "talk-server/models/action";
 import {
   retrieveAsset,
   updateAssetActionCounts,

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

@@ -2,7 +2,7 @@ import {
   GQLCOMMENT_FLAG_REASON,
   GQLCOMMENT_STATUS,
 } from "talk-server/graph/tenant/schema/__generated__/types";
-import { ACTION_TYPE } from "talk-server/models/actions";
+import { ACTION_TYPE } from "talk-server/models/action";
 import {
   compose,
   ModerationPhaseContext,

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

@@ -1,6 +1,6 @@
 import { Omit, Promiseable } from "talk-common/types";
 import { GQLCOMMENT_STATUS } from "talk-server/graph/tenant/schema/__generated__/types";
-import { CreateActionInput } from "talk-server/models/actions";
+import { CreateActionInput } from "talk-server/models/action";
 import { Asset } from "talk-server/models/asset";
 import { Comment } from "talk-server/models/comment";
 import { Tenant } from "talk-server/models/tenant";

src/core/server/services/comments/moderation/phases/commentLength.ts

@@ -2,7 +2,7 @@ import {
   GQLCOMMENT_FLAG_REASON,
   GQLCOMMENT_STATUS,
 } from "talk-server/graph/tenant/schema/__generated__/types";
-import { ACTION_TYPE } from "talk-server/models/actions";
+import { ACTION_TYPE } from "talk-server/models/action";
 import { ModerationSettings } from "talk-server/models/settings";
 import {
   IntermediateModerationPhase,

src/core/server/services/comments/moderation/phases/karma.ts

@@ -2,7 +2,7 @@ import {
   GQLCOMMENT_FLAG_REASON,
   GQLCOMMENT_STATUS,
 } from "talk-server/graph/tenant/schema/__generated__/types";
-import { ACTION_TYPE } from "talk-server/models/actions";
+import { ACTION_TYPE } from "talk-server/models/action";
 import {
   IntermediateModerationPhase,
   IntermediatePhaseResult,

src/core/server/services/comments/moderation/phases/links.ts

@@ -5,7 +5,7 @@ import {
   GQLCOMMENT_FLAG_REASON,
   GQLCOMMENT_STATUS,
 } from "talk-server/graph/tenant/schema/__generated__/types";
-import { ACTION_TYPE } from "talk-server/models/actions";
+import { ACTION_TYPE } from "talk-server/models/action";
 import { ModerationSettings } from "talk-server/models/settings";
 import {
   IntermediateModerationPhase,

src/core/server/services/comments/moderation/phases/spam.ts

@@ -5,7 +5,7 @@ import {
   GQLCOMMENT_STATUS,
 } from "talk-server/graph/tenant/schema/__generated__/types";
 import logger from "talk-server/logger";
-import { ACTION_TYPE } from "talk-server/models/actions";
+import { ACTION_TYPE } from "talk-server/models/action";
 import {
   IntermediateModerationPhase,
   IntermediatePhaseResult,

src/core/server/services/comments/moderation/phases/toxic.ts

@@ -9,7 +9,7 @@ import {
   GQLPerspectiveExternalIntegration,
 } from "talk-server/graph/tenant/schema/__generated__/types";
 import logger from "talk-server/logger";
-import { ACTION_TYPE } from "talk-server/models/actions";
+import { ACTION_TYPE } from "talk-server/models/action";
 import {
   IntermediateModerationPhase,
   IntermediatePhaseResult,

src/core/server/services/comments/moderation/phases/wordlist.ts

@@ -2,7 +2,7 @@ import {
   GQLCOMMENT_FLAG_REASON,
   GQLCOMMENT_STATUS,
 } from "talk-server/graph/tenant/schema/__generated__/types";
-import { ACTION_TYPE } from "talk-server/models/actions";
+import { ACTION_TYPE } from "talk-server/models/action";
 import {
   IntermediateModerationPhase,
   IntermediatePhaseResult,