FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Specify correct NNW user agent on Feed Provider requests

This commit is contained in:
Maurice Parker 2020-05-03 14:35:12 -05:00
parent 0344992cf4
commit 018597aeef
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@ import Foundation
import OAuthSwift
import Secrets
import RSParser
import RSWeb
public enum RedditFeedProviderError: LocalizedError {
case unknown
@ -26,6 +27,7 @@ public struct RedditFeedProvider: FeedProvider {
private static let server = "www.reddit.com"
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"]
@ -177,7 +179,7 @@ private extension RedditFeedProvider {
return
}
client.request(Self.apiBase + "/api/v1/me", method: .GET) { result in
client.request(Self.apiBase + "/api/v1/me", method: .GET, headers: Self.userAgentHeaders) { result in
switch result {
case .success(let response):
if let redditUser = try? JSONDecoder().decode(RedditUser.self, from: response.data), let username = redditUser.name {

6
Frameworks/Account/FeedProvider/Twitter/TwitterFeedProvider.swift
View File

@ -10,6 +10,7 @@ import Foundation
import Secrets
import OAuthSwift
import RSParser
import RSWeb
public enum TwitterFeedProviderError: LocalizedError {
case screenNameNotFound
@ -36,6 +37,7 @@ public struct TwitterFeedProvider: FeedProvider {
private static let server = "api.twitter.com"
private static let apiBase = "https://api.twitter.com/1.1/"
private static let userAgentHeaders = UserAgent.headers() as! [String: String]
private static let dateFormat = "EEE MMM dd HH:mm:ss Z yyyy"
private static let userPaths = ["/home", "/notifications"]
@ -306,7 +308,7 @@ private extension TwitterFeedProvider {
let url = "\(Self.apiBase)users/show.json"
let parameters = ["screen_name": screenName]
client.get(url, parameters: parameters) { result in
client.get(url, parameters: parameters, headers: Self.userAgentHeaders) { result in
switch result {
case .success(let response):
let decoder = JSONDecoder()
@ -327,7 +329,7 @@ private extension TwitterFeedProvider {
var expandedParameters = parameters
expandedParameters["tweet_mode"] = "extended"
client.get(url, parameters: expandedParameters) { result in
client.get(url, parameters: expandedParameters, headers: Self.userAgentHeaders) { result in
switch result {
case .success(let response):