X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=server%2Fcontrollers%2Fclient.ts;h=c85bd8a5ed79c94d880cd260837a2f5e18287169;hb=94a5ff8a4a75d75bb9df542a39ce8769e7a7e6a4;hp=f474c4282006c65ed0b8e2f772b56cfb5518e2ed;hpb=6bafac54bf375cd60f1c06f6afdc648e0e19743d;p=oweals%2Fpeertube.git
diff --git a/server/controllers/client.ts b/server/controllers/client.ts
index f474c4282..c85bd8a5e 100644
--- a/server/controllers/client.ts
+++ b/server/controllers/client.ts
@@ -1,24 +1,16 @@
+import * as Bluebird from 'bluebird'
import * as express from 'express'
import { join } from 'path'
import * as validator from 'validator'
-import * as Bluebird from 'bluebird'
-
-import { database as db } from '../initializers/database'
-import {
- CONFIG,
- STATIC_PATHS,
- STATIC_MAX_AGE,
- OPENGRAPH_AND_OEMBED_COMMENT,
- EMBED_SIZE
-} from '../initializers'
-import { root, readFileBufferPromise, escapeHTML } from '../helpers'
+import { escapeHTML, readFileBufferPromise, root } from '../helpers/core-utils'
+import { CONFIG, EMBED_SIZE, OPENGRAPH_AND_OEMBED_COMMENT, STATIC_MAX_AGE, STATIC_PATHS } from '../initializers'
import { asyncMiddleware } from '../middlewares'
-import { VideoInstance } from '../models'
+import { VideoModel } from '../models/video/video'
const clientsRouter = express.Router()
const distPath = join(root(), 'client', 'dist')
-const assetsImagesPath = join(root(), 'client', 'dist', 'assets', 'images')
+const assetsImagesPath = join(root(), 'client', 'dist', 'client', 'assets', 'images')
const embedPath = join(distPath, 'standalone', 'videos', 'embed.html')
const indexPath = join(distPath, 'index.html')
@@ -49,7 +41,7 @@ export {
// ---------------------------------------------------------------------------
-function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoInstance) {
+function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoModel) {
const previewUrl = CONFIG.WEBSERVER.URL + STATIC_PATHS.PREVIEWS + video.getPreviewName()
const videoUrl = CONFIG.WEBSERVER.URL + '/videos/watch/' + video.uuid
@@ -92,29 +84,47 @@ function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoInstance
}
]
+ const schemaTags = {
+ '@context': 'http://schema.org',
+ '@type': 'VideoObject',
+ name: videoNameEscaped,
+ description: videoDescriptionEscaped,
+ duration: video.getActivityStreamDuration(),
+ thumbnailURL: previewUrl,
+ contentURL: videoUrl,
+ embedURL: embedUrl,
+ uploadDate: video.createdAt
+ }
+
let tagsString = ''
+
+ // Opengraph
Object.keys(openGraphMetaTags).forEach(tagName => {
const tagValue = openGraphMetaTags[tagName]
tagsString += ``
})
+ // OEmbed
for (const oembedLinkTag of oembedLinkTags) {
tagsString += ``
}
+ // Schema.org
+ tagsString += ``
+
return htmlStringPage.replace(OPENGRAPH_AND_OEMBED_COMMENT, tagsString)
}
async function generateWatchHtmlPage (req: express.Request, res: express.Response, next: express.NextFunction) {
const videoId = '' + req.params.id
- let videoPromise: Bluebird
+ let videoPromise: Bluebird
// Let Angular application handle errors
if (validator.isUUID(videoId, 4)) {
- videoPromise = db.Video.loadByUUIDAndPopulateAccountAndServerAndTags(videoId)
+ videoPromise = VideoModel.loadByUUIDAndPopulateAccountAndServerAndTags(videoId)
} else if (validator.isInt(videoId)) {
- videoPromise = db.Video.loadAndPopulateAccountAndServerAndTags(+videoId)
+ videoPromise = VideoModel.loadAndPopulateAccountAndServerAndTags(+videoId)
} else {
return res.sendFile(indexPath)
}