Merge branch 'main' into feature/dep-updates

.github/workflows/test.yml

@@ -25,7 +25,7 @@ jobs:
 
       - name: Create pip requirements
         run: |
-          echo "matrix-synapse" > requirements.txt
+          echo "matrix-synapse==v1.60.0" > requirements.txt
 
       - name: Set up Python 3.8
         uses: actions/setup-python@v2

features/notifications/src/main/kotlin/app/dapk/st/notifications/NotificationFactory.kt

@@ -70,6 +70,10 @@ class NotificationFactory(
             smallIcon = R.drawable.ic_notification_small_icon,
             contentIntent = openAppIntent,
             groupId = GROUP_ID,
+            groupAlertBehavior = deviceMeta.whenPOrHigher(
+                block = { Notification.GROUP_ALERT_SUMMARY },
+                fallback = { null }
+            ),
             isGroupSummary = true,
         )
     }

matrix/services/sync/src/main/kotlin/app/dapk/st/matrix/sync/internal/request/ApiSyncResponse.kt

@@ -484,8 +484,8 @@ internal sealed class ApiTimelineEvent {
 
                 @Serializable
                 internal data class Info(
-                    @SerialName("h") val height: Int,
-                    @SerialName("w") val width: Int,
+                    @SerialName("h") val height: Int? = null,
+                    @SerialName("w") val width: Int? = null,
                 )
             }