aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/models/account
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-02-21 14:06:10 +0100
committerChocobozzz <me@florianbigard.com>2019-02-21 14:06:10 +0100
commit92bf2f62995bbaa0402cb4657473ad8d5b6fcf8d (patch)
tree7f3f34b1503fd21db7f0b913c3b908f004015011 /server/models/account
parent84c7cde6e81426a42e7aa29187b473bc89f1c8f6 (diff)
downloadPeerTube-92bf2f62995bbaa0402cb4657473ad8d5b6fcf8d.tar.gz
PeerTube-92bf2f62995bbaa0402cb4657473ad8d5b6fcf8d.tar.zst
PeerTube-92bf2f62995bbaa0402cb4657473ad8d5b6fcf8d.zip
Improve channel and account SEO
Diffstat (limited to 'server/models/account')
-rw-r--r--server/models/account/account.ts10
1 files changed, 10 insertions, 0 deletions
diff --git a/server/models/account/account.ts b/server/models/account/account.ts
index 84ef0b30d..747b51afb 100644
--- a/server/models/account/account.ts
+++ b/server/models/account/account.ts
@@ -24,6 +24,8 @@ import { getSort, throwIfNotValid } from '../utils'
24import { VideoChannelModel } from '../video/video-channel' 24import { VideoChannelModel } from '../video/video-channel'
25import { VideoCommentModel } from '../video/video-comment' 25import { VideoCommentModel } from '../video/video-comment'
26import { UserModel } from './user' 26import { UserModel } from './user'
27import * as Bluebird from '../../helpers/custom-validators/accounts'
28import { CONFIG } from '../../initializers'
27 29
28@DefaultScope({ 30@DefaultScope({
29 include: [ 31 include: [
@@ -153,6 +155,14 @@ export class AccountModel extends Model<AccountModel> {
153 return AccountModel.findOne(query) 155 return AccountModel.findOne(query)
154 } 156 }
155 157
158 static loadByNameWithHost (nameWithHost: string) {
159 const [ accountName, host ] = nameWithHost.split('@')
160
161 if (!host || host === CONFIG.WEBSERVER.HOST) return AccountModel.loadLocalByName(accountName)
162
163 return AccountModel.loadByNameAndHost(accountName, host)
164 }
165
156 static loadLocalByName (name: string) { 166 static loadLocalByName (name: string) {
157 const query = { 167 const query = {
158 where: { 168 where: {