From: Marcel Werk Date: Mon, 15 Jun 2020 16:25:01 +0000 (+0200) Subject: Merge branch '3.1' into 5.2 X-Git-Tag: 5.2.7~13 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ae55ba500d8dd363660a7d6337a8a7acc1a95bf8;p=GitHub%2FWoltLab%2FWCF.git Merge branch '3.1' into 5.2 --- ae55ba500d8dd363660a7d6337a8a7acc1a95bf8 diff --cc com.woltlab.wcf/mediaProvider.xml index 4f065ecaaa,f817be611e..9a9995718b --- a/com.woltlab.wcf/mediaProvider.xml +++ b/com.woltlab.wcf/mediaProvider.xml @@@ -59,32 -69,22 +59,27 @@@ https?://open.spotify.com/user/(? https?://open.spotify.com/(?[a-zA-Z]+)/(?[0-9a-zA-Z]+)]]> ]]> - - Twitch Channel - [a-zA-Z0-9_]+)]]> - ]]> - - - Twitch Clip - ([a-zA-Z0-9_]+)/)?(? - ]]> - - - Twitch Video - [0-9]+) - https?://www.twitch.tv/[a-zA-Z0-9]+/v/(?[0-9]+)]]> - ]]> - + + Twitch + [a-zA-Z0-9_]+)/clip/(?[a-zA-Z0-9_]+) + https?://www.twitch.tv/(?!videos)(?!.*/v/)(?[a-zA-Z0-9_]+) + https?://www.twitch.tv/videos/(? + + + Twitter Tweet + [0-9a-zA-Z_]+)/status/(?[0-9]+)]]> + window.twttr=function(t,e,r){var n,i=t.getElementsByTagName(e)[0],w=window.twttr||{};return t.getElementById(r)?w:((n=t.createElement(e)).id=r,n.src="https://platform.twitter.com/widgets.js",i.parentNode.insertBefore(n,i),w._e=[],w.ready=function(t){w._e.push(t)},w)}(document,"script","twitter-wjs"); +
+]]> + - + + +