FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2024-12-23 08:09:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add support for pseudo subreddits

Browse Source
This commit is contained in:
Maurice Parker 2020-05-09 10:23:37 -05:00
parent de15c1c78d
commit c16dbc125d
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,8 +36,10 @@ public final class RedditFeedProvider: FeedProvider {
private static let apiBase = "https://oauth.reddit.com"
private static let userAgentHeaders = UserAgent.headers() as! [String: String]
private static let userPaths = ["/home", "/notifications"]
private static let reservedPaths = ["/search", "/explore", "/messages", "/i", "/compose"]
private static let pseudoSubreddits = [
"popular": NSLocalizedString("Popular", comment: "Popular"),
"all": NSLocalizedString("All", comment: "All")
]
public var username: String?
@ -109,21 +111,16 @@ public final class RedditFeedProvider: FeedProvider {
public func metaData(_ urlComponents: URLComponents, completion: @escaping (Result<FeedProviderFeedMetaData, Error>) -> Void) {
let path = urlComponents.path
if path == "" || path == "/" {
let name = NSLocalizedString("Reddit Best", comment: "Reddit Best")
let metaData = FeedProviderFeedMetaData(name: name, homePageURL: Self.homeURL)
completion(.success(metaData))
return
}
// Reddit Home
let splitPath = path.split(separator: "/")
if splitPath.count == 1, let sort = RedditSort(rawValue: String(splitPath[0])) {
let name = "Reddit \(sort.displayName)"
if path == "" || path == "/" || (splitPath.count == 1 && RedditSort(rawValue: String(splitPath[0])) != nil) {
let name = NSLocalizedString("Reddit Home", comment: "Reddit Home")
let metaData = FeedProviderFeedMetaData(name: name, homePageURL: Self.homeURL)
completion(.success(metaData))
return
}
// Subreddits
guard splitPath.count > 1, splitPath.count < 4, splitPath[0] == "r" else {
completion(.failure(RedditFeedProviderError.unknown))
return
@ -136,6 +133,15 @@ public final class RedditFeedProvider: FeedProvider {
let homePageURL = "https://www.reddit.com/\(splitPath[0])/\(splitPath[1])"
// Reddit Popular, Reddit All, etc...
if let subredditName = Self.pseudoSubreddits[String(splitPath[1])] {
let localized = NSLocalizedString("Reddit %@", comment: "Reddit")
let name = NSString.localizedStringWithFormat(localized as NSString, subredditName) as String
let metaData = FeedProviderFeedMetaData(name: name, homePageURL: homePageURL)
completion(.success(metaData))
return
}
subreddit(urlComponents) { result in
switch result {
case .success(let subreddit):
@ -164,7 +170,17 @@ public final class RedditFeedProvider: FeedProvider {
api = "\(urlComponents.path).json"
}
let identifySubreddit = !urlComponents.path.hasPrefix("/r/")
let splitPath = urlComponents.path.split(separator: "/")
let identifySubreddit: Bool
if splitPath.count > 1 {
if Self.pseudoSubreddits.keys.contains(String(splitPath[1])) {
identifySubreddit = true
} else {
identifySubreddit = !urlComponents.path.hasPrefix("/r/")
}
} else {
identifySubreddit = true
}
fetch(api: api, parameters: [:], resultType: RedditLinkListing.self) { result in
switch result {

2
Shared/Article Rendering/shared.css
View File

@ -109,6 +109,8 @@ body > .systemMessage {
h1 {
line-height: 1.15em;
font-weight: bold;
padding-bottom: 0;
margin-bottom: 5px;
}
pre {