aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/models/user
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-06-16 09:54:59 +0200
committerChocobozzz <florian.bigard@gmail.com>2017-06-16 09:54:59 +0200
commit70c065d64c330196d371941d9294a55da6e3aa37 (patch)
tree4532a9611502135bedb1cc6009c706e31f1f9be4 /server/models/user
parent74889a71fe687dda74f2a687653122327807af36 (diff)
downloadPeerTube-70c065d64c330196d371941d9294a55da6e3aa37.tar.gz
PeerTube-70c065d64c330196d371941d9294a55da6e3aa37.tar.zst
PeerTube-70c065d64c330196d371941d9294a55da6e3aa37.zip
Add this context to instance model functions
Diffstat (limited to 'server/models/user')
-rw-r--r--server/models/user/user-interface.ts6
-rw-r--r--server/models/user/user.ts4
2 files changed, 5 insertions, 5 deletions
diff --git a/server/models/user/user-interface.ts b/server/models/user/user-interface.ts
index 1ba4bd800..6726e8ab5 100644
--- a/server/models/user/user-interface.ts
+++ b/server/models/user/user-interface.ts
@@ -6,10 +6,10 @@ import { User as FormatedUser } from '../../../shared/models/user.model'
6 6
7export namespace UserMethods { 7export namespace UserMethods {
8 export type IsPasswordMatchCallback = (err: Error, same: boolean) => void 8 export type IsPasswordMatchCallback = (err: Error, same: boolean) => void
9 export type IsPasswordMatch = (password: string, callback: IsPasswordMatchCallback) => void 9 export type IsPasswordMatch = (this: UserInstance, password: string, callback: IsPasswordMatchCallback) => void
10 10
11 export type ToFormatedJSON = () => FormatedUser 11 export type ToFormatedJSON = (this: UserInstance) => FormatedUser
12 export type IsAdmin = () => boolean 12 export type IsAdmin = (this: UserInstance) => boolean
13 13
14 export type CountTotalCallback = (err: Error, total: number) => void 14 export type CountTotalCallback = (err: Error, total: number) => void
15 export type CountTotal = (callback: CountTotalCallback) => void 15 export type CountTotal = (callback: CountTotalCallback) => void
diff --git a/server/models/user/user.ts b/server/models/user/user.ts
index d78f5f845..6b2410259 100644
--- a/server/models/user/user.ts
+++ b/server/models/user/user.ts
@@ -131,7 +131,7 @@ function beforeCreateOrUpdate (user: UserInstance) {
131 131
132// ------------------------------ METHODS ------------------------------ 132// ------------------------------ METHODS ------------------------------
133 133
134isPasswordMatch = function (password: string, callback: UserMethods.IsPasswordMatchCallback) { 134isPasswordMatch = function (this: UserInstance, password: string, callback: UserMethods.IsPasswordMatchCallback) {
135 return comparePassword(password, this.password, callback) 135 return comparePassword(password, this.password, callback)
136} 136}
137 137
@@ -146,7 +146,7 @@ toFormatedJSON = function (this: UserInstance) {
146 } 146 }
147} 147}
148 148
149isAdmin = function () { 149isAdmin = function (this: UserInstance) {
150 return this.role === USER_ROLES.ADMIN 150 return this.role === USER_ROLES.ADMIN
151} 151}
152 152