mirror of
https://github.com/spacebarchat/server.git
synced 2024-09-21 10:11:34 +02:00
🐛 fix#310
This commit is contained in:
parent
e2ea701920
commit
5dfff74881
@ -1,6 +1,18 @@
|
|||||||
import { PublicUser, User } from "./User";
|
import { PublicUser, User } from "./User";
|
||||||
import { BaseClass } from "./BaseClass";
|
import { BaseClass } from "./BaseClass";
|
||||||
import { Column, Entity, Index, JoinColumn, JoinTable, ManyToMany, ManyToOne, OneToMany, RelationId } from "typeorm";
|
import {
|
||||||
|
Column,
|
||||||
|
Entity,
|
||||||
|
Index,
|
||||||
|
JoinColumn,
|
||||||
|
JoinTable,
|
||||||
|
ManyToMany,
|
||||||
|
ManyToOne,
|
||||||
|
OneToMany,
|
||||||
|
PrimaryColumn,
|
||||||
|
PrimaryGeneratedColumn,
|
||||||
|
RelationId,
|
||||||
|
} from "typeorm";
|
||||||
import { Guild } from "./Guild";
|
import { Guild } from "./Guild";
|
||||||
import { Config, emitEvent } from "../util";
|
import { Config, emitEvent } from "../util";
|
||||||
import {
|
import {
|
||||||
@ -12,12 +24,16 @@ import {
|
|||||||
} from "../interfaces";
|
} from "../interfaces";
|
||||||
import { HTTPError } from "lambert-server";
|
import { HTTPError } from "lambert-server";
|
||||||
import { Role } from "./Role";
|
import { Role } from "./Role";
|
||||||
|
import { Snowflake } from "../util/Snowflake";
|
||||||
import { BaseClassWithoutId } from "./BaseClass";
|
import { BaseClassWithoutId } from "./BaseClass";
|
||||||
|
|
||||||
@Entity("members")
|
@Entity("members")
|
||||||
@Index(["id", "guild_id"], { unique: true })
|
@Index(["id", "guild_id"], { unique: true })
|
||||||
export class Member extends BaseClassWithoutId {
|
export class Member extends BaseClassWithoutId {
|
||||||
@Column({ primary: true, unique: false })
|
@PrimaryGeneratedColumn()
|
||||||
|
index: string;
|
||||||
|
|
||||||
|
@Column()
|
||||||
@RelationId((member: Member) => member.user)
|
@RelationId((member: Member) => member.user)
|
||||||
id: string;
|
id: string;
|
||||||
|
|
||||||
@ -38,7 +54,7 @@ export class Member extends BaseClassWithoutId {
|
|||||||
|
|
||||||
@JoinTable({
|
@JoinTable({
|
||||||
name: "member_roles",
|
name: "member_roles",
|
||||||
joinColumn: { name: "id", referencedColumnName: "id" },
|
joinColumn: { name: "index", referencedColumnName: "index" },
|
||||||
inverseJoinColumn: {
|
inverseJoinColumn: {
|
||||||
name: "role_id",
|
name: "role_id",
|
||||||
referencedColumnName: "id",
|
referencedColumnName: "id",
|
||||||
@ -213,7 +229,7 @@ export class Member extends BaseClassWithoutId {
|
|||||||
guild.joined_at = member.joined_at.toISOString();
|
guild.joined_at = member.joined_at.toISOString();
|
||||||
|
|
||||||
await Promise.all([
|
await Promise.all([
|
||||||
new Member({
|
Member.insert({
|
||||||
...member,
|
...member,
|
||||||
roles: [new Role({ id: guild_id })],
|
roles: [new Role({ id: guild_id })],
|
||||||
// read_state: {},
|
// read_state: {},
|
||||||
@ -226,7 +242,7 @@ export class Member extends BaseClassWithoutId {
|
|||||||
suppress_roles: false,
|
suppress_roles: false,
|
||||||
version: 0,
|
version: 0,
|
||||||
},
|
},
|
||||||
}).save(),
|
}),
|
||||||
Guild.increment({ id: guild_id }, "member_count", 1),
|
Guild.increment({ id: guild_id }, "member_count", 1),
|
||||||
emitEvent({
|
emitEvent({
|
||||||
event: "GUILD_MEMBER_ADD",
|
event: "GUILD_MEMBER_ADD",
|
||||||
|
Loading…
Reference in New Issue
Block a user