Merge branch '3.1' into 5.2
authorMarcel Werk <burntime@woltlab.com>
Mon, 15 Jun 2020 16:25:01 +0000 (18:25 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 15 Jun 2020 16:25:01 +0000 (18:25 +0200)
1  2 
com.woltlab.wcf/mediaProvider.xml

index 4f065ecaaa6a2b2d66e70253efc16b1bbcd382e9,f817be611e32a3efc1f31c64d3ba491c1bc06ec6..9a9995718b9fabffe5c89da456126bd254ed0cee
@@@ -59,32 -69,22 +59,27 @@@ https?://open.spotify.com/user/(?<USER>
  https?://open.spotify.com/(?<TYPE>[a-zA-Z]+)/(?<ID>[0-9a-zA-Z]+)]]></regex>
                        <html><![CDATA[<iframe width="300" height="380" src="https://embed.spotify.com/?uri=spotify:{$TYPE}:{$ID}" frameborder="0" allowtransparency="true"></iframe>]]></html>
                </provider>
-               <provider name="twitch-channel">
-                       <title>Twitch Channel</title>
-                       <regex><![CDATA[https?://www.twitch.tv/(?!videos)(?!.*/v/)(?<CHANNEL>[a-zA-Z0-9_]+)]]></regex>
-                       <html><![CDATA[<div class="videoContainer"><iframe src="https://player.twitch.tv/?channel={$CHANNEL}&autoplay=false" frameborder="0" scrolling="no" allowfullscreen></iframe></div>]]></html>
-               </provider>
-               <provider name="twitch-clip">
-                       <title>Twitch Clip</title>
-                       <regex><![CDATA[https?://clips.twitch.tv/(?<AUTHOR>([a-zA-Z0-9_]+)/)?(?<VIDEO>[a-zA-Z0-9_]+)]]></regex>
-                       <html><![CDATA[<div class="videoContainer"><iframe src="https://clips.twitch.tv/embed?clip={$AUTHOR}{$VIDEO}&autoplay=false" frameborder="0" scrolling="no" allowfullscreen></iframe></div>]]></html>
-               </provider>
-               <provider name="twitch-video">
-                       <title>Twitch Video</title>
-                       <regex><![CDATA[https?://www.twitch.tv/videos/(?<ID>[0-9]+)
- https?://www.twitch.tv/[a-zA-Z0-9]+/v/(?<ID>[0-9]+)]]></regex>
-                       <html><![CDATA[<div class="videoContainer"><iframe src="https://player.twitch.tv/?video=v{$ID}&autoplay=false" frameborder="0" scrolling="no" allowfullscreen></iframe></div>]]></html>
 -              
+               <provider name="twitch">
+                       <title>Twitch</title>
+                       <regex><![CDATA[https?://www.twitch.tv/(?<AUTHOR>[a-zA-Z0-9_]+)/clip/(?<CLIP>[a-zA-Z0-9_]+)
+ https?://www.twitch.tv/(?!videos)(?!.*/v/)(?<CHANNEL>[a-zA-Z0-9_]+)
+ https?://www.twitch.tv/videos/(?<VIDEO>[0-9]+)
+ https?://www.twitch.tv/[a-zA-Z0-9]+/v/(?<VIDEO>[0-9]+)]]></regex>
+                       <className><![CDATA[wcf\system\bbcode\media\provider\TwitchBBCodeMediaProvider]]></className>
                </provider>
 +              <provider name="twitter-tweet">
 +                      <title>Twitter Tweet</title>
 +                      <regex><![CDATA[https://twitter.com/(?<USERNAME>[0-9a-zA-Z_]+)/status/(?<ID>[0-9]+)]]></regex>
 +                      <html><![CDATA[<script>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");</script>
 +<div data-wsc-twitter-tweet="{$ID}"></div>
 +<script>twttr.ready(function(t){elBySelAll("[data-wsc-twitter-tweet]",void 0,function(t){elData(t,"wsc-twitter-tweet")&&(twttr.widgets.createTweet(elData(t,"wsc-twitter-tweet"),t,{dnt:!0}),elData(t,"wsc-twitter-tweet",""))})});</script>]]></html>
 +              </provider>
        </import>
        
        <delete>
 -              <provider name="facebook-video" />
                <provider name="imgur" />
+               <provider name="twitch-channel" />
+               <provider name="twitch-clip" />
+               <provider name="twitch-video" />
        </delete>
  </data>