diff options
Diffstat (limited to 'classes')
| -rwxr-xr-x | classes/feeds.php | 5 | ||||
| -rw-r--r-- | classes/urlhelper.php | 22 |
2 files changed, 25 insertions, 2 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index 12d6dd65f..42673ca95 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -1751,9 +1751,10 @@ class Feeds extends Handler_Protected { author, score, (SELECT count(label_id) FROM ttrss_user_labels2 WHERE article_id = ttrss_entries.id) AS num_labels, (SELECT count(id) FROM ttrss_enclosures WHERE post_id = ttrss_entries.id) AS num_enclosures - FROM ttrss_entries, ttrss_user_entries, ttrss_tags, ttrss_feeds + FROM ttrss_entries, + ttrss_user_entries LEFT JOIN ttrss_feeds ON (ttrss_feeds.id = ttrss_user_entries.feed_id), + ttrss_tags WHERE - ttrss_feeds.id = ttrss_user_entries.feed_id AND ref_id = ttrss_entries.id AND ttrss_user_entries.owner_uid = ".$pdo->quote($owner_uid)." AND post_int_id = int_id AND diff --git a/classes/urlhelper.php b/classes/urlhelper.php index 46d80a0e6..edfb2ad73 100644 --- a/classes/urlhelper.php +++ b/classes/urlhelper.php @@ -487,4 +487,26 @@ class UrlHelper { } } + public static function url_to_youtube_vid($url) { + $url = str_replace("youtube.com", "youtube-nocookie.com", $url); + + $regexps = [ + "/\/\/www\.youtube-nocookie\.com\/v\/([\w-]+)/", + "/\/\/www\.youtube-nocookie\.com\/embed\/([\w-]+)/", + "/\/\/www\.youtube-nocookie\.com\/watch?v=([\w-]+)/", + "/\/\/youtu.be\/([\w-]+)/", + ]; + + foreach ($regexps as $re) { + $matches = []; + + if (preg_match($re, $url, $matches)) { + return $matches[1]; + } + } + + return false; + } + + } |