Skip to content

Commit f6bdc27

Browse files
committed
MediaEmbed: removed Livestream \(defunct\)
1 parent 9e42969 commit f6bdc27

File tree

8 files changed

+90
-160
lines changed

8 files changed

+90
-160
lines changed

docs/Plugins/MediaEmbed/Sites.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,6 @@
245245
<td><code>liveleak</code></td>
246246
<td>https://www.liveleak.com/view?t=yIcw_1520190567</td>
247247
</tr>
248-
<tr title="Livestream" id="livestream">
249-
<td><code>livestream</code></td>
250-
<td>https://new.livestream.com/jbtvlive/musicmarathon<br/>https://livestream.com/ccscsl/USChessChampionships/videos/83267610<br/>https://livestre.am/58XNV</td>
251-
</tr>
252248
<tr title="Mail.Ru" id="mailru">
253249
<td><code>mailru</code></td>
254250
<td>https://my.mail.ru/corp/auto/video/testdrive/34.html<br/>https://my.mail.ru/mail/alenka1957/video/1/7.html</td>

docs/Plugins/MediaEmbed/Using_default_sites.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ echo count($configurator->MediaEmbed->defaultSites), " sites remaining.\n";
7777
```
7878
Does YouTube exist? yes
7979
What about now? no
80-
137 sites remaining.
80+
136 sites remaining.
8181
0 sites remaining.
8282
```
8383

docs/testdox.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6910,7 +6910,6 @@ Parser (s9e\TextFormatter\Tests\Plugins\MediaEmbed\Parser)
69106910
[x] Scraping tests with data set #63
69116911
[x] Scraping tests with data set #64
69126912
[x] Scraping tests with data set #65
6913-
[x] Scraping tests with data set #66
69146913
[x] Scraping+rendering tests with data set #0
69156914
[x] Scraping+rendering tests with data set #1
69166915
[x] Scraping+rendering tests with data set #2
@@ -7311,7 +7310,6 @@ Parser (s9e\TextFormatter\Tests\Plugins\MediaEmbed\Parser)
73117310
[x] Parsing tests with data set #345
73127311
[x] Parsing tests with data set #346
73137312
[x] Parsing tests with data set #347
7314-
[x] Parsing tests with data set #348
73157313
[x] Parsing tests (JavaScript) with data set #0
73167314
[x] Parsing tests (JavaScript) with data set #1
73177315
[x] Parsing tests (JavaScript) with data set #2
@@ -7660,7 +7658,6 @@ Parser (s9e\TextFormatter\Tests\Plugins\MediaEmbed\Parser)
76607658
[x] Parsing tests (JavaScript) with data set #345
76617659
[x] Parsing tests (JavaScript) with data set #346
76627660
[x] Parsing tests (JavaScript) with data set #347
7663-
[x] Parsing tests (JavaScript) with data set #348
76647661
[x] Parsing+rendering tests with data set #0
76657662
[x] Parsing+rendering tests with data set #1
76667663
[x] Parsing+rendering tests with data set #2

src/Bundles/MediaPack.php

Lines changed: 86 additions & 88 deletions
Large diffs are not rendered by default.

src/Bundles/MediaPack/Renderer.php

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

src/Plugins/MediaEmbed/Configurator/Collections/CachedDefinitionCollection.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ class CachedDefinitionCollection extends SiteDefinitionCollection
7171
'kickstarter'=>['attributes'=>[],'choose'=>['otherwise'=>['iframe'=>['height'=>420,'src'=>'//www.kickstarter.com/projects/{@id}/widget/card.html','width'=>220]],'when'=>['iframe'=>['height'=>360,'src'=>'//www.kickstarter.com/projects/{@id}/widget/video.html','width'=>640],'test'=>'@video']],'example'=>['https://www.kickstarter.com/projects/1869987317/wish-i-was-here-1','https://www.kickstarter.com/projects/1869987317/wish-i-was-here-1/widget/card.html','https://www.kickstarter.com/projects/1869987317/wish-i-was-here-1/widget/video.html'],'extract'=>['!kickstarter\\.com/projects/(?\'id\'[^/]+/[^/?]+)(?:/widget/(?:(?\'card\'card)|(?\'video\'video)))?!'],'homepage'=>'https://www.kickstarter.com/','host'=>['kickstarter.com'],'name'=>'Kickstarter','scrape'=>[],'tags'=>['fundraising']],
7272
'libsyn'=>['attributes'=>[],'example'=>'https://pexlives.libsyn.com/the-ark-in-space-ep4-commentary-with-el-and-jack','extract'=>[],'homepage'=>'https://www.libsyn.com/','host'=>['libsyn.com'],'iframe'=>['height'=>90,'max-width'=>900,'src'=>'//html5-player.libsyn.com/embed/episode/id/{@id}/thumbnail/no','width'=>'100%'],'name'=>'Libsyn','scrape'=>[['extract'=>['!embed/episode/id/(?\'id\'\\d+)!'],'match'=>['@(?!\\.mp3)....$@']]],'tags'=>['podcasts']],
7373
'liveleak'=>['attributes'=>[],'example'=>'https://www.liveleak.com/view?t=yIcw_1520190567','extract'=>['!liveleak\\.com/(?:e/|view\\?i=)(?\'id\'\\w+)!'],'homepage'=>'https://www.liveleak.com/','host'=>['liveleak.com'],'iframe'=>['src'=>'//www.liveleak.com/e/{@id}'],'name'=>'Liveleak','scrape'=>[['extract'=>['!liveleak\\.com/e/(?\'id\'\\w+)!'],'match'=>['!liveleak\\.com/view\\?t=!']]],'tags'=>['videos']],
74-
'livestream'=>['attributes'=>[],'example'=>['https://new.livestream.com/jbtvlive/musicmarathon','https://livestream.com/ccscsl/USChessChampionships/videos/83267610','https://livestre.am/58XNV'],'extract'=>['!livestream\\.com/accounts/(?\'account_id\'\\d+)/events/(?\'event_id\'\\d+)!','!/videos/(?\'video_id\'\\d+)!','!original\\.livestream\\.com/(?\'channel\'\\w+)/video\\?clipId=(?\'clip_id\'[-\\w]+)!'],'homepage'=>'https://new.livestream.com/','host'=>['livestre.am','livestream.com'],'iframe'=>['src'=>'//<xsl:choose><xsl:when test="@clip_id">cdn.livestream.com/embed/<xsl:value-of select="@channel"/>?layout=4&amp;autoplay=false&amp;clip=<xsl:value-of select="@clip_id"/></xsl:when><xsl:otherwise>livestream.com/accounts/<xsl:value-of select="@account_id"/>/events/<xsl:value-of select="@event_id"/><xsl:if test="@video_id">/videos/<xsl:value-of select="@video_id"/></xsl:if>/player?autoPlay=false</xsl:otherwise></xsl:choose>'],'name'=>'Livestream','scrape'=>[['extract'=>['!accounts/(?\'account_id\'\\d+)/events/(?\'event_id\'\\d+)!'],'match'=>['@livestream\\.com/(?!accounts/\\d+/events/\\d)@']],['extract'=>['!//original\\.livestream\\.com/(?\'channel\'\\w+)/video/(?\'clip_id\'[-\\w]+)!'],'match'=>['!livestre.am!']]],'tags'=>['livestreaming','videos']],
7574
'mailru'=>['attributes'=>[],'example'=>['https://my.mail.ru/corp/auto/video/testdrive/34.html','https://my.mail.ru/mail/alenka1957/video/1/7.html'],'extract'=>[],'homepage'=>'https://my.mail.ru/','host'=>['my.mail.ru'],'iframe'=>['src'=>'https://my.mail.ru/video/embed/{@id}'],'name'=>'Mail.Ru','scrape'=>[['extract'=>['!"itemId": ?"?(?\'id\'\\d+)!'],'match'=>['!my\\.mail\\.ru/\\w+/\\w+/video/\\w+/\\d!']]],'tags'=>['.ru']],
7675
'mastodon'=>['attributes'=>['host'=>['required'=>true]],'example'=>'https://mastodon.social/@HackerNewsBot/100181134752056592','extract'=>['#//(?\'host\'[-.\\w]+)/(?:web/)?(?:@|users/)(?\'name\'\\w+)/(?:posts/|statuses/)?(?\'id\'\\d+)#'],'helper'=>'s9e\\TextFormatter\\Plugins\\MediaEmbed\\Configurator\\SiteHelpers\\MastodonHelper','homepage'=>'https://mastodon.social/','host'=>['mastodon.social'],'iframe'=>['data-s9e-livepreview-ignore-attrs'=>'style','height'=>300,'onload'=>'let c=new MessageChannel;c.port1.onmessage=e=>this.style.height=e.data+\'px\';this.contentWindow.postMessage(\'s9e:init\',\'*\',[c.port2])','src'=>'https://s9e.github.io/iframe/2/mastodon.min.html#<xsl:value-of select="@name"/><xsl:if test="@host and@host!=\'mastodon.social\'">@<xsl:value-of select="@host"/></xsl:if>/<xsl:value-of select="@id"/>','width'=>550],'name'=>'Mastodon','oembed'=>['endpoint'=>'https://mastodon.social/api/oembed','scheme'=>'https://mastodon.social/@{@name}/{@id}'],'scrape'=>[['extract'=>['#"url":"https://(?\'host\'[-.\\w]+)/@(?\'name\'\\w+)/(?\'id\'\\d+)"#'],'match'=>['#^(?\'origin\'https://[^/]+)/(?:web/)?(?:@\\w+@[-.\\w]+|statuses)/(?\'id\'\\d+)#'],'url'=>'{@origin}/api/v1/statuses/{@id}']],'tags'=>['social']],
7776
'medium'=>['attributes'=>[],'example'=>'https://medium.com/@donnydonny/team-internet-is-about-to-win-net-neutrality-and-they-didnt-need-googles-help-e7e2cf9b8a95','extract'=>['#medium\\.com/(?:s/\\w+/|@?[-\\w]+/)?(?:[%\\w]+-)*(?\'id\'[0-9a-f]+)(?![%\\w])#'],'homepage'=>'https://medium.com/','host'=>['medium.com'],'iframe'=>['data-s9e-livepreview-ignore-attrs'=>'style','height'=>316,'max-width'=>900,'onload'=>'let c=new MessageChannel;c.port1.onmessage=e=>this.style.height=e.data+\'px\';this.contentWindow.postMessage(\'s9e:init\',\'*\',[c.port2])','src'=>'https://s9e.github.io/iframe/2/medium.min.html#{@id}','width'=>'100%'],'name'=>'Medium','scrape'=>[],'tags'=>['blogging']],

src/Plugins/MediaEmbed/Configurator/sites/livestream.xml

Lines changed: 0 additions & 41 deletions
This file was deleted.

tests/Plugins/MediaEmbed/ParserTest.php

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -912,16 +912,6 @@ function ($configurator)
912912
$configurator->MediaEmbed->add('libsyn');
913913
}
914914
],
915-
[
916-
'https://livestream.com/internetsociety/wsis/videos/107058039',
917-
'<r><LIVESTREAM account_id="686369" event_id="4588746" video_id="107058039">https://livestream.com/internetsociety/wsis/videos/107058039</LIVESTREAM></r>',
918-
[],
919-
function ($configurator)
920-
{
921-
$configurator->registeredVars['cacheDir'] = __DIR__ . '/../../.cache';
922-
$configurator->MediaEmbed->add('livestream');
923-
}
924-
],
925915
[
926916
'https://mastodon.social/@[email protected]/109579438826193099',
927917
'<r><MASTODON host="infosec.exchange" id="109579438603578302" name="SwiftOnSecurity">https://mastodon.social/@[email protected]/109579438826193099</MASTODON></r>',
@@ -2637,15 +2627,6 @@ function ($configurator)
26372627
$configurator->MediaEmbed->add('kickstarter');
26382628
}
26392629
],
2640-
[
2641-
'http://new.livestream.com/accounts/9999999999/events/9999999999',
2642-
'<r><LIVESTREAM account_id="9999999999" event_id="9999999999">http://new.livestream.com/accounts/9999999999/events/9999999999</LIVESTREAM></r>',
2643-
[],
2644-
function ($configurator)
2645-
{
2646-
$configurator->MediaEmbed->add('livestream');
2647-
}
2648-
],
26492630
[
26502631
'https://mastodon.social/web/@HackerNewsBot/100181134752056592',
26512632
'<r><MASTODON host="mastodon.social" id="100181134752056592" name="HackerNewsBot">https://mastodon.social/web/@HackerNewsBot/100181134752056592</MASTODON></r>',

0 commit comments

Comments
 (0)