Update for pending RSCore String updates

This commit is contained in:
Nate Weaver
2020-01-16 20:09:18 -06:00
parent 3c1668c178
commit b35215d03b
24 changed files with 60 additions and 55 deletions

View File

@@ -37,9 +37,9 @@ struct PasteboardWebFeed: Hashable {
let isLocalFeed: Bool
init(url: String, webFeedID: String?, homePageURL: String?, name: String?, editedName: String?, accountID: String?, accountType: AccountType?) {
self.url = url.rs_normalizedURL()
self.url = url.normalizedURL
self.webFeedID = webFeedID
self.homePageURL = homePageURL?.rs_normalizedURL()
self.homePageURL = homePageURL?.normalizedURL
self.name = name
self.editedName = editedName
self.accountID = accountID
@@ -93,7 +93,7 @@ struct PasteboardWebFeed: Hashable {
}
if let foundType = pasteboardType {
if let possibleURLString = pasteboardItem.string(forType: foundType) {
if possibleURLString.rs_stringMayBeURL() {
if possibleURLString.mayBeURL {
self.init(url: possibleURLString, webFeedID: nil, homePageURL: nil, name: nil, editedName: nil, accountID: nil, accountType: nil)
return
}