Merge branch '3.1' into 5.2

diff --git a/com.woltlab.wcf/mediaProvider.xml b/com.woltlab.wcf/mediaProvider.xml
index 9a9995718b9fabffe5c89da456126bd254ed0cee..d3f7176ba793a97e96c79e187a95c2672f29a72e 100644 (file)
--- a/com.woltlab.wcf/mediaProvider.xml
+++ b/com.woltlab.wcf/mediaProvider.xml
@@ -61,7 +61,8 @@ https?://open.spotify.com/(?<TYPE>[a-zA-Z]+)/(?<ID>[0-9a-zA-Z]+)]]></regex>
                </provider>
                <provider name="twitch">
                        <title>Twitch</title>
-                       <regex><![CDATA[https?://www.twitch.tv/(?<AUTHOR>[a-zA-Z0-9_]+)/clip/(?<CLIP>[a-zA-Z0-9_]+)
+                       <regex><![CDATA[https?://clips.twitch.tv/(?<CLIP>[a-zA-Z0-9_]+)
+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>