From 61cf386d6df9d8fbed496c4308a4086bfd6d074a Mon Sep 17 00:00:00 2001
From: Michael Wuergler <wuergler@gmail.com>
Date: Sun, 9 Jun 2019 00:59:36 +0200
Subject: [PATCH] Fix user links (#22)

* linting tweaks

* ignore username only links

* disable max-len rule in tests

* 3.1.3
---
 index.js     | 23 ++++++++++++++++++++---
 package.json |  2 +-
 test.js      |  5 +++++
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/index.js b/index.js
index 7952b50..73f553e 100644
--- a/index.js
+++ b/index.js
@@ -6,7 +6,7 @@ module.exports = function (str) {
 		throw new TypeError('get-video-id expects a string');
 	}
 
-	if (/<iframe/ig.test(str)) {
+	if (/<iframe/gi.test(str)) {
 		str = getSrc(str);
 	}
 
@@ -73,12 +73,22 @@ function vimeo(str) {
 	var id;
 	var arr;
 
-	if (/https?:\/\/vimeo\.com\/[0-9]+$|https?:\/\/player\.vimeo\.com\/video\/[0-9]+$|https?:\/\/vimeo\.com\/channels|groups|album/igm.test(str)) {
+	const vimeoPipe = [
+		'https?:\/\/vimeo\.com\/[0-9]+$',
+		'https?:\/\/player\.vimeo\.com\/video\/[0-9]+$',
+		'https?:\/\/vimeo\.com\/channels',
+		'groups',
+		'album'
+	].join('|');
+
+	const vimeoRegex = new RegExp(vimeoPipe, 'gim');
+
+	if (vimeoRegex.test(str)) {
 		arr = str.split('/');
 		if (arr && arr.length) {
 			id = arr.pop();
 		}
-	} else if (/clip_id=/igm.test(str)) {
+	} else if (/clip_id=/gim.test(str)) {
 		arr = str.split('clip_id=');
 		if (arr && arr.length) {
 			id = arr[1].split('&')[0];
@@ -145,6 +155,13 @@ function youtube(str) {
 		return stripParameters(embedid);
 	}
 
+	// ignore /user/username pattern
+	var usernamereg = /\/user\/([a-zA-Z0-9]*)$/g;
+
+	if (usernamereg.test(str)) {
+		return undefined;
+	}
+
 	// user
 	var userreg = /\/user\/(?!.*videos)/g;
 
diff --git a/package.json b/package.json
index a2e1a01..f745166 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "get-video-id",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "description": "Get the YouTube, Vimeo, Vine or VideoPress video id from a url or embed string.",
   "license": "MIT",
   "repository": "radiovisual/get-video-id",
diff --git a/test.js b/test.js
index a8d737e..f9db9e9 100644
--- a/test.js
+++ b/test.js
@@ -1,3 +1,4 @@
+/* eslint max-len: 0 */
 import test from 'ava';
 import fn from './';
 
@@ -266,6 +267,10 @@ test('handles youtube /user/ formats', t => {
 	t.is(fn('http://www.youtube.com/user/username#p/u/1/ABC12302?rel=0').service, 'youtube');
 });
 
+test('ignores youtube.com/user/* patterns', t => {
+	t.is(fn('https://www.youtube.com/user/ThreeDaysGraceVideos').id, undefined);
+});
+
 test('returns id:undefined with /user/ format that does not have a video id', t => {
 	t.is(fn('https://www.youtube.com/user/ThreeDaysGraceVideos/videos').id, undefined);
 });