Merge pull request #8 from edgedb/only-moderators-can-run-cmds

Improve error for thread not being inside a help channel
edgedb · Oct 8, 2024 · 655066e · 655066e
2 parents 08f5d10 + 49d84b0
commit 655066e
Show file tree

Hide file tree

Showing 48 changed files with 72 additions and 50 deletions.
diff --git a/app/lib/discord/bot.ts b/app/lib/discord/bot.ts
@@ -126,15 +126,14 @@ export class Bot extends REST {
   }
 
   errorEmbed(msg?: string): APIEmbed {
-    console.log("Error:", msg);
     return {
       title: "Error",
       description: msg ?? "There was an error executing your request",
       color: 0xff0000,
     };
   }
 
-  defer(ephemeral: boolean = true): APIInteractionResponse {
+  defer(ephemeral = true): APIInteractionResponse {
     return {
       type: InteractionResponseType.DeferredChannelMessageWithSource,
       data: {

diff --git a/app/lib/discord/commands/helpful.ts b/app/lib/discord/commands/helpful.ts
@@ -88,7 +88,8 @@ export default class HelpfulCommand
         data: {
           embeds: [
             bot.errorEmbed(
-              `${threadChannel.parent_id}, ${bot["help-channels"].size}, ${ids}}`
+              "Thread is not inside a valid help channel."
+              // `${threadChannel.parent_id}, ${bot["help-channels"].size}, ${ids}}`
             ),
           ],
           flags: MessageFlags.Ephemeral,

diff --git a/dbschema/edgeql-js/__spec__.ts b/dbschema/edgeql-js/__spec__.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import * as $ from "./reflection";
 const spec: $.introspect.Types = new $.StrictMap();

diff --git a/dbschema/edgeql-js/cardinality.ts b/dbschema/edgeql-js/cardinality.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import { Cardinality } from "edgedb/dist/reflection/index";
 import type { TypeSet } from "./typesystem";

diff --git a/dbschema/edgeql-js/cast.ts b/dbschema/edgeql-js/cast.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import { ExpressionKind, Cardinality } from "edgedb/dist/reflection/index";
 import type {

diff --git a/dbschema/edgeql-js/castMaps.ts b/dbschema/edgeql-js/castMaps.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import * as edgedb from "edgedb";
 import type * as $ from "./reflection";

diff --git a/dbschema/edgeql-js/casting.ts b/dbschema/edgeql-js/casting.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import type { Cardinality } from "edgedb/dist/reflection/index";
 import type {

diff --git a/dbschema/edgeql-js/collections.ts b/dbschema/edgeql-js/collections.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import {
   Cardinality,

diff --git a/dbschema/edgeql-js/detached.ts b/dbschema/edgeql-js/detached.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import { ExpressionKind } from "edgedb/dist/reflection/index";
 import type { Expression, TypeSet } from "./typesystem";

diff --git a/dbschema/edgeql-js/external.ts b/dbschema/edgeql-js/external.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 export { literal } from "./literal";
 export {} from "./path";

diff --git a/dbschema/edgeql-js/for.ts b/dbschema/edgeql-js/for.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import { Cardinality, ExpressionKind } from "edgedb/dist/reflection/index";
 import { cardutil } from "./cardinality";

diff --git a/dbschema/edgeql-js/funcops.ts b/dbschema/edgeql-js/funcops.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import {
   Cardinality,

diff --git a/dbschema/edgeql-js/globals.ts b/dbschema/edgeql-js/globals.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import { type Cardinality, ExpressionKind } from "edgedb/dist/reflection/index";
 import type { Expression, BaseType } from "./typesystem";

diff --git a/dbschema/edgeql-js/group.ts b/dbschema/edgeql-js/group.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import type {
   Expression,

diff --git a/dbschema/edgeql-js/hydrate.ts b/dbschema/edgeql-js/hydrate.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import type { $ } from "edgedb";
 

diff --git a/dbschema/edgeql-js/imports.ts b/dbschema/edgeql-js/imports.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 export * as edgedb from "edgedb";
 export { spec } from "./__spec__";

diff --git a/dbschema/edgeql-js/index.ts b/dbschema/edgeql-js/index.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 export * from "./external";
 export { createClient } from "edgedb";

diff --git a/dbschema/edgeql-js/insert.ts b/dbschema/edgeql-js/insert.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import {
   Cardinality,

diff --git a/dbschema/edgeql-js/json.ts b/dbschema/edgeql-js/json.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import { ExpressionKind, TypeKind } from "edgedb/dist/reflection/index";
 import type { ParamType } from "./typesystem";

diff --git a/dbschema/edgeql-js/literal.ts b/dbschema/edgeql-js/literal.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import type {
   Expression,

diff --git a/dbschema/edgeql-js/modules/_default_10.ts b/dbschema/edgeql-js/modules/_default_10.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import * as $ from "../reflection";
 import * as _ from "../imports";

diff --git a/dbschema/edgeql-js/modules/cal.ts b/dbschema/edgeql-js/modules/cal.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import * as $ from "../reflection";
 import * as _ from "../imports";

diff --git a/dbschema/edgeql-js/modules/cfg.ts b/dbschema/edgeql-js/modules/cfg.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import * as $ from "../reflection";
 import * as _ from "../imports";

diff --git a/dbschema/edgeql-js/modules/default.ts b/dbschema/edgeql-js/modules/default.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import * as $ from "../reflection";
 import * as _ from "../imports";

diff --git a/dbschema/edgeql-js/modules/discord.ts b/dbschema/edgeql-js/modules/discord.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import * as $ from "../reflection";
 import * as _ from "../imports";

diff --git a/dbschema/edgeql-js/modules/ext.ts b/dbschema/edgeql-js/modules/ext.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import * as $ from "../reflection";
 import * as _ from "../imports";

diff --git a/dbschema/edgeql-js/modules/ext/auth.ts b/dbschema/edgeql-js/modules/ext/auth.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import * as $ from "../../reflection";
 import * as _ from "../../imports";

diff --git a/dbschema/edgeql-js/modules/ext/pgcrypto.ts b/dbschema/edgeql-js/modules/ext/pgcrypto.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import * as $ from "../../reflection";
 import * as _ from "../../imports";

diff --git a/dbschema/edgeql-js/modules/fts.ts b/dbschema/edgeql-js/modules/fts.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import * as $ from "../reflection";
 import * as _ from "../imports";

diff --git a/dbschema/edgeql-js/modules/math.ts b/dbschema/edgeql-js/modules/math.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import * as $ from "../reflection";
 import * as _ from "../imports";

diff --git a/dbschema/edgeql-js/modules/schema.ts b/dbschema/edgeql-js/modules/schema.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import * as $ from "../reflection";
 import * as _ from "../imports";

diff --git a/dbschema/edgeql-js/modules/std.ts b/dbschema/edgeql-js/modules/std.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import * as $ from "../reflection";
 import * as _ from "../imports";

diff --git a/dbschema/edgeql-js/modules/std/enc.ts b/dbschema/edgeql-js/modules/std/enc.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import * as $ from "../../reflection";
 import * as _ from "../../imports";

diff --git a/dbschema/edgeql-js/modules/sys.ts b/dbschema/edgeql-js/modules/sys.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import * as $ from "../reflection";
 import * as _ from "../imports";

diff --git a/dbschema/edgeql-js/operators.ts b/dbschema/edgeql-js/operators.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import * as $ from "./reflection";
 import * as _ from "./imports";

diff --git a/dbschema/edgeql-js/params.ts b/dbschema/edgeql-js/params.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import type { Executor } from "edgedb";
 import {

diff --git a/dbschema/edgeql-js/path.ts b/dbschema/edgeql-js/path.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import {
   // cardutil,

diff --git a/dbschema/edgeql-js/query.ts b/dbschema/edgeql-js/query.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import type * as edgedb from "edgedb";
 import { Cardinality, ExpressionKind } from "edgedb/dist/reflection/index";

diff --git a/dbschema/edgeql-js/range.ts b/dbschema/edgeql-js/range.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import type { LocalDate, LocalDateTime, Duration } from "edgedb";
 import { Range } from "edgedb";

diff --git a/dbschema/edgeql-js/reflection.ts b/dbschema/edgeql-js/reflection.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 export * from "edgedb/dist/reflection/index";
 export * from "./typesystem";

diff --git a/dbschema/edgeql-js/select.ts b/dbschema/edgeql-js/select.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import {
   LocalDateTime,

diff --git a/dbschema/edgeql-js/set.ts b/dbschema/edgeql-js/set.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import type { ExpressionKind, Cardinality } from "edgedb/dist/reflection/index";
 import { TypeKind } from "edgedb/dist/reflection/index";

diff --git a/dbschema/edgeql-js/setImpl.ts b/dbschema/edgeql-js/setImpl.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import * as $ from "./reflection";
 import * as castMaps from "./castMaps";

diff --git a/dbschema/edgeql-js/syntax.ts b/dbschema/edgeql-js/syntax.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import type { TypeSet, setToTsType } from "./typesystem";
 

diff --git a/dbschema/edgeql-js/toEdgeQL.ts b/dbschema/edgeql-js/toEdgeQL.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import {
   Duration,
@@ -8,6 +8,7 @@ import {
   RelativeDuration,
   DateDuration,
   Range,
+  InputDataError,
 } from "edgedb";
 import {
   Cardinality,
@@ -1450,13 +1451,34 @@ const numericalTypes: Record<string, boolean> = {
   "std::float64": true,
 };
 
+function makeLabel(stringified: string): string {
+  const MAX_ITERATIONS = 100;
+  const prefix = "jsonliteral";
+  let counter = 0;
+  let label = `${prefix}`;
+
+  while (stringified.includes(`$${label}$`) && counter < MAX_ITERATIONS) {
+    label = `${prefix}${counter}`;
+    counter++;
+  }
+
+  if (counter >= MAX_ITERATIONS) {
+    throw new InputDataError(
+      "Counter reached 100 without finding a unique label.",
+    );
+  }
+  return label;
+}
+
 function literalToEdgeQL(type: BaseType, val: any): string {
   const typename = (type as any).__casttype__?.__name__ ?? type.__name__;
   let skipCast = false;
   let stringRep;
   if (typename === "std::json") {
     skipCast = true;
-    stringRep = `to_json($$${JSON.stringify(val)}$$)`;
+    const stringified = JSON.stringify(val);
+    const label = `$${makeLabel(stringified)}$`;
+    stringRep = `to_json(${label}${JSON.stringify(val)}${label})`;
   } else if (typeof val === "string") {
     if (numericalTypes[typename]) {
       skipCast = typename === type.__name__;

diff --git a/dbschema/edgeql-js/typesystem.ts b/dbschema/edgeql-js/typesystem.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import type { Executor } from "edgedb/dist/ifaces";
 import type { $expr_PathNode, $expr_TypeIntersection, $pathify } from "./path";

diff --git a/dbschema/edgeql-js/update.ts b/dbschema/edgeql-js/update.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import {
   ExpressionKind,

diff --git a/dbschema/edgeql-js/with.ts b/dbschema/edgeql-js/with.ts
@@ -1,4 +1,4 @@
-// GENERATED by @edgedb/generate v0.5.4
+// GENERATED by @edgedb/generate v0.5.6
 
 import { type Cardinality, ExpressionKind } from "edgedb/dist/reflection/index";
 import type { BaseType, Expression, TypeSet } from "./typesystem";