From 23f4f125dbc5b9eba4182618430861361e3b5f32 Mon Sep 17 00:00:00 2001
From: relikd <info@relikd.de>
Date: Fri, 18 Dec 2020 10:37:36 +0100
Subject: [PATCH] Support for yt /c/channel-name URLs

---
 baRSS/Feed Import/Download3rdParty.h |  2 +-
 baRSS/Feed Import/Download3rdParty.m | 20 +++++++++++++++++++-
 baRSS/Feed Import/FeedDownload.m     |  2 +-
 baRSS/Info.plist                     |  2 +-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/baRSS/Feed Import/Download3rdParty.h b/baRSS/Feed Import/Download3rdParty.h
index 518aaa8..28e3b34 100644
--- a/baRSS/Feed Import/Download3rdParty.h	
+++ b/baRSS/Feed Import/Download3rdParty.h	
@@ -28,7 +28,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 // TODO: Make plugins extensible? community extensions.
 @interface YouTubePlugin : NSObject
-+ (NSString*)feedURL:(NSURL*)url;
++ (NSString*)feedURL:(NSURL*)url data:(NSData*)html;
 + (NSString*)videoImage:(NSString*)videoid;
 + (NSString*)videoImageHQ:(NSString*)videoid;
 @end
diff --git a/baRSS/Feed Import/Download3rdParty.m b/baRSS/Feed Import/Download3rdParty.m
index 8614af5..bf45682 100644
--- a/baRSS/Feed Import/Download3rdParty.m	
+++ b/baRSS/Feed Import/Download3rdParty.m	
@@ -33,12 +33,13 @@
 
  @return @c nil if @c url is not properly formatted, YouTube feed URL otherwise.
  */
-+ (NSString*)feedURL:(NSURL*)url {
++ (NSString*)feedURL:(NSURL*)url data:(NSData*)html {
 	if (![url.host hasSuffix:@"youtube.com"]) // 'youtu.be' & 'youtube-nocookie.com' will redirect
 		return nil;
 	// https://www.youtube.com/channel/[channel-id]
 	// https://www.youtube.com/user/[user-name]
 	// https://www.youtube.com/playlist?list=[playlist-id]
+	// https://www.youtube.com/c/[channel-name]
 #if DEBUG && ENV_LOG_YOUTUBE
 	printf("resolving YouTube url:\n");
 	printf(" ↳ %s\n", url.absoluteString.UTF8String);
@@ -62,6 +63,23 @@
 					break;
 				}
 			}
+		} else if ([type isEqualToString:@"c"]) {
+			NSData *m_json = [@"\"channelId\":\"" dataUsingEncoding:NSUTF8StringEncoding];
+			NSRange tmp = [html rangeOfData:m_json options:0 range:NSMakeRange(0, html.length)];
+			if (tmp.location == NSNotFound) {
+				NSData *m_head = [@"<meta itemprop=\"channelId\" content=\"" dataUsingEncoding:NSUTF8StringEncoding];
+				tmp = [html rangeOfData:m_head options:0 range:NSMakeRange(0, html.length)];
+			}
+			NSUInteger start = tmp.location + tmp.length;
+			NSUInteger end = html.length - start;
+			if (end > 50) end = 50; // no need to search till the end
+			NSString *substr = [[NSString alloc] initWithData:[html subdataWithRange:NSMakeRange(start, end)] encoding:NSUTF8StringEncoding];
+			if (substr) {
+				NSUInteger to = [substr rangeOfString:@"\""].location;
+				if (to != NSNotFound) {
+					found = [ytBase stringByAppendingFormat:@"?channel_id=%@", [substr substringToIndex:to]];
+				}
+			}
 		}
 	}
 #if DEBUG && ENV_LOG_YOUTUBE
diff --git a/baRSS/Feed Import/FeedDownload.m b/baRSS/Feed Import/FeedDownload.m
index 64aeb86..b9f728e 100644
--- a/baRSS/Feed Import/FeedDownload.m	
+++ b/baRSS/Feed Import/FeedDownload.m	
@@ -178,7 +178,7 @@
 		}
 		else if (!meta || meta.feedLinks.count == 0) {
 			if ([xml.url.host hasSuffix:@"youtube.com"])
-				feedURL = [YouTubePlugin feedURL:xml.url];
+				feedURL = [YouTubePlugin feedURL:xml.url data:xml.data];
 			if (feedURL.length == 0)
 				self.error = [NSError feedURLNotFound:xml.url];
 		}
diff --git a/baRSS/Info.plist b/baRSS/Info.plist
index c5708a0..3b9261f 100644
--- a/baRSS/Info.plist
+++ b/baRSS/Info.plist
@@ -70,7 +70,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>14633</string>
+	<string>14642</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.news</string>
 	<key>LSMinimumSystemVersion</key>