Merge remote-tracking branch 'refs/remotes/origin/3.0'

[GitHub/WoltLab/WCF.git] / com.woltlab.wcf / mediaProvider.xml
diff --git a/com.woltlab.wcf/mediaProvider.xml b/com.woltlab.wcf/mediaProvider.xml

index b6b5bdb327a7c21f72ee49d237a7f799d03e0316..36df632e19e49a0c37f2b0670ed93ddab224e0d0 100644 (file)
--- a/com.woltlab.wcf/mediaProvider.xml
+++ b/com.woltlab.wcf/mediaProvider.xml
@@ -20,12 +20,6 @@ https?://vimeo\.com/groups/[^/]+/videos/(?P<ID>\d+)]]></regex>
                         <html><![CDATA[<div class="videoContainer"><iframe src="https://player.vimeo.com/video/{$ID}" allowfullscreen></iframe></div>]]></html>
                 </provider>
                 
-               <provider name="clipfish">
-                       <title>Clipfish</title>
-                       <regex><![CDATA[http://(?:www\.)?clipfish\.de/(?:.*?/)?video/(?P<ID>\d+)/]]></regex>
-                       <html><![CDATA[<div style="width:464px; height:404px;"><div style="width:464px; height:384px;"><iframe src="http://www.clipfish.de/embed_video/?vid={$ID}&amp;as=0&amp;col=990000" name="Clipfish Embedded Video" width="464" height="384" align="left" marginheight="0" marginwidth="0" scrolling="no"></iframe></div></div>]]></html>
-               </provider>
-               
                 <provider name="veoh">
                         <title>Veoh</title>
                         <regex><![CDATA[http://(?:www\.)?veoh\.com/watch/v(?P<ID>\d+[a-zA-Z0-9]+)]]></regex>
@@ -100,5 +94,11 @@ https?://open.spotify.com/(?<TYPE>[a-zA-Z]+)/(?<ID>[0-9a-zA-Z]+)]]></regex>
  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>
+               
+               <provider name="facebook-video">
+                       <title>Facebook Video</title>
+                       <regex><![CDATA[https://(?:.+?\.)?facebook\.com/(?:[a-zA-Z0-9_]+/)?video(?:s/|\.php)(?:\?id=|\?v=)?(?<ID>[0-9]+)]]></regex>
+                       <html><![CDATA[<iframe src="https://www.facebook.com/plugins/video.php?href=https%3A%2F%2Fwww.facebook.com%2Fvideo.php%3Fv%3D{$ID}&show_text=0&width=560" width="560" height="315" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true" allowFullScreen="true"></iframe>]]></html>
+               </provider>
         </import>
  </data>