Merge branch 'master' of github.com:winhtaikaung/react-link-preview

Author: win

lib/index.js

@@ -1,11 +1,9 @@
 import { ReactTinyLinkType } from '../../ReactTinyLinkTypes'
-import { isEmpty, getTitleOfDoc, getAttrOfDocElement, fixRelativeUrls } from '../utils'
+import { isEmpty, getTitleOfDoc, getAttrOfDocElement, fixRelativeUrls, getBaseUrl } from '../utils'
 
 export default async (url, htmlDoc, defaultMedia) => {
- let baseUrl = getAttrOfDocElement(htmlDoc, 'base', 'href')
- if (!baseUrl) {
- baseUrl = url
- }
+ let baseUrl = getBaseUrl(htmlDoc, url)
+
  const image = [
  getAttrOfDocElement(htmlDoc, '.a-dynamic-image', 'data-old-hires'),
  getAttrOfDocElement(htmlDoc, '.a-dynamic-image', 'src'),

lib/index.js.map

@@ -1,11 +1,8 @@
 import { ReactTinyLinkType } from '../../ReactTinyLinkTypes'
-import { isEmpty, getTitleOfDoc, getAttrOfDocElement, fixRelativeUrls } from '../utils'
+import { isEmpty, getTitleOfDoc, getAttrOfDocElement, fixRelativeUrls, getBaseUrl } from '../utils'
 
 export default async (url, htmlDoc, defaultMedia) => {
- let baseUrl = getAttrOfDocElement(htmlDoc, 'base', 'href')
- if (!baseUrl) {
- baseUrl = url
- }
+ let baseUrl = getBaseUrl(htmlDoc, url)
 
  const image = [
  getAttrOfDocElement(htmlDoc, 'meta[property="og:logo"]', 'content'),

src/rules/Amazon/ScrapAmazon.ts

@@ -2,11 +2,6 @@ import { ReactTinyLinkType } from '../../ReactTinyLinkTypes'
 import { getTitleOfDoc, getAttrOfDocElement, getInstagramVideo, isEmpty } from '../utils'
 
 export default async (url: string, htmlDoc, data, defaultMedia) => {
- let baseUrl = getAttrOfDocElement(htmlDoc, 'base', 'href')
- if (!baseUrl) {
- baseUrl = url
- }
-
  return {
  title: getTitleOfDoc(htmlDoc),
  content: getAttrOfDocElement(htmlDoc, "meta[name='description']", 'content'),

src/rules/Default/ScrapDefault.ts

@@ -10,3 +10,4 @@ export declare const getAttrOfDocElement: (htmlDoc: any, query: string, attr: st
 export declare const getYoutTubeVideoId: (url: string) => string;
 export declare const getInstagramVideo: (htmlDoc: any) => string;
 export declare const fixRelativeUrls: (baseUrl: string, itemUrl: string) => string;
+export declare const getBaseUrl: (htmlDoc: any, url: string) => any;

src/rules/Instagram/ScrapInstagram.ts

@@ -77,5 +77,7 @@ export const fixRelativeUrls = (baseUrl: string, itemUrl: string) => {
  if (normalizedUrl.startsWith('http://') || normalizedUrl.startsWith('https://')) {
  return itemUrl
  }
- return baseUrl + itemUrl
+ return new URL(itemUrl, baseUrl).href
 }
+
+export const getBaseUrl = (htmlDoc: any, url: string) => getAttrOfDocElement(htmlDoc, 'base', 'href') || new URL(url).origin