Skip to content

Commit 34108ce

Browse files
committed
my fix yesterday was completely pointless. sending different URL now.
1 parent 04fb6e6 commit 34108ce

File tree

4 files changed

+4
-46
lines changed

4 files changed

+4
-46
lines changed

RedditRealTime/RedditRealTime.xcodeproj/project.pbxproj

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
EA27FBD2219BDC9100B6CA50 /* HTMLStringDecodeExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA27FBD1219BDC9100B6CA50 /* HTMLStringDecodeExtension.swift */; };
1110
EA4E224E2187A0EE00269F54 /* RedditPostDownloadService.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA4E224D2187A0EE00269F54 /* RedditPostDownloadService.swift */; };
1211
EA4E22502187A37D00269F54 /* RedditPost.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA4E224F2187A37D00269F54 /* RedditPost.swift */; };
1312
EA4E22522187A7D200269F54 /* PostTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA4E22512187A7D200269F54 /* PostTableViewCell.swift */; };
@@ -46,7 +45,6 @@
4645
/* End PBXContainerItemProxy section */
4746

4847
/* Begin PBXFileReference section */
49-
EA27FBD1219BDC9100B6CA50 /* HTMLStringDecodeExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTMLStringDecodeExtension.swift; sourceTree = "<group>"; };
5048
EA4E224D2187A0EE00269F54 /* RedditPostDownloadService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RedditPostDownloadService.swift; sourceTree = "<group>"; };
5149
EA4E224F2187A37D00269F54 /* RedditPost.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RedditPost.swift; sourceTree = "<group>"; };
5250
EA4E22512187A7D200269F54 /* PostTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostTableViewCell.swift; sourceTree = "<group>"; };
@@ -98,21 +96,12 @@
9896
/* End PBXFrameworksBuildPhase section */
9997

10098
/* Begin PBXGroup section */
101-
EA27FBD3219BDCA000B6CA50 /* Extensions */ = {
102-
isa = PBXGroup;
103-
children = (
104-
EA27FBD1219BDC9100B6CA50 /* HTMLStringDecodeExtension.swift */,
105-
);
106-
path = Extensions;
107-
sourceTree = "<group>";
108-
};
10999
EA4791F92190D12E001413A4 /* Model Layer */ = {
110100
isa = PBXGroup;
111101
children = (
112102
EA4E224F2187A37D00269F54 /* RedditPost.swift */,
113103
EADE530D219A846000271D37 /* SubredditModel.swift */,
114104
EADE5309219A7F6F00271D37 /* MetaRedditModel.swift */,
115-
EA27FBD3219BDCA000B6CA50 /* Extensions */,
116105
);
117106
path = "Model Layer";
118107
sourceTree = "<group>";
@@ -361,7 +350,6 @@
361350
EA4E22502187A37D00269F54 /* RedditPost.swift in Sources */,
362351
EADE530E219A846000271D37 /* SubredditModel.swift in Sources */,
363352
EA4E224E2187A0EE00269F54 /* RedditPostDownloadService.swift in Sources */,
364-
EA27FBD2219BDC9100B6CA50 /* HTMLStringDecodeExtension.swift in Sources */,
365353
EADE5308219A78C400271D37 /* SubredditSuggestionsPopOverViewController.swift in Sources */,
366354
EADE530A219A7F6F00271D37 /* MetaRedditModel.swift in Sources */,
367355
EADE5310219A861400271D37 /* RedditSubredditDownloadService.swift in Sources */,

RedditRealTime/RedditRealTime/Model Layer/Extensions/HTMLStringDecodeExtension.swift

Lines changed: 0 additions & 30 deletions
This file was deleted.

RedditRealTime/RedditRealTime/Model Layer/MetaRedditModel.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ class MetaRedditModel {
1414
get { return UserDefaults.standard.string(forKey: "SubredditName")?.capitalized ?? "Politics" }
1515
set {
1616
UserDefaults.standard.set(newValue, forKey: "SubredditName")
17-
redditURL = "https://www.reddit.com/r/\(newValue)/rising.json?sort=new"
17+
redditURL = "https://www.reddit.com/r/\(newValue)/rising.json?sort=new&raw_json=1"
1818
}
1919
}
2020

2121
public var redditURL: String {
22-
get { return UserDefaults.standard.string(forKey: "RedditURL") ?? "https://www.reddit.com/r/politics/rising.json?sort=new" }
22+
get { return UserDefaults.standard.string(forKey: "RedditURL") ?? "https://www.reddit.com/r/politics/rising.json?sort=new&raw_json=1" }
2323
set { UserDefaults.standard.set(newValue, forKey: "RedditURL") }
2424
}
2525

2626
func resetRedditURL() {
27-
redditURL = "https://www.reddit.com/r/politics/rising.json?sort=new"
27+
redditURL = "https://www.reddit.com/r/politics/rising.json?sort=new&raw_json=1"
2828
subredditName = "Politics"
2929
}
3030

RedditRealTime/RedditRealTime/View Layer/View Controllers/RisingStoriesViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class RisingStoriesViewController: UIViewController, UITableViewDataSource, UITa
7878

7979
guard let cell = tableView.dequeueReusableCell(withIdentifier: "PostTableViewCell") as? PostTableViewCell else { return UITableViewCell() }
8080

81-
cell.title.text = redditPostFetcher.posts[indexPath.row].title.removeHTMLEntities()?.string
81+
cell.title.text = redditPostFetcher.posts[indexPath.row].title
8282
cell.upvotes.text = " \(redditPostFetcher.posts[indexPath.row].upvotes)"
8383
cell.comments.text = " \(redditPostFetcher.posts[indexPath.row].commentCount) Comments"
8484

0 commit comments

Comments
 (0)