Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fosscord:master' into master

Browse Source
This commit is contained in:
Featyre 2022-02-01 16:54:50 +00:00 committed by GitHub
commit e609d5c345
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/client_test/index.html
View File

@ -65,11 +65,11 @@
localStorage.setItem("UserSettingsStore", JSON.stringify(settings)); localStorage.setItem("UserSettingsStore", JSON.stringify(settings));
} }
</script> </script>
<script src="/assets/checkLocale.js"></script> <script src="/assets/checkLocale.js"></script>
<script src="/assets/479a2f1e7d625dc134b9.js"></script> <script src="/assets/1e18f2aac02e172db283.js"></script>
<script src="/assets/a15fd133a1d2d77a2424.js"></script> <script src="/assets/681e53cdfefa5b82249a.js"></script>
<script src="/assets/97e6fa22aa08ee4daa5e.js"></script> <script src="/assets/7a036838c0a0e73f59d8.js"></script>
<script src="/assets/9b2b7f0632acd0c5e781.js"></script> <script src="/assets/b6cf2184a7a05e7525ce.js"></script>
<!-- plugin marker --> <!-- plugin marker -->
</body> </body>
</html> </html>

6
util/src/entities/Message.ts
View File

@ -84,8 +84,10 @@ export class Message extends BaseClass {
@RelationId((message: Message) => message.member) @RelationId((message: Message) => message.member)
member_id: string; member_id: string;
@JoinColumn({ name: "member_id" }) @JoinColumn({ name: "author_id", referencedColumnName: "id" })
@ManyToOne(() => Member) @ManyToOne(() => User, {
onDelete: "CASCADE",
})
member?: Member; member?: Member;
@Column({ nullable: true }) @Column({ nullable: true })