Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New service #82

Merged
merged 1 commit into from
Jul 27, 2018
Merged

New service #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions api/src/Channel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,20 @@ constexpr folly::StringPiece kAngelThumpService{"angelthump"};
constexpr folly::StringPiece kDailyMotionService{"dailymotion"};
constexpr folly::StringPiece kFacebookService{"facebook"};
constexpr folly::StringPiece kNSFWChaturbateService{"nsfw-chaturbate"};
constexpr folly::StringPiece kSmashcastService{"smashcast"};
constexpr folly::StringPiece kTwitchService{"twitch"};
constexpr folly::StringPiece kTwitchVODService{"twitch-vod"};
constexpr folly::StringPiece kUstreamService{"ustream"};
constexpr folly::StringPiece kVaughnService{"vaughn"};
constexpr folly::StringPiece kYouTubePlaylistService{"youtube-playlist"};
constexpr folly::StringPiece kYouTubeService{"youtube"};

constexpr std::array<folly::StringPiece, 12> kServices{
constexpr std::array<folly::StringPiece, 13> kServices{
kAdvancedService, kAfreecaService, kAngelThumpService,
kDailyMotionService, kFacebookService, kNSFWChaturbateService,
kTwitchService, kTwitchVODService, kUstreamService,
kVaughnService, kYouTubePlaylistService, kYouTubeService};
kSmashcastService, kTwitchService, kTwitchVODService,
kUstreamService, kVaughnService, kYouTubePlaylistService,
kYouTubeService};

constexpr std::array<folly::StringPiece, 3> kCaseInsensitiveServices{
kAngelThumpService, kTwitchService, kUstreamService};
Expand Down
1 change: 1 addition & 0 deletions src/components/ServiceSelect.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const ServiceSelect = props =>
<option value='dailymotion'>Dailymotion</option>
<option value='facebook'>Facebook</option>
<option value='nsfw-chaturbate'>Chaturbate (NSFW)</option>
<option value='smashcast'>Smashcast</option>
<option value='twitch'>Twitch</option>
<option value='twitch-vod'>Twitch (VOD)</option>
<option value='ustream'>Ustream</option>
Expand Down
3 changes: 3 additions & 0 deletions src/components/StreamEmbed.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ const getSrc = (channel, service) => {
return `https://www.facebook.com/video/embed?video_id=${channel}&autoplay=true`;
case 'nsfw-chaturbate':
return `https://chaturbate.com/embed/${channel}?bgcolor=black`;
case 'smashcast':
return `https://www.smashcast.tv/embed/${channel}?popout=true&autoplay=true`;
case 'twitch-vod':
return `https://player.twitch.tv/?video=v${channel}`;
case 'twitch':
Expand Down Expand Up @@ -73,6 +75,7 @@ StreamEmbed.propTypes = {
'dailymotion',
'facebook',
'nsfw-chaturbate',
'smashcast',
'twitch-vod',
'twitch',
'ustream',
Expand Down