diff --git a/util/src/entities/BaseClass.ts b/util/src/entities/BaseClass.ts
index d20078e5..aabca016 100644
--- a/util/src/entities/BaseClass.ts
+++ b/util/src/entities/BaseClass.ts
@@ -52,12 +52,12 @@ export class BaseClassWithoutId extends BaseEntity {
static increment<T extends BaseClass>(conditions: FindConditions<T>, propertyPath: string, value: number | string) {
const repository = this.getRepository();
- return repository.increment(conditions, propertyPath, value);
+ return repository.increment(conditions as T, propertyPath, value);
}
static decrement<T extends BaseClass>(conditions: FindConditions<T>, propertyPath: string, value: number | string) {
const repository = this.getRepository();
- return repository.decrement(conditions, propertyPath, value);
+ return repository.decrement(conditions as T, propertyPath, value);
}
}
diff --git a/util/src/entities/Channel.ts b/util/src/entities/Channel.ts
index bd2e5a58..4036b5d6 100644
--- a/util/src/entities/Channel.ts
+++ b/util/src/entities/Channel.ts
@@ -203,7 +203,7 @@ export class Channel extends BaseClass {
static async createDMChannel(recipients: string[], creator_user_id: string, name?: string) {
recipients = recipients.unique().filter((x) => x !== creator_user_id);
- const otherRecipientsUsers = await User.find({ where: recipients.map((x) => ({ id: x })), select: ["id"] });
+ const otherRecipientsUsers = await User.find({ where: recipients.map((x) => ({ id: x })) });
// TODO: check config for max number of recipients
if (otherRecipientsUsers.length !== recipients.length) {
diff --git a/util/src/entities/Config.ts b/util/src/entities/Config.ts
index 2d003c99..9e25c737 100644
--- a/util/src/entities/Config.ts
+++ b/util/src/entities/Config.ts
@@ -3,6 +3,7 @@ import { BaseClassWithoutId, PrimaryIdColumn } from "./BaseClass";
import crypto from "crypto";
import { Snowflake } from "../util/Snowflake";
import { SessionsReplace } from "..";
+import { hostname } from "os";
@Entity("config")
export class ConfigEntity extends BaseClassWithoutId {
@@ -188,6 +189,12 @@ export interface ConfigValue {
},
metrics: {
timeout: number;
+ },
+ sentry: {
+ enabled: boolean;
+ endpoint: string;
+ traceSampleRate: number;
+ environment: string;
}
}
@@ -377,5 +384,11 @@ export const DefaultConfigOptions: ConfigValue = {
},
metrics: {
timeout: 30000
+ },
+ sentry: {
+ enabled: false,
+ endpoint: "https://05e8e3d005f34b7d97e920ae5870a5e5@sentry.thearcanebrony.net/6",
+ traceSampleRate: 1.0,
+ environment: hostname()
}
};
diff --git a/util/src/util/Database.ts b/util/src/util/Database.ts
index 6124ffab..e8177093 100644
--- a/util/src/util/Database.ts
+++ b/util/src/util/Database.ts
@@ -3,7 +3,7 @@ import "reflect-metadata";
import { Connection, createConnection } from "typeorm";
import * as Models from "../entities";
import { Migration } from "../entities/Migration";
-import { yellow, green } from "nanocolors";
+import { yellow, green, red } from "picocolors";
// UUID extension option is only supported with postgres
// We want to generate all id's with Snowflakes that's why we have our own BaseEntity class
@@ -19,6 +19,9 @@ export function initDatabase(): Promise<Connection> {
const isSqlite = type.includes("sqlite");
console.log(`[Database] ${yellow(`connecting to ${type} db`)}`);
+ if(isSqlite) {
+ console.log(`[Database] ${red(`You are running sqlite! Please keep in mind that we recommend setting up a dedicated database!`)}`);
+ }
// @ts-ignore
promise = createConnection({
type,
|
