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

Add support for media embed support

This commit is contained in:
Maurice Parker 2020-05-04 19:57:35 -05:00
parent 7d1820483f
commit 2bb20832f8
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Frameworks/Account/Account.xcodeproj/project.pbxproj
View File

@ -49,6 +49,7 @@
5133BB4B2460BDF30001E3D0 /* RedditSubreddit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5133BB4A2460BDF30001E3D0 /* RedditSubreddit.swift */; };
5133BB4D2460CA0B0001E3D0 /* RedditMe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5133BB4C2460CA0B0001E3D0 /* RedditMe.swift */; };
5133BB4F2460EC230001E3D0 /* RedditMedia.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5133BB4E2460EC230001E3D0 /* RedditMedia.swift */; };
5133BB512460EE730001E3D0 /* RedditMediaEmbed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5133BB502460EE730001E3D0 /* RedditMediaEmbed.swift */; };
5139A6382459822D004D960C /* CloudKitArticleStatusUpdate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5139A6372459822D004D960C /* CloudKitArticleStatusUpdate.swift */; };
5144EA49227B497600D19003 /* FeedbinAPICaller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5144EA48227B497600D19003 /* FeedbinAPICaller.swift */; };
5144EA4E227B829A00D19003 /* FeedbinAccountDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5144EA4D227B829A00D19003 /* FeedbinAccountDelegate.swift */; };
@ -309,6 +310,7 @@
5133BB4A2460BDF30001E3D0 /* RedditSubreddit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RedditSubreddit.swift; sourceTree = "<group>"; };
5133BB4C2460CA0B0001E3D0 /* RedditMe.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RedditMe.swift; sourceTree = "<group>"; };
5133BB4E2460EC230001E3D0 /* RedditMedia.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RedditMedia.swift; sourceTree = "<group>"; };
5133BB502460EE730001E3D0 /* RedditMediaEmbed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RedditMediaEmbed.swift; sourceTree = "<group>"; };
5139A6372459822D004D960C /* CloudKitArticleStatusUpdate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloudKitArticleStatusUpdate.swift; sourceTree = "<group>"; };
5144EA48227B497600D19003 /* FeedbinAPICaller.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbinAPICaller.swift; sourceTree = "<group>"; };
5144EA4D227B829A00D19003 /* FeedbinAccountDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbinAccountDelegate.swift; sourceTree = "<group>"; };
@ -645,6 +647,7 @@
5133BB46245FD8140001E3D0 /* RedditLinkListing.swift */,
5133BB4C2460CA0B0001E3D0 /* RedditMe.swift */,
5133BB4E2460EC230001E3D0 /* RedditMedia.swift */,
5133BB502460EE730001E3D0 /* RedditMediaEmbed.swift */,
5133BB4A2460BDF30001E3D0 /* RedditSubreddit.swift */,
);
path = Reddit;
@ -1260,6 +1263,7 @@
9E1D154F233371DD00F4944C /* FeedlyGetCollectionsOperation.swift in Sources */,
9EAEC626233318400085D7C9 /* FeedlyStream.swift in Sources */,
9E5DE60E23C3F4B70064DA30 /* FeedlyFetchIdsForMissingArticlesOperation.swift in Sources */,
5133BB512460EE730001E3D0 /* RedditMediaEmbed.swift in Sources */,
3B826DA92385C81C00FC1ADB /* FeedWranglerAPICaller.swift in Sources */,
9EAEC60C2332FE830085D7C9 /* FeedlyCollection.swift in Sources */,
51B36307244B6234000DEF2A /* TwitterHashtag.swift in Sources */,

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

@ -32,6 +32,7 @@ struct RedditLinkData: Codable {
let created: Double?
let isVideo: Bool?
let media: RedditMedia?
let mediaEmbed: RedditMediaEmbed?
enum CodingKeys: String, CodingKey {
case title = "title"
@ -44,6 +45,7 @@ struct RedditLinkData: Codable {
case created = "created_utc"
case isVideo = "is_video"
case media = "media"
case mediaEmbed = "media_embed"
}
var createdDate: Date? {
@ -65,6 +67,10 @@ struct RedditLinkData: Codable {
func renderURLAsHTML() -> String? {
guard let url = url else { return nil }
if let mediaEmbedContent = mediaEmbed?.content {
return mediaEmbedContent
}
if isVideo ?? false {
guard let fallbackURL = media?.video?.fallbackURL else {
return nil
@ -75,7 +81,6 @@ struct RedditLinkData: Codable {
guard url.hasSuffix(".jpg") || url.hasSuffix(".jpeg") || url.hasSuffix(".png") || url.hasSuffix(".gif") else {
return nil
}
return "<figure><img src=\"\(url)\"></figure>"
}

19
Frameworks/Account/FeedProvider/Reddit/RedditMediaEmbed.swift Normal file
View File

@ -0,0 +1,19 @@
//
// RedditMediaEmbed.swift
// Account
//
// Created by Maurice Parker on 5/4/20.
// Copyright © 2020 Ranchero Software, LLC. All rights reserved.
//
import Foundation
struct RedditMediaEmbed: Codable {
let content: String?
enum CodingKeys: String, CodingKey {
case content = "content"
}
}