lint: lib/models/note.ts

- add cursor and user stats type

lint: lib/models/note.ts

- add missing relation fields

Author: a60814billy

lib/models/note.ts

@@ -20,7 +20,7 @@ import config from "../config";
 import {logger} from "../logger";
 import {createNoteWithRevision, syncNote} from "../services/note";
 import {stripTags} from "../string";
-import {Authorship, ModelObj, MySequelize, NoteAttributes, NoteMeta} from "./baseModel";
+import {Authorship, ModelObj, MySequelize, NoteAttributes, NoteMeta, UserModel} from "./baseModel";
 
 const md = markdownIt()
 export const dmp = new DiffMatchPatch()
@@ -48,6 +48,8 @@ export class Note extends Model<NoteAttributes> implements NoteAttributes {
   ownerId: string
 
   lastchangeuserId?: string
+  owner?: UserModel;
+  lastchangeuser?: UserModel;
 
   static initialize(sequelize: MySequelize): void {
     Note.init({

lib/note/index.ts

@@ -140,9 +140,9 @@ export async function showPublishNote(req: Request, res: Response): Promise<void
     updatetime: updateTime,
     body: body,
     owner: note.owner ? note.owner.id : null,
-    ownerprofile: note.owner ? User.getProfile(note.owner) : null,
+    ownerprofile: note.owner ? User.getProfile(note.owner as User) : null,
     lastchangeuser: note.lastchangeuser ? note.lastchangeuser.id : null,
-    lastchangeuserprofile: note.lastchangeuser ? User.getProfile(note.lastchangeuser) : null,
+    lastchangeuserprofile: note.lastchangeuser ? User.getProfile(note.lastchangeuser as User) : null,
     robots: meta.robots || false, // default allow robots
     GA: meta.GA,
     disqus: meta.disqus,

lib/realtime/realtime.ts

@@ -33,13 +33,14 @@ export interface RealtimeUserData {
   'user-agent'?: string
   photo?: string
 
-  cursor?: any
+  cursor?: {line: number, ch: number}
   login?: boolean
   userid?: string
   name?: string
 
-  idle?: any
-  type?: any
+  // user status
+  idle: boolean
+  type: 'xs' | 'sm' | 'md' | 'lg'
 }
 
 interface RealtimeAuthorData {