oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'charlesmchen/linkPreviewsCleanup'

Browse source
This commit is contained in:
Matthew Chen 2019-01-24 17:28:26 -05:00
commit cf4c83341f
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift
View file

@ -137,7 +137,7 @@ public class OWSLinkPreview: MTLModel {
Logger.error("Discarding link preview; message has attachments.")
throw LinkPreviewError.invalidInput
}
let urlString = stripPossibleLinkUrl(previewProto.url)
let urlString = previewProto.url
guard URL(string: urlString) != nil else {
Logger.error("Could not parse preview URL.")
@ -289,7 +289,6 @@ public class OWSLinkPreview: MTLModel {
// MARK: - Domain Whitelist
// TODO: Finalize
private static let linkDomainWhitelist = [
"youtube.com",
"reddit.com",
@ -299,7 +298,6 @@ public class OWSLinkPreview: MTLModel {
"youtu.be"
]
// TODO: Finalize
private static let mediaDomainWhitelist = [
"ytimg.com",
"cdninstagram.com",
@ -333,16 +331,6 @@ public class OWSLinkPreview: MTLModel {
return result
}
private class func stripPossibleLinkUrl(_ urlString: String) -> String {
var result = urlString.ows_stripped()
let suffixToStrip = ","
while result.hasSuffix(suffixToStrip) {
let endIndex = result.index(result.endIndex, offsetBy: -suffixToStrip.count)
result = String(result[..<endIndex]).ows_stripped()
}
return result
}
@objc
public class func isValidLinkUrl(_ urlString: String) -> Bool {
guard let url = URL(string: urlString) else {