Skip to content

Commit 7520037

Browse files
nplasterernplasterer
committed
remove pinned frame url from all the places
1 parent 6c593b3 commit 7520037

13 files changed

Lines changed: 9 additions & 257 deletions

File tree

‎android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,6 @@ class XMTPModule : Module() {
796796
createGroupParams.groupName,
797797
createGroupParams.groupImageUrlSquare,
798798
createGroupParams.groupDescription,
799-
createGroupParams.groupPinnedFrameUrl
800799
)
801800
GroupWrapper.encode(client, group)
802801
}
@@ -818,7 +817,6 @@ class XMTPModule : Module() {
818817
createGroupParams.groupName,
819818
createGroupParams.groupImageUrlSquare,
820819
createGroupParams.groupDescription,
821-
createGroupParams.groupPinnedFrameUrl
822820
)
823821
GroupWrapper.encode(client, group)
824822
}
@@ -840,7 +838,6 @@ class XMTPModule : Module() {
840838
createGroupParams.groupName,
841839
createGroupParams.groupImageUrlSquare,
842840
createGroupParams.groupDescription,
843-
createGroupParams.groupPinnedFrameUrl
844841
)
845842
GroupWrapper.encode(client, group)
846843
}
@@ -862,7 +859,6 @@ class XMTPModule : Module() {
862859
createGroupParams.groupName,
863860
createGroupParams.groupImageUrlSquare,
864861
createGroupParams.groupDescription,
865-
createGroupParams.groupPinnedFrameUrl
866862
)
867863
GroupWrapper.encode(client, group)
868864
}
@@ -1028,26 +1024,6 @@ class XMTPModule : Module() {
10281024
}
10291025
}
10301026

1031-
AsyncFunction("groupPinnedFrameUrl") Coroutine { installationId: String, groupId: String ->
1032-
withContext(Dispatchers.IO) {
1033-
logV("groupPinnedFrameUrl")
1034-
val client = clients[installationId] ?: throw XMTPException("No client")
1035-
val group = client.findGroup(groupId)
1036-
?: throw XMTPException("no group found for $groupId")
1037-
group.pinnedFrameUrl
1038-
}
1039-
}
1040-
1041-
AsyncFunction("updateGroupPinnedFrameUrl") Coroutine { installationId: String, groupId: String, pinnedFrameUrl: String ->
1042-
withContext(Dispatchers.IO) {
1043-
logV("updateGroupPinnedFrameUrl")
1044-
val client = clients[installationId] ?: throw XMTPException("No client")
1045-
val group = client.findGroup(groupId)
1046-
?: throw XMTPException("no group found for $groupId")
1047-
group.updateGroupPinnedFrameUrl(pinnedFrameUrl)
1048-
}
1049-
}
1050-
10511027
AsyncFunction("isGroupActive") Coroutine { installationId: String, groupId: String ->
10521028
withContext(Dispatchers.IO) {
10531029
logV("isGroupActive")
@@ -1228,16 +1204,6 @@ class XMTPModule : Module() {
12281204
}
12291205
}
12301206

1231-
AsyncFunction("updateGroupPinnedFrameUrlPermission") Coroutine { clientInstallationId: String, groupId: String, newPermission: String ->
1232-
withContext(Dispatchers.IO) {
1233-
logV("updateGroupPinnedFrameUrlPermission")
1234-
val client = clients[clientInstallationId] ?: throw XMTPException("No client")
1235-
val group = client.findGroup(groupId)
1236-
?: throw XMTPException("no group found for $groupId")
1237-
group.updateGroupPinnedFrameUrlPermission(getPermissionOption(newPermission))
1238-
}
1239-
}
1240-
12411207
AsyncFunction("permissionPolicySet") Coroutine { installationId: String, groupId: String ->
12421208
withContext(Dispatchers.IO) {
12431209
logV("groupImageUrlSquare")

‎android/src/main/java/expo/modules/xmtpreactnativesdk/wrappers/CreateGroupParamsWrapper.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ class CreateGroupParamsWrapper(
66
val groupName: String,
77
val groupImageUrlSquare: String,
88
val groupDescription: String,
9-
val groupPinnedFrameUrl: String,
109
) {
1110
companion object {
1211
fun createGroupParamsFromJson(authParams: String): CreateGroupParamsWrapper {
@@ -15,7 +14,6 @@ class CreateGroupParamsWrapper(
1514
if (jsonOptions.has("name")) jsonOptions.get("name").asString else "",
1615
if (jsonOptions.has("imageUrlSquare")) jsonOptions.get("imageUrlSquare").asString else "",
1716
if (jsonOptions.has("description")) jsonOptions.get("description").asString else "",
18-
if (jsonOptions.has("pinnedFrameUrl")) jsonOptions.get("pinnedFrameUrl").asString else "",
1917
)
2018
}
2119
}

‎android/src/main/java/expo/modules/xmtpreactnativesdk/wrappers/PermissionPolicySetWrapper.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ class PermissionPolicySetWrapper {
3636
"updateGroupNamePolicy" to fromPermissionOption(policySet.updateGroupNamePolicy),
3737
"updateGroupDescriptionPolicy" to fromPermissionOption(policySet.updateGroupDescriptionPolicy),
3838
"updateGroupImagePolicy" to fromPermissionOption(policySet.updateGroupImagePolicy),
39-
"updateGroupPinnedFrameUrlPolicy" to fromPermissionOption(policySet.updateGroupPinnedFrameUrlPolicy),
4039
"updateMessageExpirationPolicy" to fromPermissionOption(policySet.updateMessageExpirationPolicy),
4140
)
4241
}
@@ -51,7 +50,6 @@ class PermissionPolicySetWrapper {
5150
updateGroupNamePolicy = createPermissionOptionFromString(jsonObj.get("updateGroupNamePolicy").asString),
5251
updateGroupDescriptionPolicy = createPermissionOptionFromString(jsonObj.get("updateGroupDescriptionPolicy").asString),
5352
updateGroupImagePolicy = createPermissionOptionFromString(jsonObj.get("updateGroupImagePolicy").asString),
54-
updateGroupPinnedFrameUrlPolicy = createPermissionOptionFromString(jsonObj.get("updateGroupPinnedFrameUrlPolicy").asString),
5553
updateMessageExpirationPolicy = createPermissionOptionFromString(jsonObj.get("updateMessageExpirationPolicy").asString),
5654
)
5755
}

‎example/src/tests/groupPerformanceTests.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ test('creating a new conversation', async () => {
139139
name: 'Group Name',
140140
imageUrlSquare: 'imageurl.com',
141141
description: 'group description',
142-
pinnedFrameUrl: 'pinnedframe.com',
143142
}
144143
)
145144
const end4 = performance.now()

‎example/src/tests/groupPermissionsTests.ts‎

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -468,56 +468,6 @@ test('can update group permissions', async () => {
468468
return true
469469
})
470470

471-
test('can update group pinned frame', async () => {
472-
// Create clients
473-
const [alix, bo, caro] = await createClients(3)
474-
475-
// Bo creates a group with Alix and Caro
476-
const boGroup = await bo.conversations.newGroup(
477-
[alix.address, caro.address],
478-
{ permissionLevel: 'admin_only' }
479-
)
480-
481-
// Verify that alix can not update the group pinned frame
482-
await alix.conversations.sync()
483-
const alixGroup = (await alix.conversations.listGroups())[0]
484-
try {
485-
await alixGroup.updateGroupPinnedFrameUrl('new pinned frame')
486-
return false
487-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
488-
} catch (error) {
489-
// expected
490-
}
491-
492-
// Verify that bo can update the group pinned frame
493-
await boGroup.updateGroupPinnedFrameUrl('new pinned frame 2')
494-
await boGroup.sync()
495-
assert(
496-
(await boGroup.groupPinnedFrameUrl()) === 'new pinned frame 2',
497-
`boGroup.groupPinnedFrameUrl should be "new pinned frame 2" but was ${boGroup.groupPinnedFrameUrl}`
498-
)
499-
500-
// Verify that bo can update the pinned frame permission
501-
await boGroup.updateGroupPinnedFrameUrlPermission('allow')
502-
await boGroup.sync()
503-
assert(
504-
(await boGroup.permissionPolicySet()).updateGroupPinnedFrameUrlPolicy ===
505-
'allow',
506-
`boGroup.permissionPolicySet.updateGroupPinnedFrameUrlPolicy should be allow but was ${(await boGroup.permissionPolicySet()).updateGroupPinnedFrameUrlPolicy}`
507-
)
508-
509-
// Verify that Alix can now update pinned frames
510-
await alixGroup.updateGroupPinnedFrameUrl('new pinned frame 3')
511-
await alixGroup.sync()
512-
await boGroup.sync()
513-
assert(
514-
(await boGroup.groupPinnedFrameUrl()) === 'new pinned frame 3',
515-
`alixGroup.groupPinnedFrameUrl should be "new pinned frame 3" but was ${boGroup.groupPinnedFrameUrl}`
516-
)
517-
518-
return true
519-
})
520-
521471
test('can create a group with custom permissions', async () => {
522472
// Create clients
523473
const [alix, bo, caro] = await createClients(3)
@@ -530,7 +480,6 @@ test('can create a group with custom permissions', async () => {
530480
updateGroupNamePolicy: 'admin',
531481
updateGroupDescriptionPolicy: 'allow',
532482
updateGroupImagePolicy: 'admin',
533-
updateGroupPinnedFrameUrlPolicy: 'deny',
534483
updateMessageExpirationPolicy: 'deny',
535484
}
536485

@@ -577,20 +526,6 @@ test('can create a group with custom permissions', async () => {
577526
customPermissionsPolicySet.updateGroupImagePolicy,
578527
`permissions.updateGroupImagePolicy should be ${customPermissionsPolicySet.updateGroupImagePolicy} but was ${permissions.updateGroupImagePolicy}`
579528
)
580-
assert(
581-
permissions.updateGroupPinnedFrameUrlPolicy ===
582-
customPermissionsPolicySet.updateGroupPinnedFrameUrlPolicy,
583-
`permissions.updateGroupPinnedFrameUrlPolicy should be ${customPermissionsPolicySet.updateGroupPinnedFrameUrlPolicy} but was ${permissions.updateGroupPinnedFrameUrlPolicy}`
584-
)
585-
586-
// Verify that bo can not update the pinned frame even though they are a super admin
587-
try {
588-
await boGroup.updateGroupPinnedFrameUrl('new pinned frame')
589-
return false
590-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
591-
} catch (error) {
592-
// expected
593-
}
594529

595530
// Verify that alix can update the group description
596531
await alixGroup.updateGroupDescription('new description')
@@ -625,7 +560,6 @@ test('creating a group with invalid permissions should fail', async () => {
625560
updateGroupNamePolicy: 'admin',
626561
updateGroupDescriptionPolicy: 'allow',
627562
updateGroupImagePolicy: 'admin',
628-
updateGroupPinnedFrameUrlPolicy: 'deny',
629563
updateMessageExpirationPolicy: 'admin',
630564
}
631565

‎ios/Wrappers/CreateGroupParamsWrapper.swift‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ struct CreateGroupParamsWrapper {
44
let groupName: String
55
let groupImageUrlSquare: String
66
let groupDescription: String
7-
let groupPinnedFrameUrl: String
87

98
static func createGroupParamsFromJson(_ authParams: String) -> CreateGroupParamsWrapper {
109
let data = authParams.data(using: .utf8) ?? Data()
@@ -13,13 +12,11 @@ struct CreateGroupParamsWrapper {
1312
let groupName = jsonOptions["name"] as? String ?? ""
1413
let groupImageUrlSquare = jsonOptions["imageUrlSquare"] as? String ?? ""
1514
let groupDescription = jsonOptions["description"] as? String ?? ""
16-
let groupPinnedFrameUrl = jsonOptions["pinnedFrameUrl"] as? String ?? ""
1715

1816
return CreateGroupParamsWrapper(
1917
groupName: groupName,
2018
groupImageUrlSquare: groupImageUrlSquare,
21-
groupDescription: groupDescription,
22-
groupPinnedFrameUrl: groupPinnedFrameUrl
19+
groupDescription: groupDescription
2320
)
2421
}
2522
}

‎ios/Wrappers/PermissionPolicySetWrapper.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ class PermissionPolicySetWrapper {
5050
"updateGroupNamePolicy": fromPermissionOption(policySet.updateGroupNamePolicy),
5151
"updateGroupDescriptionPolicy": fromPermissionOption(policySet.updateGroupDescriptionPolicy),
5252
"updateGroupImagePolicy": fromPermissionOption(policySet.updateGroupImagePolicy),
53-
"updateGroupPinnedFrameUrlPolicy": fromPermissionOption(policySet.updateGroupPinnedFrameUrlPolicy),
5453
"updateMessageExpirationPolicy": fromPermissionOption(policySet.updateMessageExpirationPolicy)
5554
]
5655
}
@@ -72,7 +71,6 @@ class PermissionPolicySetWrapper {
7271
updateGroupNamePolicy: createPermissionOption(from: jsonDict["updateGroupNamePolicy"] as? String ?? ""),
7372
updateGroupDescriptionPolicy: createPermissionOption(from: jsonDict["updateGroupDescriptionPolicy"] as? String ?? ""),
7473
updateGroupImagePolicy: createPermissionOption(from: jsonDict["updateGroupImagePolicy"] as? String ?? ""),
75-
updateGroupPinnedFrameUrlPolicy: createPermissionOption(from: jsonDict["updateGroupPinnedFrameUrlPolicy"] as? String ?? ""),
7674
updateMessageExpirationPolicy: createPermissionOption(from: jsonDict["updateMessageExpirationPolicy"] as? String ?? "")
7775
)
7876
}

‎ios/XMTPModule.swift‎

Lines changed: 4 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -924,8 +924,7 @@ public class XMTPModule: Module {
924924
permissions: permissionLevel,
925925
name: createGroupParams.groupName,
926926
imageUrlSquare: createGroupParams.groupImageUrlSquare,
927-
description: createGroupParams.groupDescription,
928-
pinnedFrameUrl: createGroupParams.groupPinnedFrameUrl
927+
description: createGroupParams.groupDescription
929928
)
930929
return try await GroupWrapper.encode(group, client: client)
931930
} catch {
@@ -957,8 +956,7 @@ public class XMTPModule: Module {
957956
permissionPolicySet: permissionPolicySet,
958957
name: createGroupParams.groupName,
959958
imageUrlSquare: createGroupParams.groupImageUrlSquare,
960-
description: createGroupParams.groupDescription,
961-
pinnedFrameUrl: createGroupParams.groupPinnedFrameUrl
959+
description: createGroupParams.groupDescription
962960
)
963961
return try await GroupWrapper.encode(group, client: client)
964962
} catch {
@@ -995,8 +993,7 @@ public class XMTPModule: Module {
995993
permissions: permissionLevel,
996994
name: createGroupParams.groupName,
997995
imageUrlSquare: createGroupParams.groupImageUrlSquare,
998-
description: createGroupParams.groupDescription,
999-
pinnedFrameUrl: createGroupParams.groupPinnedFrameUrl
996+
description: createGroupParams.groupDescription
1000997
)
1001998
return try await GroupWrapper.encode(group, client: client)
1002999
} catch {
@@ -1028,8 +1025,7 @@ public class XMTPModule: Module {
10281025
permissionPolicySet: permissionPolicySet,
10291026
name: createGroupParams.groupName,
10301027
imageUrlSquare: createGroupParams.groupImageUrlSquare,
1031-
description: createGroupParams.groupDescription,
1032-
pinnedFrameUrl: createGroupParams.groupPinnedFrameUrl
1028+
description: createGroupParams.groupDescription
10331029
)
10341030
return try await GroupWrapper.encode(group, client: client)
10351031
} catch {
@@ -1292,37 +1288,6 @@ public class XMTPModule: Module {
12921288
groupDescription: description)
12931289
}
12941290

1295-
AsyncFunction("groupPinnedFrameUrl") {
1296-
(installationId: String, id: String) -> String in
1297-
guard
1298-
let client = await clientsManager.getClient(key: installationId)
1299-
else {
1300-
throw Error.noClient
1301-
}
1302-
guard let group = try client.findGroup(groupId: id) else {
1303-
throw Error.conversationNotFound(
1304-
"no conversation found for \(id)")
1305-
}
1306-
1307-
return try group.groupPinnedFrameUrl()
1308-
}
1309-
1310-
AsyncFunction("updateGroupPinnedFrameUrl") {
1311-
(installationId: String, id: String, pinnedFrameUrl: String) in
1312-
guard
1313-
let client = await clientsManager.getClient(key: installationId)
1314-
else {
1315-
throw Error.noClient
1316-
}
1317-
guard let group = try client.findGroup(groupId: id) else {
1318-
throw Error.conversationNotFound(
1319-
"no conversation found for \(id)")
1320-
}
1321-
1322-
try await group.updateGroupPinnedFrameUrl(
1323-
groupPinnedFrameUrl: pinnedFrameUrl)
1324-
}
1325-
13261291
AsyncFunction("isGroupActive") {
13271292
(installationId: String, id: String) -> Bool in
13281293
guard
@@ -1606,23 +1571,6 @@ public class XMTPModule: Module {
16061571
permission: newPermission))
16071572
}
16081573

1609-
AsyncFunction("updateGroupPinnedFrameUrlPermission") {
1610-
(clientInstallationId: String, id: String, newPermission: String) in
1611-
guard
1612-
let client = await clientsManager.getClient(
1613-
key: clientInstallationId)
1614-
else {
1615-
throw Error.noClient
1616-
}
1617-
guard let group = try client.findGroup(groupId: id) else {
1618-
throw Error.conversationNotFound(
1619-
"no conversation found for \(id)")
1620-
}
1621-
try await group.updateGroupPinnedFrameUrlPermission(
1622-
newPermissionOption: getPermissionOption(
1623-
permission: newPermission))
1624-
}
1625-
16261574
AsyncFunction("permissionPolicySet") {
16271575
(installationId: String, id: String) async throws -> String in
16281576
guard

0 commit comments

Comments
 (0)