Skip to content

Commit 024e9c4

Browse files
authored
Add latest OpenAPI network code (24.10.2025) (#85)
* Add latest codegen (24.10.2025) * Expose ownMembership in FeedData
1 parent 6b6ce59 commit 024e9c4

39 files changed

+156
-204
lines changed

stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/api/model/AggregatedActivityData.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import java.util.Date
3131
* @property score The score associated with this aggregation.
3232
* @property updatedAt The date and time when this aggregation was last updated.
3333
* @property userCount The number of unique users involved in these activities.
34+
* @property userCountTruncated Indicates if the user count is truncated.
3435
*/
3536
public data class AggregatedActivityData(
3637
public val activities: List<ActivityData>,
@@ -40,6 +41,7 @@ public data class AggregatedActivityData(
4041
public val score: Float,
4142
public val updatedAt: Date,
4243
public val userCount: Int,
44+
public val userCountTruncated: Boolean,
4345
) {
4446

4547
/**
@@ -63,5 +65,6 @@ internal fun AggregatedActivityResponse.toModel(): AggregatedActivityData {
6365
score = score,
6466
updatedAt = updatedAt,
6567
userCount = userCount,
68+
userCountTruncated = userCountTruncated,
6669
)
6770
}

stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/api/model/FeedData.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package io.getstream.feeds.android.client.api.model
1717

18+
import io.getstream.feeds.android.network.models.FeedOwnCapability
1819
import io.getstream.feeds.android.network.models.FeedResponse
1920
import java.util.Date
2021

@@ -51,6 +52,8 @@ public data class FeedData(
5152
public val groupId: String,
5253
public val id: String,
5354
public val memberCount: Int,
55+
public val ownCapabilities: List<FeedOwnCapability>,
56+
public val ownMembership: FeedMemberData?,
5457
public val name: String,
5558
public val pinCount: Int,
5659
public val updatedAt: Date,
@@ -72,6 +75,8 @@ public fun FeedResponse.toModel(): FeedData =
7275
groupId = groupId,
7376
id = id,
7477
memberCount = memberCount,
78+
ownCapabilities = ownCapabilities.orEmpty(),
79+
ownMembership = ownMembership?.toModel(),
7580
name = name,
7681
pinCount = pinCount,
7782
updatedAt = updatedAt,

stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/api/state/FeedState.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import io.getstream.feeds.android.client.api.model.FeedMemberData
2424
import io.getstream.feeds.android.client.api.model.FollowData
2525
import io.getstream.feeds.android.client.api.model.PaginationData
2626
import io.getstream.feeds.android.client.api.state.query.FeedQuery
27-
import io.getstream.feeds.android.network.models.FeedOwnCapability
2827
import io.getstream.feeds.android.network.models.NotificationStatusResponse
2928
import kotlinx.coroutines.flow.StateFlow
3029

@@ -64,9 +63,6 @@ public interface FeedState {
6463
/** The list of members in this feed. */
6564
public val members: StateFlow<List<FeedMemberData>>
6665

67-
/** The capabilities that the current user has for this feed. */
68-
public val ownCapabilities: StateFlow<List<FeedOwnCapability>>
69-
7066
/** The list of pinned activities and its pinning state. */
7167
public val pinnedActivities: StateFlow<List<ActivityPinData>>
7268

stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/repository/FeedsRepository.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import io.getstream.feeds.android.client.api.state.query.ActivitiesQueryConfig
2828
import io.getstream.feeds.android.client.api.state.query.FeedQuery
2929
import io.getstream.feeds.android.client.api.state.query.FeedsQuery
3030
import io.getstream.feeds.android.network.models.AcceptFollowRequest
31-
import io.getstream.feeds.android.network.models.FeedOwnCapability
3231
import io.getstream.feeds.android.network.models.FollowRequest
3332
import io.getstream.feeds.android.network.models.NotificationStatusResponse
3433
import io.getstream.feeds.android.network.models.QueryFeedMembersRequest
@@ -116,7 +115,6 @@ internal interface FeedsRepository {
116115
* @property following A list of feeds that this feed is following.
117116
* @property followRequests A list of follow requests for the feed.
118117
* @property members A paginated result of members in the feed.
119-
* @property ownCapabilities The capabilities that the current user has on the feed.
120118
* @property pinnedActivities A list of activities that are pinned in the feed.
121119
* @property aggregatedActivities A list of aggregated activities in the feed.
122120
* @property notificationStatus The notification status for the feed, if available.
@@ -129,7 +127,6 @@ internal data class GetOrCreateInfo(
129127
val following: List<FollowData>,
130128
val followRequests: List<FollowData>,
131129
val members: PaginationResult<FeedMemberData>,
132-
val ownCapabilities: List<FeedOwnCapability>,
133130
val pinnedActivities: List<ActivityPinData>,
134131
val aggregatedActivities: List<AggregatedActivityData>,
135132
val notificationStatus: NotificationStatusResponse?,

stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/repository/FeedsRepositoryImpl.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ internal class FeedsRepositoryImpl(private val api: FeedsApi) : FeedsRepository
7676
models = response.members.map { it.toModel() },
7777
pagination = response.memberPagination?.toModel() ?: PaginationData.EMPTY,
7878
),
79-
ownCapabilities = response.ownCapabilities,
8079
pinnedActivities = response.pinnedActivities.map { it.toModel() },
8180
aggregatedActivities = response.aggregatedActivities.map { it.toModel() },
8281
notificationStatus = response.notificationStatus,

stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/FeedStateImpl.kt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ import io.getstream.feeds.android.client.internal.utils.mergeSorted
5151
import io.getstream.feeds.android.client.internal.utils.updateIf
5252
import io.getstream.feeds.android.client.internal.utils.upsert
5353
import io.getstream.feeds.android.client.internal.utils.upsertSorted
54-
import io.getstream.feeds.android.network.models.FeedOwnCapability
5554
import io.getstream.feeds.android.network.models.NotificationStatusResponse
5655
import kotlinx.coroutines.flow.MutableStateFlow
5756
import kotlinx.coroutines.flow.StateFlow
@@ -81,8 +80,6 @@ internal class FeedStateImpl(
8180
private val _followers: MutableStateFlow<List<FollowData>> = MutableStateFlow(emptyList())
8281
private val _following: MutableStateFlow<List<FollowData>> = MutableStateFlow(emptyList())
8382
private val _followRequests: MutableStateFlow<List<FollowData>> = MutableStateFlow(emptyList())
84-
private val _ownCapabilities: MutableStateFlow<List<FeedOwnCapability>> =
85-
MutableStateFlow(emptyList())
8683
private val _pinnedActivities: MutableStateFlow<List<ActivityPinData>> =
8784
MutableStateFlow(emptyList())
8885
private val _notificationStatus: MutableStateFlow<NotificationStatusResponse?> =
@@ -120,9 +117,6 @@ internal class FeedStateImpl(
120117
override val members: StateFlow<List<FeedMemberData>>
121118
get() = memberListState.members
122119

123-
override val ownCapabilities: StateFlow<List<FeedOwnCapability>>
124-
get() = _ownCapabilities.asStateFlow()
125-
126120
override val pinnedActivities: StateFlow<List<ActivityPinData>>
127121
get() = _pinnedActivities.asStateFlow()
128122

@@ -141,7 +135,6 @@ internal class FeedStateImpl(
141135
_followers.update { result.followers }
142136
_following.update { result.following }
143137
_followRequests.update { result.followRequests }
144-
_ownCapabilities.update { result.ownCapabilities }
145138
_pinnedActivities.update { result.pinnedActivities }
146139
_notificationStatus.update { result.notificationStatus }
147140

@@ -252,7 +245,6 @@ internal class FeedStateImpl(
252245
_followers.update { emptyList() }
253246
_following.update { emptyList() }
254247
_followRequests.update { emptyList() }
255-
_ownCapabilities.update { emptyList() }
256248
// Clear the member list state
257249
memberListState.clear()
258250
}

stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/repository/FeedsRepositoryImplTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ internal class FeedsRepositoryImplTest {
8888
followRequests = emptyList(),
8989
members =
9090
PaginationResult(models = emptyList(), pagination = PaginationData.EMPTY),
91-
ownCapabilities = emptyList(),
9291
pinnedActivities = emptyList(),
9392
aggregatedActivities = emptyList(),
9493
notificationStatus = null,

stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/FeedImplTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,6 @@ internal class FeedImplTest {
720720
following = emptyList(),
721721
followRequests = emptyList(),
722722
members = PaginationResult(models = emptyList(), pagination = PaginationData.EMPTY),
723-
ownCapabilities = emptyList(),
724723
pinnedActivities = emptyList(),
725724
aggregatedActivities = emptyList(),
726725
notificationStatus = null,

stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/FeedStateImplTest.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import io.getstream.feeds.android.client.internal.test.TestData.feedsReactionDat
3737
import io.getstream.feeds.android.client.internal.test.TestData.followData
3838
import io.getstream.feeds.android.client.internal.test.TestData.pollData
3939
import io.getstream.feeds.android.client.internal.test.TestData.pollVoteData
40-
import io.getstream.feeds.android.network.models.FeedOwnCapability
4140
import io.mockk.mockk
4241
import kotlinx.coroutines.test.runTest
4342
import org.junit.Assert.assertEquals
@@ -329,7 +328,6 @@ internal class FeedStateImplTest {
329328
assertEquals(emptyList<FollowData>(), feedState.followers.value)
330329
assertEquals(emptyList<FollowData>(), feedState.following.value)
331330
assertEquals(emptyList<FollowData>(), feedState.followRequests.value)
332-
assertEquals(emptyList<FeedOwnCapability>(), feedState.ownCapabilities.value)
333331
}
334332

335333
@Test
@@ -544,7 +542,6 @@ internal class FeedStateImplTest {
544542
followers = followers,
545543
following = following,
546544
followRequests = followRequests,
547-
ownCapabilities = emptyList(),
548545
pinnedActivities = emptyList(),
549546
aggregatedActivities = emptyList(),
550547
notificationStatus = null,

stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/test/TestData.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,8 @@ internal object TestData {
383383
groupId = "user",
384384
id = sourceUserId,
385385
memberCount = 0,
386+
ownCapabilities = emptyList(),
387+
ownMembership = null,
386388
name = "Test Feed",
387389
pinCount = 0,
388390
updatedAt = updatedAt,
@@ -403,6 +405,8 @@ internal object TestData {
403405
groupId = "user",
404406
id = targetUserId,
405407
memberCount = 0,
408+
ownCapabilities = emptyList(),
409+
ownMembership = null,
406410
name = "Target Feed",
407411
pinCount = 0,
408412
updatedAt = updatedAt,
@@ -535,6 +539,8 @@ internal object TestData {
535539
groupId = groupId,
536540
id = id,
537541
memberCount = 0,
542+
ownCapabilities = emptyList(),
543+
ownMembership = null,
538544
name = name,
539545
pinCount = 0,
540546
updatedAt = Date(1000),
@@ -612,7 +618,6 @@ internal object TestData {
612618
followers = emptyList(),
613619
following = emptyList(),
614620
members = emptyList(),
615-
ownCapabilities = emptyList(),
616621
pinnedActivities = emptyList(),
617622
feed = feedResponse(),
618623
next = "next",

0 commit comments

Comments
 (0)