Merge branch 'release/v3.4.0'

Author: octfx

.eslintignore

@@ -0,0 +1,6 @@
+/.storybook/
+/docs/
+/i18n/
+/node_modules/
+/vendor/
+Gruntfile.js

.eslintrc.json

@@ -0,0 +1,20 @@
+{
+	"root": true,
+	"extends": [
+		"wikimedia/client",
+		"wikimedia/jquery",
+		"wikimedia/mediawiki"
+	],
+	"globals": {
+		"require": "readonly",
+		"module": "readonly"
+	},
+	"rules": {
+		"one-var": "off",
+		"//": [
+			"off",
+			"ResourceLoader's `packageFiles` do not require wrapping but the `module` option is only available in ES6+."
+		],
+		"no-implicit-globals": "off"
+	}
+}

.github/workflows/lint-check.yml

@@ -13,7 +13,7 @@ jobs:
             - name: Installing PHP
               uses: shivammathur/setup-php@master
               with:
-                  php-version: '7.4'
+                  php-version: '8.0'
             - name: Get Composer Cache Directory 2
               id: composer-cache
               run: |

.gitignore

@@ -4,4 +4,7 @@
 .DS_Store
 .svn
 /vendor
-composer.lock
+/composer.lock
+/node_modules
+/.eslintcache
+/package-lock.json

EmbedVideo.i18n.magic.php

@@ -12,7 +12,10 @@
 
 $magicWords['en'] = [
 	'ev' => [ 0, 'ev' ],
+	'evt' => [ 0, 'evt' ],
 	'evu' => [ 0, 'evu' ],
+	'evl' => [ 0, 'evl' ],
+	'vlink' => [ 0, 'vlink' ],
 	'ev_start' => [ 0, 'start=$1' ],
 	'ev_end' => [ 0, 'end=$1' ],
 	'cover' => [ 0, 'cover=$1' ],

README.md

@@ -150,6 +150,41 @@ Alternatively each parameter can be used in any order as a named parameter. The
 **Do note** mixing named and unnamed parameters will require you to add all unnamed parameters (and blanks) in the previously mentioned order.  
 E.g. using named id and unnamed description `{{#ev:service||||This is the Description|id=abc}}`/ `{{#ev:service|id=abc|||This is the Description}}`
 
+### \#evu - Embed Video Url
+The `{{#evu}}` parser function tries to extract the service from the host name of an url.
+
+It takes the same arguments as `{{#ev}}`.
+
+### \#evl - Embed Video Link
+The support for `{{#evl}} / {{#vlink}}` and `<evlplayer> / <vplayer>` has been added with version 3.4.0.
+
+The link parser function takes the following arguments:
+* `id` - Video ID
+* `text` - Link Text
+* `player` - ID of the `<evlplayer>` if multiple exist on a page
+* `service` - Name of the embed service, defaults to YouTube
+
+Named arguments can be passed in any order, unnamed args must be passed in the order defined above.
+
+#### \<evlplayer> / \<vplayer>
+The corresponding player that plays the videos defined by `{{#evl}}` links.
+
+Note that this implementation differs from EmbedVideo v2.x in the following areas:
+* No `default content` is supported, i.e. text inside the tags
+* A default video id should be defined, else the player displays a blank embed
+  * In the old implementation nothing was shown
+* No `style` attribute can be set
+* Video lists are not supported
+
+### Example
+```mediawiki
+<evlplayer w="width" h="height" class="class" id="example-player" defaultid="pSsYTj9kCHE"></evlplayer>`
+{{#evl:21X5lGlDOfg|NASA Live|player=example-player}}`
+{{#evl:6ZFbXIJkuI1dVNWvzJzown|text=Spotify Track|service=spotifytrack|player=example-player}}
+```
+
+Shows a YouTube embed for the video `pSsYTj9kCHE` and two video links, one for another YouTube video (NASA Live) and a Spotify track.
+
 ## Examples
 
 ## SharePoint
@@ -228,6 +263,7 @@ As of version 3.x, EmbedVideo supports embedding video content from the followin
 | Site                                                     | Service Name(s)                 | ID Example                                             | URL Example(s)                                                                                                            |
 |----------------------------------------------------------|---------------------------------|--------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------|
 | [Archive.org Videos](https://archive.org/details/movies) | `archiveorg`                    | electricsheep-flock-244-80000-6                        | https://archive.org/details/electricsheep-flock-244-80000-6<br/>https://archive.org/embed/electricsheep-flock-244-80000-6 |
+| [Bandcamp](https://bandcamp.com/)                        | `bandcamp`                      | 1003592798                                             | https://emptyhousesmusic.bandcamp.com/album/empty-houses (Click on share/embed, and copy the id after `album=`)           |
 | [Bilibili](https://www.bilibili.com/)                    | `bilibili`                      | BV1Hz4y1k7ae                                           | https://player.bilibili.com/player.html?bvid=1Hz4y1k7ae&amp;page=1                                                        |
 | [DailyMotion](https://dailymotion.com/)                  | `dailymotion`                   | x1adiiw_archer-waking-up-as-h-jon-benjamin_shortfilms  | http://www.dailymotion.com/video/x1adiiw_archer-waking-up-as-h-jon-benjamin_shortfilms                                    |
 | [KakaoTV](https://tv.kakao.com/)                         | `kakaotv`                       | 301157950                                              | https://play-tv.kakao.com/embed/player/cliplink/301157950                                                                 |

composer.json

@@ -1,6 +1,6 @@
 {
 	"name": "starcitizenwiki/embedvideo",
-	"version": "3.3.0",
+	"version": "3.4.0",
 	"type": "mediawiki-extension",
 	"description": "Adds a parser function embedding video from popular sources.",
 	"license": "MIT",

extension.json

@@ -1,6 +1,6 @@
 {
 	"name": "EmbedVideo",
-	"version": "3.3.0",
+	"version": "3.4.0",
 	"author": [
 		"[https://www.mediawiki.org/wiki/User:Octfx Octfx]",
 		"[https://www.mediawiki.org/wiki/User:Alistair3149 Alistair3149]",
@@ -35,15 +35,59 @@
 		"embedvideo": "MediaWiki\\Extension\\EmbedVideo\\ApiEmbedVideo"
 	},
 	"ResourceModules": {
+		"ext.embedVideo.messages": {
+			"messages": [
+				"embedvideo-service-archiveorg",
+				"embedvideo-service-bandcamp",
+				"embedvideo-service-bilibili",
+				"embedvideo-service-dailymotion",
+				"embedvideo-service-kakaotv",
+				"embedvideo-service-loom",
+				"embedvideo-service-navertv",
+				"embedvideo-service-niconico",
+				"embedvideo-service-soundcloud",
+				"embedvideo-service-sharepoint",
+				"embedvideo-service-spotify",
+				"embedvideo-service-twitch",
+				"embedvideo-service-videolink",
+				"embedvideo-service-vimeo",
+				"embedvideo-service-youtube",
+				"embedvideo-service-localvideo",
+				"embedvideo-service-externalvideo",
+				"embedvideo-consent-privacy-notice-text",
+				"embedvideo-consent-privacy-policy"
+			]
+		},
+		"ext.embedVideo.videolink": {
+			"es6": true,
+			"packageFiles": [
+				"ext.embedVideo.videolink.js",
+				{ "name": "fetchFactory.js", "file": "fetchers/fetchFactory.js" },
+				{ "name": "queryKeyParser.js", "file": "fetchers/queryKeyParser.js" },
+				{ "name": "bilibili.js", "file": "fetchers/bilibili.js" },
+				{ "name": "niconico.js", "file": "fetchers/niconico.js" },
+				{ "name": "oembed.js", "file": "fetchers/oembed.js" },
+				{ "name": "iframe.js", "file": "modules/iframe.js" }
+			],
+			"styles": [
+				"ext.embedVideo.consent.less"
+			],
+			"position": "top",
+			"targets": [
+				"desktop",
+				"mobile"
+			]
+		},
 		"ext.embedVideo.consent": {
 			"es6": true,
 			"packageFiles": [
 				"ext.embedVideo.consent.js",
-				{ "name": "fetchFactory.js", "file":  "fetchers/fetchFactory.js" },
-				{ "name": "queryKeyParser.js", "file":  "fetchers/queryKeyParser.js" },
-				{ "name": "bilibili.js", "file":  "fetchers/bilibili.js" },
-				{ "name": "niconico.js", "file":  "fetchers/niconico.js" },
-				{ "name": "oembed.js", "file":  "fetchers/oembed.js" }
+				{ "name": "fetchFactory.js", "file": "fetchers/fetchFactory.js" },
+				{ "name": "queryKeyParser.js", "file": "fetchers/queryKeyParser.js" },
+				{ "name": "bilibili.js", "file": "fetchers/bilibili.js" },
+				{ "name": "niconico.js", "file": "fetchers/niconico.js" },
+				{ "name": "oembed.js", "file": "fetchers/oembed.js" },
+				{ "name": "iframe.js", "file": "modules/iframe.js" }
 			],
 			"styles": [
 				"ext.embedVideo.consent.less"
@@ -99,7 +143,7 @@
 		},
 		"EmbedVideoUseEmbedStyleForLocalVideos": {
 			"description": "Styles local videos like they are embedded",
-			"value": false
+			"value": true
 		},
 		"EmbedVideoEnableAudioHandler": {
 			"description": "Enables the audio handler which displays local videos using the html5 <audio> tag.",
@@ -126,11 +170,11 @@
 			"value": []
 		},
 		"EmbedVideoRequireConsent": {
-			"description": "Explicitly require consent by only loading the iframe if the user clicks it",
+			"description": "Explicitly require consent by only loading the iframe after the user clicks play",
 			"value": true
 		},
 		"EmbedVideoFetchExternalThumbnails": {
-			"description": "Don't try to fetch thumbnails when consent is required.",
+			"description": "Fetch video thumbnails by querying the respective external oembed endpoints. This results in a http call.",
 			"value": true
 		},
 		"EmbedVideoShowPrivacyNotice": {

i18n/de.json

@@ -10,9 +10,9 @@
 	},
 	"embedvideo-description": "Fügt eine Parserfunktion hinzu, mittels derer Videos populärer Dienste eingebettet werden können.",
 	"embedvideo-load": "$1 laden",
-	"embedvideo-type-audio": "audio",
+	"embedvideo-type-audio": "Audio",
 	"embedvideo-type-content": "Inhalt",
-	"embedvideo-type-video": "video",
+	"embedvideo-type-video": "Video",
 	"embedvideo-consent-privacy-policy": "Datenschutzrichtlinie",
 	"embedvideo-consent-privacy-notice-text": "$1 sammelt möglicherweise persönliche Daten.",
 	"embedvideo-consent-privacy-notice-continue": "Fortfahren",
@@ -31,7 +31,7 @@
 	"embedvideo-error-evp_deprecated": "Die Parserfunktion „#evp“ wurde in EmbedVideo 2.0 verworfen; alle Parserfunktionen-Tags sind in „#ev“ zu ändern.",
 	"embedvideo-error-container": "Der Wert für „container“ ist ungültig.",
 	"embedvideo-video-long-desc": "$1, $2 Codec, Länge $3, $4x$5 Pixel, $6 insgesamt",
-	"embedvideo-audio-long-desc": "$1, $2 codec, Länge $3, $4 insgesamt",
+	"embedvideo-audio-long-desc": "$1, $2 Codec, Länge $3, $4 insgesamt",
 	"embedvideo-error-cantdecode_evu": "Konnte das Video von $1 nicht analysieren",
 	"apihelp-embedvideo-summary": "Ermittelt den generierten Videoeinbettungscode für die angegebenen Parameter.",
 	"apihelp-embedvideo-param-service": "Name des Dienstes (youtube, twitch etc.)",

i18n/en.json

@@ -13,6 +13,7 @@
 	"embedvideo-consent-privacy-notice-dismiss": "Dismiss",
 	"embedvideo-service-archiveorg": "Archive.org",
 	"embedvideo-service-bilibili": "Bilibili",
+	"embedvideo-service-bandcamp": "Bandcamp",
 	"embedvideo-service-dailymotion": "Dailymotion",
 	"embedvideo-service-kakaotv": "KakaoTV",
 	"embedvideo-service-loom": "Loom",
@@ -22,10 +23,11 @@
 	"embedvideo-service-sharepoint": "SharePoint",
 	"embedvideo-service-spotify": "Spotify",
 	"embedvideo-service-twitch": "Twitch",
+	"embedvideo-service-videolink": "Video Link",
 	"embedvideo-service-vimeo": "Vimeo",
 	"embedvideo-service-youtube": "YouTube",
 	"embedvideo-service-localvideo": "Local File",
-	"embedvideo-service-externalvideo": "External Video ",
+	"embedvideo-service-externalvideo": "External Video",
 	"embedvideo-play": "Play Video",
 	"embedvideo-error-missingparams": "EmbedVideo is missing a required parameter.",
 	"embedvideo-error-service": "EmbedVideo does not recognize the video service \"$1\".",