Skip to content

Handle canSendPoll capability when creating polls #798

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.

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

Merged
merged 2 commits into from
Apr 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

### ✅ Added
- Allow pasting images to the composer [#797](https://github.com/GetStream/stream-chat-swiftui/pull/797)
### 🐞 Fixed
- Fix allowing to send Polls when the current user does not have the capability [#798](https://github.com/GetStream/stream-chat-swiftui/pull/798)

# [4.76.0](https://github.com/GetStream/stream-chat-swiftui/releases/tag/4.76.0)
_March 31, 2025_
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public struct AttachmentSourcePickerView: View {
)
.accessibilityIdentifier("attachmentPickerCamera")

if viewModel.channelController.channel?.config.pollsEnabled == true && viewModel.messageController == nil {
if viewModel.canSendPoll {
AttachmentPickerButton(
icon: images.attachmentPickerPolls,
pickerType: .polls,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,13 @@ open class MessageComposerViewModel: ObservableObject {
public var quotedMessage: Binding<ChatMessage?>?
public var waveformTargetSamples: Int = 100
public internal(set) var pendingAudioRecording: AddedVoiceRecording?


public var canSendPoll: Bool {
channelController.channel?.config.pollsEnabled == true
&& channelController.channel?.canSendPoll == true
&& messageController == nil
}

internal lazy var audioRecorder: AudioRecording = {
let audioRecorder = utils.audioRecorder
audioRecorder.subscribe(self)
Expand Down
4 changes: 2 additions & 2 deletions StreamChatSwiftUI.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3879,8 +3879,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/GetStream/stream-chat-swift.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 4.76.0;
branch = develop;
kind = branch;
};
};
E3A1C01A282BAC66002D1E26 /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,92 @@ class MessageComposerViewModel_Tests: StreamChatTestCase {
// Then
XCTAssert(viewModel.mentionedUsers.isEmpty)
}


func test_messageComposerVM_canSendPoll() {
// Given
let channelController = makeChannelController()
let viewModel = MessageComposerViewModel(
channelController: channelController,
messageController: nil
)

// When
let channelConfig = ChannelConfig(pollsEnabled: true)
channelController.channel_mock = .mock(
cid: .unique,
config: channelConfig,
ownCapabilities: [.sendPoll]
)

// Then
XCTAssertTrue(viewModel.canSendPoll)
}

func test_messageComposerVM_canSendPoll_whenDoesNotHaveCapability() {
// Given
let channelController = makeChannelController()
let viewModel = MessageComposerViewModel(
channelController: channelController,
messageController: nil
)

// When
let channelConfig = ChannelConfig(pollsEnabled: true)
channelController.channel_mock = .mock(
cid: .unique,
config: channelConfig,
ownCapabilities: [.banChannelMembers]
)

// Then
XCTAssertFalse(viewModel.canSendPoll)
}

func test_messageComposerVM_canSendPoll_whenNotEnabled() {
// Given
let channelController = makeChannelController()
let viewModel = MessageComposerViewModel(
channelController: channelController,
messageController: nil
)

// When
let channelConfig = ChannelConfig(pollsEnabled: false)
channelController.channel_mock = .mock(
cid: .unique,
config: channelConfig,
ownCapabilities: [.sendPoll]
)

// Then
XCTAssertFalse(viewModel.canSendPoll)
}

func test_messageComposerVM_canSendPoll_whenInsideThread() {
// Given
let channelController = makeChannelController()
let messageController = ChatMessageControllerSUI_Mock.mock(
chatClient: chatClient,
cid: .unique,
messageId: .unique
)
let viewModel = MessageComposerViewModel(
channelController: channelController,
messageController: messageController
)

// When
let channelConfig = ChannelConfig(pollsEnabled: true)
channelController.channel_mock = .mock(
cid: .unique,
config: channelConfig,
ownCapabilities: [.sendPoll]
)

// Then
XCTAssertFalse(viewModel.canSendPoll)
}

func test_addedAsset_extraData() {
// Given
let image = UIImage(systemName: "person")!
Expand Down
Loading