@ecency/render-helper 2.2.11 → 2.2.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecency/render-helper",
-  "version": "2.2.11",
+  "version": "2.2.12",
   "description": "Markdown+Html Render helper",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/consts/allowed-attributes.const.ts

@@ -13,6 +13,7 @@ export const ALLOWED_ATTRIBUTES: XSSWhiteList = {
     'data-filter',
     'data-embed-src',
     'data-youtube',
+    'data-start-time',
     'data-video-href',
     'data-proposal',
     'class',

package/src/consts/regexes.const.ts

@@ -11,7 +11,7 @@ export const INTERNAL_TOPIC_REGEX = /^\/(trending|hot|created|promoted|muted|pay
 export const INTERNAL_POST_TAG_REGEX = /\/(.*)\/(@[\w.\d-]+)\/(.*)/i
 export const INTERNAL_POST_REGEX = /^\/(@[\w.\d-]+)\/(.*)$/i
 export const CUSTOM_COMMUNITY_REGEX = /^https?:\/\/(.*)\/c\/(hive-\d+)(.*)/i
-export const YOUTUBE_REGEX = /(?:https?:\/\/)?(?:www\.)?(?:youtube\.com\/watch\?v=|youtu\.be\/)([^& \n<]+)(?:[^ \n<]+)?/g
+export const YOUTUBE_REGEX = /(?:youtube.com\/(?:[^\/]+\/.+\/|(?:v|e(?:mbed)?)\/|.*[?&]v=)|youtu.be\/)([^"&?\/\s]{11})/g
 export const YOUTUBE_EMBED_REGEX = /^(https?:)?\/\/www.youtube.com\/(embed|shorts)\/.*/i
 export const VIMEO_REGEX = /(https?:\/\/)?(www\.)?(?:vimeo)\.com.*(?:videos|video|channels|)\/([\d]+)/i
 export const VIMEO_EMBED_REGEX = /https:\/\/player\.vimeo\.com\/video\/([0-9]+)/

package/src/helper.ts

@@ -14,3 +14,14 @@ export function makeEntryCacheKey(entry: any): string {
   return `${entry.author}-${entry.permlink}-${entry.last_update}`
 }
 
+export function extractYtStartTime(url:string):string {
+  const urlObj = new URL(url);
+  const params = new URLSearchParams(urlObj.search);
+  if(params.has('t')){
+    return '' + parseInt(params.get('t')); //parsing is important as sometimes t is famated '123s';
+  }else if (params.has('start')){
+    return params.get('start');
+  }
+
+  return '';
+}

package/src/markdown-2-html.spec.ts

@@ -445,9 +445,9 @@ describe('Markdown2Html', () => {
         author: 'foo329',
         permlink: 'bar329',
         last_update: '2019-05-10T09:15:21',
-        body: 'https://youtu.be/_-6hJ8sltdI'
+        body: 'https://youtu.be/UuyS7YAkECA?t=295s'
       }
-      const expected = '<p><a class="markdown-video-link markdown-video-link-youtube" data-embed-src="https://www.youtube.com/embed/_-6hJ8sltdI?autoplay=1" data-youtube="_-6hJ8sltdI"><img class="no-replace video-thumbnail" src="https://images.ecency.com/p/S5Eokt4BcQdk7EHeT1aYjzebg2hC7hkthT45eEGc5AMBA14JMjkkxrUAj3mV5QR9D6zfstr.png?format=match&amp;mode=fit" /><span class="markdown-video-play"></span></a></p>'
+      const expected = '<p><a class="markdown-video-link markdown-video-link-youtube" data-embed-src="https://www.youtube.com/embed/UuyS7YAkECA?autoplay=1" data-youtube="UuyS7YAkECA" data-start-time="295"><img class="no-replace video-thumbnail" src="https://images.ecency.com/p/S5Eokt4BcQdk7EHeT1aYjzebg2hC7hkthT45eAMp88bZ44hfAQDm6BtJw2H53aq1Tpn1cu4.png?format=match&amp;mode=fit" /><span class="markdown-video-play"></span></a></p>'
 
       expect(markdown2Html(input)).toBe(expected)
     })
@@ -877,6 +877,18 @@ describe('Markdown2Html', () => {
 
       expect(markdown2Html(input, false)).toBe(expected)
     })
+
+    it('65- Should handle youtube.com/embed videos', () => {
+      const input = {
+        author: 'foo329',
+        permlink: 'bar329',
+        last_update: '2019-05-10T09:15:21',
+        body: 'https://www.youtube.com/embed/UuyS7YAkECA?start=295&autoplay=1'
+      }
+      const expected = '<p><a class="markdown-video-link markdown-video-link-youtube" data-embed-src="https://www.youtube.com/embed/UuyS7YAkECA?autoplay=1" data-youtube="UuyS7YAkECA" data-start-time="295"><img class="no-replace video-thumbnail" src="https://images.ecency.com/p/S5Eokt4BcQdk7EHeT1aYjzebg2hC7hkthT45eAMp88bZ44hfAQDm6BtJw2H53aq1Tpn1cu4.png?format=match&amp;mode=fit" /><span class="markdown-video-play"></span></a></p>'
+
+      expect(markdown2Html(input)).toBe(expected)
+    })
   })
 
   describe("Rumble support", () => {

package/src/methods/a.method.ts

@@ -28,6 +28,7 @@ import {
 import { getSerializedInnerHTML } from './get-inner-html.method'
 import { proxifyImageSrc } from '../proxify-image-src'
 import { removeChildNodes } from './remove-child-nodes.method'
+import { extractYtStartTime } from '../helper'
 
 export function a(el: HTMLElement, forApp: boolean, webp: boolean): void {
   let href = el.getAttribute('href')
@@ -416,6 +417,12 @@ export function a(el: HTMLElement, forApp: boolean, webp: boolean): void {
       el.setAttribute('data-embed-src', embedSrc);
       el.setAttribute('data-youtube', vid);
 
+      //extract start time if available
+      const startTime = extractYtStartTime(href);
+      if(startTime){
+        el.setAttribute('data-start-time', startTime);
+      }
+
       const thumbImg = el.ownerDocument.createElement('img')
       thumbImg.setAttribute('class', 'no-replace video-thumbnail')
       thumbImg.setAttribute('itemprop', 'thumbnailUrl')
@@ -671,6 +678,12 @@ export function a(el: HTMLElement, forApp: boolean, webp: boolean): void {
       if (e[1]) {
         const vid = e[1]
         el.setAttribute('data-youtube', vid);
+
+        //extract start time if available
+        const startTime = extractYtStartTime(href);
+        if(startTime){
+          el.setAttribute('data-start-time', startTime);
+        }
       }
     }
     el.removeAttribute('href')
@@ -684,3 +697,6 @@ export function a(el: HTMLElement, forApp: boolean, webp: boolean): void {
     }
   }
 }
+
+
+

package/src/methods/text.method.ts

@@ -1,4 +1,5 @@
 import { IMG_REGEX, YOUTUBE_REGEX, WHITE_LIST, DOMParser, POST_REGEX,  } from '../consts'
+import { extractYtStartTime } from '../helper'
 import { proxifyImageSrc } from '../proxify-image-src'
 import { linkify } from './linkify.method'
 
@@ -34,7 +35,12 @@ export function text(node: HTMLElement, forApp: boolean, webp: boolean): void {
       const thumbnail = proxifyImageSrc(`https://img.youtube.com/vi/${vid.split('?')[0]}/hqdefault.jpg`, 0, 0, webp ? 'webp' : 'match')
       const embedSrc = `https://www.youtube.com/embed/${vid}?autoplay=1`
 
-      const attrs = `class="markdown-video-link markdown-video-link-youtube" data-embed-src="${embedSrc}" data-youtube="${vid}"`
+      let attrs = `class="markdown-video-link markdown-video-link-youtube" data-embed-src="${embedSrc}" data-youtube="${vid}"`
+      //extract start time if available
+      const startTime = extractYtStartTime(node.nodeValue);
+      if(startTime){
+        attrs = attrs.concat(` data-start-time="${startTime}"`);
+      }
 
       const thumbImg = node.ownerDocument.createElement('img')
       thumbImg.setAttribute('class', 'no-replace video-thumbnail')