Merge pull request #7133 from vector-im/phlpro/voicebroadcast_hide_at…

…tachments Remove the voice broadcast chunks from the attachments list
element-hq · Dec 2, 2022 · 28f86a9 · 28f86a9
2 parents f2ab29b + 977d355
commit 28f86a9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 0 deletions.
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m
@@ -1373,6 +1373,11 @@ - (BOOL)shouldQueueEventForProcessing:(MXEvent*)event roomState:(MXRoomState*)ro
             // ignore the event
             return NO;
         }
+
+        // Ignore voice message related to an actual voice broadcast.
+        if (event.content[VoiceBroadcastSettings.voiceBroadcastContentKeyChunkType] != nil) {
+            return NO;
+        }
     }
 
     // Check for undecryptable messages that were sent while the user was not in the room and hide them

diff --git a/RiotNSE/target.yml b/RiotNSE/target.yml
@@ -76,3 +76,4 @@ targets:
       excludes:
         - "**/*.md" # excludes all files with the .md extension
     - path: ../Riot/Modules/Room/TimelineCells/Styles/RoomTimelineStyleIdentifier.swift
+    - path: ../Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastSettings.swift
diff --git a/RiotShareExtension/target.yml b/RiotShareExtension/target.yml
@@ -82,3 +82,4 @@ targets:
       excludes:
         - "**/*.md" # excludes all files with the .md extension
     - path: ../Riot/Modules/Room/TimelineCells/Styles/RoomTimelineStyleIdentifier.swift
+    - path: ../Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastSettings.swift
diff --git a/SiriIntents/target.yml b/SiriIntents/target.yml
@@ -64,3 +64,4 @@ targets:
       excludes:
         - "**/*.md" # excludes all files with the .md extension
     - path: ../Riot/Modules/Room/TimelineCells/Styles/RoomTimelineStyleIdentifier.swift
+    - path: ../Riot/Modules/VoiceBroadcast/VoiceBroadcastSDK/VoiceBroadcastSettings.swift
diff --git a/changelog.d/pr-7133.bugfix b/changelog.d/pr-7133.bugfix
@@ -0,0 +1 @@
+Labs: VoiceBroadcast: Remove the voice broadcast chunks from the attachments list
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Labs: VoiceBroadcast: Remove the voice broadcast chunks from the attachments list