Merge branch 'master' into release

This commit is contained in:
Jay 2018-08-19 21:24:39 +08:00
commit e5eeba3538

View File

@ -127,7 +127,7 @@ const checkSession = async (c, n) => {
if (!('session' in c) || !('user' in c.session) || !('loginType' in c.session)) throw genError('NotLogin') if (!('session' in c) || !('user' in c.session) || !('loginType' in c.session)) throw genError('NotLogin')
c.state.loginUser = { c.state.loginUser = {
name: c.session.loginType === 'twitch' ? c.session.user.login : c.session.user.name, name: c.session.loginType === 'twitch' ? c.session.user.login : c.session.user.account,
type: c.session.loginType type: c.session.loginType
} }