FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add additional Reddit URL validation

Browse Source
This commit is contained in:
Maurice Parker 2020-05-08 16:13:25 -05:00
parent ffdeda4a74
commit faaf280d12
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Frameworks/Account/FeedProvider/FeedProvider.swift
View File

@ -29,7 +29,7 @@ public protocol FeedProvider {
/// Provide the iconURL of the given URL /// Provide the iconURL of the given URL
func iconURL(_ urlComponents: URLComponents, completion: @escaping (Result<String, Error>) -> Void) func iconURL(_ urlComponents: URLComponents, completion: @escaping (Result<String, Error>) -> Void)
/// Construct the associated metadata for the new feed /// Construct the associated metadata for the new feed. If the URL won't be recognized by this Feed Provider, it will error here.
func metaData(_ urlComponents: URLComponents, completion: @escaping (Result<FeedProviderFeedMetaData, Error>) -> Void) func metaData(_ urlComponents: URLComponents, completion: @escaping (Result<FeedProviderFeedMetaData, Error>) -> Void)
/// Refresh all the article entries (ParsedItems) /// Refresh all the article entries (ParsedItems)

7
Frameworks/Account/FeedProvider/Reddit/RedditFeedProvider.swift
View File

@ -124,11 +124,16 @@ public final class RedditFeedProvider: FeedProvider {
return return
} }
guard splitPath.count > 1 else { guard splitPath.count > 1, splitPath.count < 4, splitPath[0] == "r" else {
completion(.failure(RedditFeedProviderError.unknown)) completion(.failure(RedditFeedProviderError.unknown))
return return
} }
if splitPath.count == 3 && RedditSort(rawValue: String(splitPath[2])) == nil {
completion(.failure(RedditFeedProviderError.unknown))
return
}
let homePageURL = "https://www.reddit.com/\(splitPath[0])/\(splitPath[1])" let homePageURL = "https://www.reddit.com/\(splitPath[0])/\(splitPath[1])"
subreddit(urlComponents) { result in subreddit(urlComponents) { result in