Add ability to remove a video on watch page

[github/Chocobozzz/PeerTube.git] / server / helpers / utils.ts

diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts
index cb5e536b8bcdc04d4dc167c6bc1a66fd9beee45d..769aa83c6a0b94f19b2956bc702e4f3d1852f213 100644 (file)
--- a/server/helpers/utils.ts
+++ b/server/helpers/utils.ts
@@ -2,12 +2,26 @@ import * as express from 'express'
 import { Model } from 'sequelize-typescript'
 import { ResultList } from '../../shared'
 import { VideoResolution } from '../../shared/models/videos'
-import { CONFIG } from '../initializers'
-import { AccountModel } from '../models/account/account'
+import { CONFIG, REMOTE_SCHEME } from '../initializers'
 import { UserModel } from '../models/account/user'
+import { ActorModel } from '../models/activitypub/actor'
+import { ApplicationModel } from '../models/application/application'
 import { pseudoRandomBytesPromise } from './core-utils'
 import { logger } from './logger'
 
+function getHostWithPort (host: string) {
+  const splitted = host.split(':')
+
+  // The port was not specified
+  if (splitted.length === 1) {
+    if (REMOTE_SCHEME.HTTP === 'https') return host + ':443'
+
+    return host + ':80'
+  }
+
+  return host
+}
+
 function badRequest (req: express.Request, res: express.Response, next: express.NextFunction) {
   return res.type('json').status(400).end()
 }
@@ -80,18 +94,19 @@ function resetSequelizeInstance (instance: Model<any>, savedFields: object) {
   })
 }
 
-let serverAccount: AccountModel
-async function getServerAccount () {
-  if (serverAccount === undefined) {
-    serverAccount = await AccountModel.loadApplication()
+let serverActor: ActorModel
+async function getServerActor () {
+  if (serverActor === undefined) {
+    const application = await ApplicationModel.load()
+    serverActor = application.Account.Actor
   }
 
-  if (!serverAccount) {
-    logger.error('Cannot load server account.')
+  if (!serverActor) {
+    logger.error('Cannot load server actor.')
     process.exit(0)
   }
 
-  return Promise.resolve(serverAccount)
+  return Promise.resolve(serverActor)
 }
 
 type SortType = { sortModel: any, sortValue: string }
@@ -105,6 +120,7 @@ export {
   isSignupAllowed,
   computeResolutionsToTranscode,
   resetSequelizeInstance,
-  getServerAccount,
-  SortType
+  getServerActor,
+  SortType,
+  getHostWithPort
 }