Skip to content

Commit f46fc7e

Browse files
Rename “postsFromThoseFollowedByMe” to “homeTimeline”
This feed is well known as the “home timeline”, so this is a better name to replace the original “following”.
1 parent 9d80bc5 commit f46fc7e

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

Mastodon/In Progress New Layout and Datamodel/Timeline/TimelineFeedLoader.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public enum DiscoveryType: Equatable {
6565
}
6666

6767
public enum MastodonTimelineType: Equatable {
68-
case postsFromThoseFollowedByMe
68+
case homeTimeline
6969
case myBookmarks
7070
case myFavorites
7171
case myFollowedHashtags
@@ -83,7 +83,7 @@ public enum MastodonTimelineType: Equatable {
8383

8484
public static func == (lhs: MastodonTimelineType, rhs: MastodonTimelineType) -> Bool {
8585
switch (lhs, rhs) {
86-
case (.postsFromThoseFollowedByMe, .postsFromThoseFollowedByMe):
86+
case (.homeTimeline, .homeTimeline):
8787
return true
8888
case (.local, .local):
8989
return true
@@ -126,7 +126,7 @@ public enum MastodonTimelineType: Equatable {
126126

127127
public var canDisplayDonationBanner: Bool {
128128
switch self {
129-
case .postsFromThoseFollowedByMe:
129+
case .homeTimeline:
130130
return true
131131
default:
132132
return false
@@ -135,7 +135,7 @@ public enum MastodonTimelineType: Equatable {
135135

136136
public var filterContext: Mastodon.Entity.FilterContext? {
137137
switch self {
138-
case .postsFromThoseFollowedByMe:
138+
case .homeTimeline:
139139
.home
140140
case .hashtag:
141141
.public
@@ -303,7 +303,7 @@ final class TimelineFeedLoader: MastodonFeedLoader<TimelineItem, CacheableTimeli
303303
self.timeline = timeline
304304
authenticatedUser = currentUser
305305
myAccountID = authenticatedUser.cachedAccount?.id
306-
let trackLastRead = timeline == .postsFromThoseFollowedByMe
306+
let trackLastRead = timeline == .homeTimeline
307307
let cacheManager = TimelineCacheManager(currentUser: currentUser, trackLastRead: trackLastRead, useDiskCache: false)
308308

309309
super.init(cacheManager)
@@ -423,7 +423,7 @@ final class TimelineFeedLoader: MastodonFeedLoader<TimelineItem, CacheableTimeli
423423
let newBatch: [TimelineItem]
424424
let newBatchBottomLoad: BottomLoad
425425
switch timeline {
426-
case .postsFromThoseFollowedByMe:
426+
case .homeTimeline:
427427
let response = try await {
428428
if let loadUrl {
429429
return try await APIService.shared.statuses(fromUrl: loadUrl, authenticationBox: authenticatedUser)
@@ -434,7 +434,7 @@ final class TimelineFeedLoader: MastodonFeedLoader<TimelineItem, CacheableTimeli
434434
let result = response.value
435435
newBatch = result.map { timelineItem(fromStatus:$0) }
436436
newBatchBottomLoad = {
437-
if let url = response.link?.nextUrl, timeline == .postsFromThoseFollowedByMe {
437+
if let url = response.link?.nextUrl, timeline == .homeTimeline {
438438
return .link(url)
439439
} else {
440440
return .nothingMoreToLoad

Mastodon/In Progress New Layout and Datamodel/Timeline/TimelineListViewController.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class TimelineListViewController: UIHostingController<AnyView>
5252
self.type = type
5353
switch type {
5454
case .home:
55-
viewModel = TimelineListViewModel(timeline: .postsFromThoseFollowedByMe)
55+
viewModel = TimelineListViewModel(timeline: .homeTimeline)
5656
case .notifications(let scope):
5757
viewModel = TimelineListViewModel(timeline: .notifications(scope: scope))
5858
case .discover(let type):
@@ -244,7 +244,7 @@ extension TimelineListViewController {
244244
let showFollowingAction = UIAction(title: L10n.Scene.HomeTimeline.TimelineMenu.following, image: .init(systemName: "house")) { [weak self] _ in
245245
guard let self else { return }
246246

247-
viewModel.timeline = .postsFromThoseFollowedByMe
247+
viewModel.timeline = .homeTimeline
248248
self.timelineSelectorButton.setAttributedTitle(
249249
.init(string: L10n.Scene.HomeTimeline.TimelineMenu.following, attributes: [
250250
.font: UIFontMetrics(forTextStyle: .headline).scaledFont(for: .systemFont(ofSize: 20, weight: .semibold))
@@ -269,7 +269,7 @@ extension TimelineListViewController {
269269
}
270270

271271
switch viewModel.timeline {
272-
case .postsFromThoseFollowedByMe:
272+
case .homeTimeline:
273273
showLocalTimelineAction.state = .off
274274
showFollowingAction.state = .on
275275
case .local:
@@ -2656,7 +2656,7 @@ struct Snackbar: View {
26562656
extension MastodonTimelineType {
26572657
var canDisplayNewItemsSnackbar: Bool {
26582658
switch self {
2659-
case .postsFromThoseFollowedByMe:
2659+
case .homeTimeline:
26602660
true
26612661
default:
26622662
false

0 commit comments

Comments
 (0)