Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2618 from element-hq/feature/bma/fixRoomAnalytics

Browse source 
Fix analytics
This commit is contained in:
Benoit Marty 2024-03-28 15:06:38 +01:00 • committed by GitHub
commit 6c97f8b5bb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/2612.bugfix Normal file
View file

@ -0,0 +1 @@
Fix analytics issue around room considered as space by mistake.

1
libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt
View file

@ -55,6 +55,7 @@ interface MatrixRoom : Closeable {
val topic: String?
val avatarUrl: String?
val isEncrypted: Boolean
val isSpace: Boolean
val isDirect: Boolean
val isPublic: Boolean
val activeMemberCount: Long

3
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
View file

@ -213,6 +213,9 @@ class RustMatrixRoom(
override val isPublic: Boolean
get() = innerRoom.isPublic()
override val isSpace: Boolean
get() = innerRoom.isSpace()
override val isDirect: Boolean
get() = innerRoom.isDirect()

1
libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt
View file

@ -77,6 +77,7 @@ class FakeMatrixRoom(
override val alias: String? = null,
override val alternativeAliases: List<String> = emptyList(),
override val isPublic: Boolean = true,
override val isSpace: Boolean = false,
override val isDirect: Boolean = false,
override val isOneToOne: Boolean = false,
override val joinedMemberCount: Long = 123L,

8
services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/extensions/JoinedRoomExt.kt
View file

@ -17,8 +17,6 @@
package io.element.android.services.analytics.api.extensions
import im.vector.app.features.analytics.plan.JoinedRoom
import io.element.android.libraries.core.bool.orFalse
import io.element.android.libraries.matrix.api.core.MatrixPatterns
import io.element.android.libraries.matrix.api.room.MatrixRoom
fun Long?.toAnalyticsRoomSize(): JoinedRoom.RoomSize {
@ -34,9 +32,9 @@ fun Long?.toAnalyticsRoomSize(): JoinedRoom.RoomSize {
fun MatrixRoom.toAnalyticsJoinedRoom(trigger: JoinedRoom.Trigger?): JoinedRoom {
return JoinedRoom(
isDM = this.isDirect.orFalse(),
isSpace = MatrixPatterns.isSpaceId(this.roomId.value),
roomSize = this.joinedMemberCount.toAnalyticsRoomSize(),
isDM = isDirect,
isSpace = isSpace,
roomSize = joinedMemberCount.toAnalyticsRoomSize(),
trigger = trigger
)
}

6
services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/extensions/ViewRoomExt.kt
View file

@ -17,16 +17,14 @@
package io.element.android.services.analytics.api.extensions
import im.vector.app.features.analytics.plan.ViewRoom
import io.element.android.libraries.core.bool.orFalse
import io.element.android.libraries.matrix.api.core.MatrixPatterns
import io.element.android.libraries.matrix.api.room.MatrixRoom
fun MatrixRoom.toAnalyticsViewRoom(trigger: ViewRoom.Trigger? = null, selectedSpace: MatrixRoom? = null, viaKeyboard: Boolean? = null): ViewRoom {
val activeSpace = selectedSpace?.toActiveSpace() ?: ViewRoom.ActiveSpace.Home
return ViewRoom(
isDM = this.isDirect.orFalse(),
isSpace = MatrixPatterns.isSpaceId(this.roomId.value),
isDM = isDirect,
isSpace = isSpace,
trigger = trigger,
activeSpace = activeSpace,
viaKeyboard = viaKeyboard