Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hide downvote button if disabled on instance #1476

Merged
merged 3 commits into from
Dec 4, 2024
Merged

Hide downvote button if disabled on instance #1476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a8062b
Hide downvote button if disabled on instance
Sjmarf Dec 3, 2024
273013f
Implement requested changes
Sjmarf Dec 4, 2024
f505f3a
Merge branch 'dev' into sjmarf/hide-downvotes
Sjmarf Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Mlem/App/Utility/Extensions/ApiClient+Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,8 @@ extension ApiClient {
}

var canInteract: Bool { isActive && token != nil }

var downvotesEnabled: Bool {
myInstance?.downvotesEnabled ?? true
}
}
18 changes: 10 additions & 8 deletions Mlem/App/Utility/Extensions/Content Models/Comment1Providing+Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ extension Comment1Providing {
leadingActions: {
if api.canInteract {
upvoteAction(feedback: [.haptic])
downvoteAction(feedback: [.haptic])
if api.downvotesEnabled {
downvoteAction(feedback: [.haptic])
}
}
},
trailingActions: {
Expand Down Expand Up @@ -111,10 +113,10 @@ extension Comment1Providing {
type: CommentBarConfiguration.ActionType,
commentTreeTracker: CommentTreeTracker? = nil,
communityContext: (any CommunityStubProviding)? = nil
) -> any Action {
) -> (any Action)? {
switch type {
case .upvote: upvoteAction(feedback: [.haptic])
case .downvote: downvoteAction(feedback: [.haptic])
case .downvote: api.downvotesEnabled ? downvoteAction(feedback: [.haptic]) : nil
case .save: saveAction(feedback: [.haptic])
case .reply: replyAction(commentTreeTracker: commentTreeTracker)
case .share: shareAction()
Expand All @@ -127,21 +129,21 @@ extension Comment1Providing {
func counter(
type: CommentBarConfiguration.CounterType,
commentTreeTracker: CommentTreeTracker? = nil
) -> Counter {
) -> Counter? {
switch type {
case .score: scoreCounter
case .upvote: upvoteCounter
case .downvote: downvoteCounter
case .downvote: api.downvotesEnabled ? downvoteCounter : nil
case .reply: replyCounter(commentTreeTracker: commentTreeTracker)
}
}

func readout(type: CommentBarConfiguration.ReadoutType) -> Readout {
func readout(type: CommentBarConfiguration.ReadoutType) -> Readout? {
switch type {
case .created: createdReadout
case .score: scoreReadout
case .score: api.downvotesEnabled ? scoreReadout : upvoteReadout
case .upvote: upvoteReadout
case .downvote: downvoteReadout
case .downvote: api.downvotesEnabled ? downvoteReadout : nil
case .comment: commentReadout
}
}
Expand Down
7 changes: 4 additions & 3 deletions Mlem/App/Utility/Extensions/Content Models/Interactable1Providing+Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ extension Interactable1Providing {
.init(
value: self2?.votes.total,
leadingAction: upvoteAction(feedback: [.haptic]),
trailingAction: downvoteAction(feedback: [.haptic])
trailingAction: api.downvotesEnabled ? downvoteAction(feedback: [.haptic]) : nil
)
}

Expand All @@ -140,10 +140,11 @@ extension Interactable1Providing {
}

func downvoteAction(feedback: Set<FeedbackType> = []) -> BasicAction {
.init(
let enabled = api.canInteract && api.downvotesEnabled
return .init(
id: "downvote\(uid)",
appearance: .downvote(isOn: self2?.votes.myVote ?? .none == .downvote),
callback: api.canInteract ? { self.self2?.toggleDownvoted(feedback: feedback) } : nil
callback: enabled ? { self.self2?.toggleDownvoted(feedback: feedback) } : nil
)
}

Expand Down
18 changes: 10 additions & 8 deletions Mlem/App/Utility/Extensions/Content Models/Post1Providing+Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,9 @@ extension Post1Providing {
leadingActions: {
if api.canInteract {
upvoteAction(feedback: [.haptic])
downvoteAction(feedback: [.haptic])
if api.downvotesEnabled {
downvoteAction(feedback: [.haptic])
}
}
},
trailingActions: {
Expand Down Expand Up @@ -198,10 +200,10 @@ extension Post1Providing {
feedback: Set<FeedbackType> = [.haptic, .toast],
commentTreeTracker: CommentTreeTracker? = nil,
communityContext: (any CommunityStubProviding)? = nil
) -> any Action {
) -> (any Action)? {
switch type {
case .upvote: upvoteAction(feedback: feedback)
case .downvote: downvoteAction(feedback: feedback)
case .downvote: api.downvotesEnabled ? downvoteAction(feedback: feedback) : nil
case .save: saveAction(feedback: feedback)
case .reply: replyAction(commentTreeTracker: commentTreeTracker)
case .share: shareAction()
Expand All @@ -222,21 +224,21 @@ extension Post1Providing {
func counter(
type: PostBarConfiguration.CounterType,
commentTreeTracker: CommentTreeTracker? = nil
) -> Counter {
) -> Counter? {
switch type {
case .score: scoreCounter
case .upvote: upvoteCounter
case .downvote: downvoteCounter
case .downvote: api.downvotesEnabled ? downvoteCounter : nil
case .reply: replyCounter(commentTreeTracker: commentTreeTracker)
}
}

func readout(type: PostBarConfiguration.ReadoutType) -> Readout {
func readout(type: PostBarConfiguration.ReadoutType) -> Readout? {
switch type {
case .created: createdReadout
case .score: scoreReadout
case .score: api.downvotesEnabled ? scoreReadout : upvoteReadout
case .upvote: upvoteReadout
case .downvote: downvoteReadout
case .downvote: api.downvotesEnabled ? downvoteReadout : nil
case .comment: commentReadout
case .saved: savedReadout
}
Expand Down
18 changes: 10 additions & 8 deletions Mlem/App/Utility/Extensions/Content Models/Reply1Providing+Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ extension Reply1Providing {
leadingActions: {
if api.canInteract {
upvoteAction(feedback: [.haptic])
downvoteAction(feedback: [.haptic])
if api.downvotesEnabled {
downvoteAction(feedback: [.haptic])
}
}
},
trailingActions: {
Expand Down Expand Up @@ -45,10 +47,10 @@ extension Reply1Providing {
}
}

func action(type: ReplyBarConfiguration.ActionType) -> any Action {
func action(type: ReplyBarConfiguration.ActionType) -> (any Action)? {
switch type {
case .upvote: upvoteAction(feedback: [.haptic])
case .downvote: downvoteAction(feedback: [.haptic])
case .downvote: api.downvotesEnabled ? downvoteAction(feedback: [.haptic]) : nil
case .save: saveAction(feedback: [.haptic])
case .reply: replyAction()
case .markRead: markReadAction(feedback: [.haptic])
Expand All @@ -57,21 +59,21 @@ extension Reply1Providing {
}
}

func counter(type: ReplyBarConfiguration.CounterType) -> Counter {
func counter(type: ReplyBarConfiguration.CounterType) -> Counter? {
switch type {
case .score: scoreCounter
case .upvote: upvoteCounter
case .downvote: downvoteCounter
case .downvote: api.downvotesEnabled ? downvoteCounter : nil
case .reply: replyCounter()
}
}

func readout(type: ReplyBarConfiguration.ReadoutType) -> Readout {
func readout(type: ReplyBarConfiguration.ReadoutType) -> Readout? {
switch type {
case .created: createdReadout
case .score: scoreReadout
case .score: api.downvotesEnabled ? scoreReadout : upvoteReadout
case .upvote: upvoteReadout
case .downvote: downvoteReadout
case .downvote: api.downvotesEnabled ? downvoteReadout : nil
case .comment: commentReadout
}
}
Expand Down
4 changes: 2 additions & 2 deletions Mlem/App/Views/Shared/InfoStackView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ extension InfoStackView {
}

init(comment: any Comment1Providing, readouts: [CommentBarConfiguration.ReadoutType], showColor: Bool) {
self.readouts = readouts.map { comment.readout(type: $0) }
self.readouts = readouts.compactMap { comment.readout(type: $0) }
self.showColor = showColor
}

init(reply: any Reply1Providing, readouts: [ReplyBarConfiguration.ReadoutType], showColor: Bool) {
self.readouts = readouts.map { reply.readout(type: $0) }
self.readouts = readouts.compactMap { reply.readout(type: $0) }
self.showColor = showColor
}
}
Expand Down
72 changes: 38 additions & 34 deletions Mlem/App/Views/Shared/InteractionBar/InteractionBarView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ struct InteractionBarView: View {
commentTreeTracker: commentTreeTracker,
communityContext: communityContext
)
self.readouts = configuration.readouts.map { post.readout(type: $0) }
self.readouts = configuration.readouts.compactMap { post.readout(type: $0) }
}

init(
Expand All @@ -55,13 +55,13 @@ struct InteractionBarView: View {
commentTreeTracker: commentTreeTracker,
communityContext: communityContext
)
self.readouts = configuration.readouts.map { comment.readout(type: $0) }
self.readouts = configuration.readouts.compactMap { comment.readout(type: $0) }
}

init(reply: any Reply1Providing, configuration: ReplyBarConfiguration) {
self.leading = .init(reply: reply, items: configuration.leading)
self.trailing = .init(reply: reply, items: configuration.trailing)
self.readouts = configuration.readouts.map { reply.readout(type: $0) }
self.readouts = configuration.readouts.compactMap { reply.readout(type: $0) }
}

var body: some View {
Expand Down Expand Up @@ -213,24 +213,22 @@ extension [EnrichedWidget] {
commentTreeTracker: CommentTreeTracker?,
communityContext: (any CommunityStubProviding)?
) {
self = items.map { item in
self = items.compactMap { item in
switch item {
case let .action(action):
return .action(
post.action(
type: action,
commentTreeTracker: commentTreeTracker,
communityContext: communityContext
)
)
if let action = post.action(
type: action,
commentTreeTracker: commentTreeTracker,
communityContext: communityContext
) {
return .action(action)
}
case let .counter(counter):
return .counter(
post.counter(
type: counter,
commentTreeTracker: commentTreeTracker
)
)
if let counter = post.counter(type: counter, commentTreeTracker: commentTreeTracker) {
return .counter(counter)
}
}
return nil
}
}

Expand All @@ -240,38 +238,44 @@ extension [EnrichedWidget] {
commentTreeTracker: CommentTreeTracker?,
communityContext: (any CommunityStubProviding)?
) {
self = items.map { item in
self = items.compactMap { item in
switch item {
case let .action(action):
return .action(
comment.action(
type: action,
commentTreeTracker: commentTreeTracker,
communityContext: communityContext
)
)
if let action = comment.action(
type: action,
commentTreeTracker: commentTreeTracker,
communityContext: communityContext
) {
return .action(action)
}
case let .counter(counter):
return .counter(
comment.counter(
type: counter,
commentTreeTracker: commentTreeTracker
)
)
if let counter = comment.counter(
type: counter,
commentTreeTracker: commentTreeTracker
) {
return .counter(counter)
}
}
return nil
}
}

init(
reply: any Reply1Providing,
items: [ReplyBarConfiguration.Item]
) {
self = items.map { item in
self = items.compactMap { item in
switch item {
case let .action(action):
return .action(reply.action(type: action))
if let action = reply.action(type: action) {
return .action(action)
}
case let .counter(counter):
return .counter(reply.counter(type: counter))
if let counter = reply.counter(type: counter) {
return .counter(counter)
}
}
return nil
}
}
}
Loading