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

Remove pinned frame url #464

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −105
Open

Remove pinned frame url #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 0 additions & 12 deletions Sources/XMTPiOS/Conversations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,6 @@ public actor Conversations {
name: String = "",
imageUrlSquare: String = "",
description: String = "",
pinnedFrameUrl: String = "",
messageDisappearingSettings: FfiMessageDisappearingSettings? = nil,
messageExpirationMs: Int64? = nil
) async throws -> Group {
Expand All @@ -290,7 +289,6 @@ public actor Conversations {
name: name,
imageUrlSquare: imageUrlSquare,
description: description,
pinnedFrameUrl: pinnedFrameUrl,
permissionPolicySet: nil,
messageDisappearingSettings: messageDisappearingSettings
)
Expand All @@ -302,7 +300,6 @@ public actor Conversations {
name: String = "",
imageUrlSquare: String = "",
description: String = "",
pinnedFrameUrl: String = "",
messageDisappearingSettings: FfiMessageDisappearingSettings? = nil
) async throws -> Group {
return try await newGroupInternal(
Expand All @@ -311,7 +308,6 @@ public actor Conversations {
name: name,
imageUrlSquare: imageUrlSquare,
description: description,
pinnedFrameUrl: pinnedFrameUrl,
permissionPolicySet: PermissionPolicySet.toFfiPermissionPolicySet(
permissionPolicySet),
messageDisappearingSettings: messageDisappearingSettings
Expand All @@ -324,7 +320,6 @@ public actor Conversations {
name: String = "",
imageUrlSquare: String = "",
description: String = "",
pinnedFrameUrl: String = "",
permissionPolicySet: FfiPermissionPolicySet? = nil,
messageDisappearingSettings: FfiMessageDisappearingSettings? = nil
) async throws -> Group {
Expand All @@ -350,7 +345,6 @@ public actor Conversations {
groupName: name,
groupImageUrlSquare: imageUrlSquare,
groupDescription: description,
groupPinnedFrameUrl: pinnedFrameUrl,
customPermissionPolicySet: permissionPolicySet,
messageDisappearingSettings: messageDisappearingSettings
)
Expand All @@ -364,7 +358,6 @@ public actor Conversations {
name: String = "",
imageUrlSquare: String = "",
description: String = "",
pinnedFrameUrl: String = "",
messageDisappearingSettings: FfiMessageDisappearingSettings? = nil
) async throws -> Group {
return try await newGroupInternalWithInboxIds(
Expand All @@ -375,7 +368,6 @@ public actor Conversations {
name: name,
imageUrlSquare: imageUrlSquare,
description: description,
pinnedFrameUrl: pinnedFrameUrl,
permissionPolicySet: nil,
messageDisappearingSettings: messageDisappearingSettings
)
Expand All @@ -387,7 +379,6 @@ public actor Conversations {
name: String = "",
imageUrlSquare: String = "",
description: String = "",
pinnedFrameUrl: String = "",
messageDisappearingSettings: FfiMessageDisappearingSettings? = nil
) async throws -> Group {
return try await newGroupInternalWithInboxIds(
Expand All @@ -396,7 +387,6 @@ public actor Conversations {
name: name,
imageUrlSquare: imageUrlSquare,
description: description,
pinnedFrameUrl: pinnedFrameUrl,
permissionPolicySet: PermissionPolicySet.toFfiPermissionPolicySet(
permissionPolicySet),
messageDisappearingSettings: messageDisappearingSettings
Expand All @@ -409,7 +399,6 @@ public actor Conversations {
name: String = "",
imageUrlSquare: String = "",
description: String = "",
pinnedFrameUrl: String = "",
permissionPolicySet: FfiPermissionPolicySet? = nil,
messageDisappearingSettings: FfiMessageDisappearingSettings? = nil
) async throws -> Group {
Expand All @@ -425,7 +414,6 @@ public actor Conversations {
groupName: name,
groupImageUrlSquare: imageUrlSquare,
groupDescription: description,
groupPinnedFrameUrl: pinnedFrameUrl,
customPermissionPolicySet: permissionPolicySet,
messageDisappearingSettings: messageDisappearingSettings
)
Expand Down
21 changes: 0 additions & 21 deletions Sources/XMTPiOS/Group.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,6 @@ public struct Group: Identifiable, Equatable, Hashable {
return try ffiGroup.groupDescription()
}

public func groupPinnedFrameUrl() throws -> String {
return try ffiGroup.groupPinnedFrameUrl()
}

public func updateGroupName(groupName: String) async throws {
try await ffiGroup.updateGroupName(groupName: groupName)
}
Expand All @@ -176,13 +172,6 @@ public struct Group: Identifiable, Equatable, Hashable {
groupDescription: groupDescription)
}

public func updateGroupPinnedFrameUrl(groupPinnedFrameUrl: String)
async throws
{
try await ffiGroup.updateGroupPinnedFrameUrl(
pinnedFrameUrl: groupPinnedFrameUrl)
}

public func updateAddMemberPermission(newPermissionOption: PermissionOption)
async throws
{
Expand Down Expand Up @@ -249,16 +238,6 @@ public struct Group: Identifiable, Equatable, Hashable {
metadataField: FfiMetadataField.imageUrlSquare)
}

public func updateGroupPinnedFrameUrlPermission(
newPermissionOption: PermissionOption
) async throws {
try await ffiGroup.updatePermissionPolicy(
permissionUpdateType: FfiPermissionUpdateType.updateMetadata,
permissionPolicyOption: PermissionOption.toFfiPermissionPolicy(
option: newPermissionOption),
metadataField: FfiMetadataField.pinnedFrameUrl)
}

public func updateConsentState(state: ConsentState) async throws {
try ffiGroup.updateConsentState(state: state.toFFI)
}
Expand Down
10 changes: 0 additions & 10 deletions Sources/XMTPiOS/Libxmtp/PermissionPolicySet.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ public class PermissionPolicySet {
public var updateGroupNamePolicy: PermissionOption
public var updateGroupDescriptionPolicy: PermissionOption
public var updateGroupImagePolicy: PermissionOption
public var updateGroupPinnedFrameUrlPolicy: PermissionOption
public var updateMessageDisappearingPolicy: PermissionOption

public init(
Expand All @@ -76,7 +75,6 @@ public class PermissionPolicySet {
updateGroupNamePolicy: PermissionOption,
updateGroupDescriptionPolicy: PermissionOption,
updateGroupImagePolicy: PermissionOption,
updateGroupPinnedFrameUrlPolicy: PermissionOption,
updateMessageDisappearingPolicy: PermissionOption
) {
self.addMemberPolicy = addMemberPolicy
Expand All @@ -86,7 +84,6 @@ public class PermissionPolicySet {
self.updateGroupNamePolicy = updateGroupNamePolicy
self.updateGroupDescriptionPolicy = updateGroupDescriptionPolicy
self.updateGroupImagePolicy = updateGroupImagePolicy
self.updateGroupPinnedFrameUrlPolicy = updateGroupPinnedFrameUrlPolicy
self.updateMessageDisappearingPolicy = updateMessageDisappearingPolicy
}

Expand All @@ -110,9 +107,6 @@ public class PermissionPolicySet {
updateGroupImageUrlSquarePolicy:
PermissionOption.toFfiPermissionPolicy(
option: permissionPolicySet.updateGroupImagePolicy),
updateGroupPinnedFrameUrlPolicy:
PermissionOption.toFfiPermissionPolicy(
option: permissionPolicySet.updateGroupPinnedFrameUrlPolicy),
updateMessageDisappearingPolicy:
PermissionOption.toFfiPermissionPolicy(
option: permissionPolicySet.updateMessageDisappearingPolicy)
Expand Down Expand Up @@ -141,10 +135,6 @@ public class PermissionPolicySet {
updateGroupImagePolicy: PermissionOption.fromFfiPermissionPolicy(
ffiPolicy: ffiPermissionPolicySet
.updateGroupImageUrlSquarePolicy),
updateGroupPinnedFrameUrlPolicy:
PermissionOption.fromFfiPermissionPolicy(
ffiPolicy: ffiPermissionPolicySet
.updateGroupPinnedFrameUrlPolicy),
updateMessageDisappearingPolicy:
PermissionOption.fromFfiPermissionPolicy(
ffiPolicy: ffiPermissionPolicySet
Expand Down
62 changes: 3 additions & 59 deletions Tests/XMTPTests/GroupPermissionsTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,50 +305,6 @@ class GroupPermissionTests: XCTestCase {
try alixGroup.groupDescription(), "alix group description")
}

func testCanUpdatePinnedFrameUrl() async throws {
let fixtures = try await fixtures()
let boGroup = try await fixtures.boClient.conversations.newGroup(
with: [fixtures.alix.address, fixtures.caro.address],
permissions: .adminOnly,
pinnedFrameUrl: "initial url"
)
try await fixtures.alixClient.conversations.sync()
let alixGroup = try await fixtures.alixClient.conversations
.listGroups().first!

// Verify that alix cannot update group pinned frame url
XCTAssertEqual(try boGroup.groupPinnedFrameUrl(), "initial url")
await assertThrowsAsyncError(
try await alixGroup.updateGroupPinnedFrameUrl(
groupPinnedFrameUrl: "https://foo/bar.com")
)

try await alixGroup.sync()
try await boGroup.sync()
XCTAssertEqual(
try boGroup.permissionPolicySet().updateGroupPinnedFrameUrlPolicy,
.admin)

// Update group pinned frame url permissions so alix can update
try await boGroup.updateGroupPinnedFrameUrlPermission(
newPermissionOption: .allow)
try await boGroup.sync()
try await alixGroup.sync()
XCTAssertEqual(
try boGroup.permissionPolicySet().updateGroupPinnedFrameUrlPolicy,
.allow)

// Verify that alix can now update group pinned frame url
try await alixGroup.updateGroupPinnedFrameUrl(
groupPinnedFrameUrl: "https://foo/barz.com")
try await alixGroup.sync()
try await boGroup.sync()
XCTAssertEqual(
try boGroup.groupPinnedFrameUrl(), "https://foo/barz.com")
XCTAssertEqual(
try alixGroup.groupPinnedFrameUrl(), "https://foo/barz.com")
}

func testCanCreateGroupWithCustomPermissions() async throws {
let fixtures = try await fixtures()
let permissionPolicySet = PermissionPolicySet(
Expand All @@ -359,14 +315,12 @@ class GroupPermissionTests: XCTestCase {
updateGroupNamePolicy: PermissionOption.admin,
updateGroupDescriptionPolicy: PermissionOption.allow,
updateGroupImagePolicy: PermissionOption.admin,
updateGroupPinnedFrameUrlPolicy: PermissionOption.deny,
updateMessageDisappearingPolicy: PermissionOption.allow
)
_ = try await fixtures.boClient.conversations
.newGroupCustomPermissions(
with: [fixtures.alix.address, fixtures.caro.address],
permissionPolicySet: permissionPolicySet,
pinnedFrameUrl: "initial url"
permissionPolicySet: permissionPolicySet
)

try await fixtures.alixClient.conversations.sync()
Expand All @@ -387,9 +341,6 @@ class GroupPermissionTests: XCTestCase {
== PermissionOption.allow)
XCTAssert(
alixPermissionSet.updateGroupImagePolicy == PermissionOption.admin)
XCTAssert(
alixPermissionSet.updateGroupPinnedFrameUrlPolicy
== PermissionOption.deny)
}

func testCanCreateGroupWithInboxIdCustomPermissions() async throws {
Expand All @@ -402,14 +353,12 @@ class GroupPermissionTests: XCTestCase {
updateGroupNamePolicy: PermissionOption.admin,
updateGroupDescriptionPolicy: PermissionOption.allow,
updateGroupImagePolicy: PermissionOption.admin,
updateGroupPinnedFrameUrlPolicy: PermissionOption.deny,
updateMessageDisappearingPolicy: PermissionOption.allow
)
_ = try await fixtures.boClient.conversations
.newGroupCustomPermissionsWithInboxIds(
with: [fixtures.alixClient.inboxID, fixtures.caroClient.inboxID],
permissionPolicySet: permissionPolicySet,
pinnedFrameUrl: "initial url"
permissionPolicySet: permissionPolicySet
)

try await fixtures.alixClient.conversations.sync()
Expand All @@ -430,9 +379,6 @@ class GroupPermissionTests: XCTestCase {
== PermissionOption.allow)
XCTAssert(
alixPermissionSet.updateGroupImagePolicy == PermissionOption.admin)
XCTAssert(
alixPermissionSet.updateGroupPinnedFrameUrlPolicy
== PermissionOption.deny)
}

func testCreateGroupWithInvalidPermissionsFails() async throws {
Expand All @@ -446,15 +392,13 @@ class GroupPermissionTests: XCTestCase {
updateGroupNamePolicy: PermissionOption.admin,
updateGroupDescriptionPolicy: PermissionOption.allow,
updateGroupImagePolicy: PermissionOption.admin,
updateGroupPinnedFrameUrlPolicy: PermissionOption.deny,
updateMessageDisappearingPolicy: PermissionOption.allow
)
await assertThrowsAsyncError(
try await fixtures.boClient.conversations
.newGroupCustomPermissions(
with: [fixtures.alix.address, fixtures.caro.address],
permissionPolicySet: permissionPolicySetInvalid,
pinnedFrameUrl: "initial url"
permissionPolicySet: permissionPolicySetInvalid
)
)
}
Expand Down
2 changes: 1 addition & 1 deletion XMTP.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = "XMTP"
spec.version = "3.0.26"
spec.version = "3.0.27"

spec.summary = "XMTP SDK Cocoapod"

Expand Down
4 changes: 2 additions & 2 deletions ...xample/XMTPiOSExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/xmtp/libxmtp-swift.git",
"state" : {
"revision" : "6b0166d5e9680905cee1ca141854de30e1c28317",
"version" : "3.0.20"
"revision" : "c9d3bdff9ead5d70a803d290de4eb75c9e9fc4f2",
"version" : "3.0.21"
}
},
{
Expand Down
Loading