backend: prettier

server/index.ts

@@ -7,34 +7,31 @@ import db from './db'
 const pg = require('pg')
 delete pg.native
 
-const {connectUpstream} = require('./joystream/ws')
+const { connectUpstream } = require('./joystream/ws')
 const { addBlockRange } = require('./joystream')
 
-const {setupSocket} = require('./socket')
+const { setupSocket } = require('./socket')
 const PORT: number = process.env.PORT ? +process.env.PORT : 3500
 
 const app = express()
-const server = app.listen(PORT, () => {
+const server = app.listen(PORT, () =>
   console.log(`[Express] Listening on port ${PORT}`)
-});
-
-(async () =>{
+)
 
+;(async () => {
   const api = await connectUpstream()
 
   const io: any = socketio(server)
   setupSocket(io, api)
-  const args = process.argv.slice(2);
-  if (args.length === 2){
-    const startBlock = args[0];
-    const endBlock = args[1];
-    console.log(`[Joystream] syncing blocks from ${startBlock} to ${endBlock}`);
-    addBlockRange(api, startBlock, endBlock);
+  const args = process.argv.slice(2)
+  if (args.length === 2) {
+    const startBlock = args[0]
+    const endBlock = args[1]
+    console.log(`[Joystream] syncing blocks from ${startBlock} to ${endBlock}`)
+    addBlockRange(api, startBlock, endBlock)
   }
-
 })()
 
-
 //const cors = require("cors");
 //const passport = require('passport')
 //const LocalStrategy = require('passport-local')

server/socket.ts

@@ -6,7 +6,6 @@ const { ApiPromise, WsProvider } = require('@polkadot/api')
 const { addBlock } = require('./joystream')
 const chalk = require('chalk')
 
-
 const setupSocket = async (io: any, api: Api) => {
   let status: Status = {}
   let lastHeader: Header
@@ -21,7 +20,10 @@ const setupSocket = async (io: any, api: Api) => {
     console.log(chalk.green(`[socket.io] Connection: ${socket.id}`))
 
     socket.on('get blocks', async (limit: number) => {
-      const blocks = await Block.findAll({ limit, order: [['id', 'DESC']] })
+      const blocks = await Block.findWithIncludes({
+        limit,
+        order: [['id', 'DESC']],
+      })
       socket.emit('blocks', blocks)
     })
 
@@ -29,8 +31,6 @@ const setupSocket = async (io: any, api: Api) => {
       console.log(chalk.red(`[socket.io] Disconnect: ${socket.id}`))
     })
   })
-
 }
 
-
-module.exports = { setupSocket }
+module.exports = { setupSocket }