fix blank screen and 404 on refresh

Author: yayvery

.github/workflows/build.yml

@@ -195,6 +195,9 @@ jobs:
         with:
           branch: gh-pages
           folder: web/dist
+          clean: true
+          clean-exclude: |
+            404.html
 
   release:
     needs: [deploy]

electron/package.json

@@ -1,7 +1,7 @@
 {
   "name": "electron",
   "description": "All-in-one chat and forums for communities.",
-  "version": "0.0.57",
+  "version": "0.0.58",
   "private": true,
   "repository": "github:joincomet/comet",
   "homepage": "https://joincomet.app",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "comet",
-	"version": "0.0.57",
+	"version": "0.0.58",
 	"private": true,
 	"license": "MPL-2.0",
 	"author": {

schema.graphql

@@ -902,6 +902,7 @@ type User implements BaseEntity {
   isOnline: Boolean!
   isPremium: Boolean!
   lastLoginAt: DateTime
+  lastMessageAt: DateTime
   name: String!
   onlineStatus: OnlineStatus!
   relatedUsers: [User!]!

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "server",
-  "version": "0.0.57",
+  "version": "0.0.58",
   "private": true,
   "engines": {
     "node": "15.x.x"
@@ -70,7 +70,7 @@
     "@types/express": "^4.17.11",
     "@types/faker": "^5.5.5",
     "@types/graphql-upload": "^8.0.4",
-    "@types/ioredis": "^4.26.2",
+    "@types/ioredis": "^4.26.3",
     "@types/jsonwebtoken": "^8.5.1",
     "@types/mime": "^2.0.3",
     "@types/sanitize-html": "^2.3.1",

server/src/entity/user/User.ts

@@ -1,4 +1,4 @@
-import { Authorized, Field, Int, ObjectType } from 'type-graphql'
+import { Authorized, Field, ObjectType } from 'type-graphql'
 import {
   Collection,
   Entity,
@@ -14,7 +14,6 @@ import {
   Channel,
   ChannelPermission,
   ChannelPermissionFallbacks,
-  ChannelPermissions,
   Folder,
   FolderVisibility,
   Group,
@@ -53,13 +52,15 @@ export class User extends BaseEntity {
   @Authorized('USER')
   @Field(() => GraphQLEmailAddress)
   @Property({ columnType: 'text' })
-  // @Unique()
   email: string
 
   @Field({ nullable: true })
   @Property({ nullable: true })
   lastLoginAt?: Date
 
+  @Field({ nullable: true })
+  lastMessageAt?: Date
+
   @Field({ nullable: true })
   @Property({ nullable: true, columnType: 'text' })
   avatarUrl?: string

server/src/resolver/user/UserResolver.ts

@@ -82,6 +82,14 @@ export class UserResolver {
     return userUnreadCountLoader.load(user.id)
   }
 
+  @FieldResolver(() => Date, { nullable: true })
+  async lastMessageAt(
+    @Ctx() { loaders: { userLastMessageAtLoader } }: Context,
+    @Root() user: User
+  ): Promise<Date> {
+    return userLastMessageAtLoader.load(user.id)
+  }
+
   @FieldResolver(() => Boolean)
   async showChat(
     @Ctx() { loaders: { userShowChatLoader } }: Context,

server/src/types/Context.ts

@@ -52,6 +52,7 @@ export interface Loaders {
   userServersLoader: DataLoader<string, Server[]>
   userUnreadCountLoader: DataLoader<string, number>
   userShowChatLoader: DataLoader<string, boolean>
+  userLastMessageAtLoader: DataLoader<string, Date>
 
   folderFollowingLoader: DataLoader<string, boolean>
   folderOwnerLoader: DataLoader<string, User>

server/src/util/loaders/createLoaders.ts

@@ -29,6 +29,7 @@ import {
 } from '@/util/loaders/folder'
 import { Loaders } from '@/types'
 import { userShowChatLoader } from '@/util/loaders/user'
+import { userLastMessageAtLoader } from '@/util/loaders/user/UserLastMessageAtLoader'
 
 export function createLoaders(em: EntityManager, userId: string): Loaders {
   return {
@@ -64,6 +65,7 @@ export function createLoaders(em: EntityManager, userId: string): Loaders {
     userServersLoader: userServersLoader(em, userId),
     userUnreadCountLoader: userUnreadCountLoader(em, userId),
     userShowChatLoader: userShowChatLoader(em, userId),
+    userLastMessageAtLoader: userLastMessageAtLoader(em, userId),
 
     folderFollowingLoader: folderFollowingLoader(em, userId),
     folderOwnerLoader: folderOwnerLoader(em),

server/src/util/loaders/user/UserLastMessageAtLoader.ts

@@ -0,0 +1,23 @@
+import DataLoader from 'dataloader'
+import { Relationship, User } from '@/entity'
+import { EntityManager } from '@mikro-orm/postgresql'
+
+export const userLastMessageAtLoader = (
+  em: EntityManager,
+  currentUserId: string
+) => {
+  return new DataLoader<string, Date>(async (userIds: string[]) => {
+    const relationships = await em.find(Relationship, {
+      owner: currentUserId,
+      user: userIds
+    })
+    const map: Record<string, Date> = {}
+    userIds.forEach(
+      userId =>
+        (map[userId] = relationships.find(
+          rel => rel.user === em.getReference(User, userId)
+        )?.lastMessageAt)
+    )
+    return userIds.map(userId => map[userId])
+  })
+}