diff options
| author | Hayden Young <hi@hbjy.dev> | 2021-10-15 10:33:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-15 10:33:02 +0000 |
| commit | 4d04e6fcc5142ed197ead89eceb01b2da2bed6dd (patch) | |
| tree | 5ba4c9b6e839faae5cdfab16005aaa95ab19c3fa /util | |
| parent | chore: update ts-node during npm run setup (diff) | |
| parent | Merge pull request #460 from fosscord/dev (diff) | |
| download | server-4d04e6fcc5142ed197ead89eceb01b2da2bed6dd.tar.xz | |
Merge branch 'master' into cdn-s3
Diffstat (limited to 'util')
| -rw-r--r-- | util/src/entities/Member.ts | 3 | ||||
| -rw-r--r-- | util/src/util/Snowflake.ts | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/util/src/entities/Member.ts b/util/src/entities/Member.ts index 7d7ac40a..12b0b49a 100644 --- a/util/src/entities/Member.ts +++ b/util/src/entities/Member.ts @@ -84,6 +84,9 @@ export class Member extends BaseClassWithoutId { @Column({ type: "simple-json" }) settings: UserGuildSettings; + @Column({ nullable: true }) + last_message_id?: string; + // TODO: update // @Column({ type: "simple-json" }) // read_state: ReadState; diff --git a/util/src/util/Snowflake.ts b/util/src/util/Snowflake.ts index f7a13388..3f6e3c63 100644 --- a/util/src/util/Snowflake.ts +++ b/util/src/util/Snowflake.ts @@ -84,7 +84,7 @@ export class Snowflake { } static generate() { - var time = BigInt(Date.now() - Snowflake.EPOCH) << 22n; + var time = BigInt(Date.now() - Snowflake.EPOCH) << BigInt(22); var worker = Snowflake.workerId << 17n; var process = Snowflake.processId << 12n; var increment = Snowflake.INCREMENT++; |