encrypt/gancio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix #18, cache users from fediverse

Browse Source
This commit is contained in:
les
2019-09-12 14:59:51 +02:00
parent fca3b8739d
commit cf5c09e3b1
9 changed files with 158 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/api/controller/user.js
View File

@@ -6,7 +6,7 @@ const { Op } = require('sequelize')
const jsonwebtoken = require('jsonwebtoken')
const config = require('config')
const mail = require('../mail')
const { user: User, event: Event, tag: Tag, place: Place } = require('../models')
const { user: User, event: Event, tag: Tag, place: Place, fed_users: FedUsers } = require('../models')
const settingsController = require('./settings')
const federation = require('../../federation/helpers')
@@ -207,8 +207,10 @@ const userController = {
}
},
current (req, res) {
if (req.user) { res.json(req.user) } else { res.sendStatus(404) }
async current (req, res) {
if (!req.user) return res.status(400).send('Not logged')
const user = await User.findByPk(req.user.id, { include: [ FedUsers ]})
res.json(user)
},
async getAll (req, res) {