Merge branch 'beta'

.gitlab-ci.yml

@@ -108,7 +108,7 @@ verifysanity_beta_testflight:
   artifacts:
     when: on_failure
     paths:
-      - build/verifysanity_artifacts
+      - build/artifacts
     expire_in: 1 week
 
 verify_beta_testflight:
@@ -126,5 +126,5 @@ verify_beta_testflight:
   artifacts:
     when: on_failure
     paths:
-      - build/verify_artifacts
+      - build/artifacts
     expire_in: 1 week

buildbox/deploy-telegram.sh

@@ -2,6 +2,13 @@
 
 set -e
 
+COMMIT_COMMENT="$(git log -1 --pretty=%B)"
+case "$COMMIT_COMMENT" in 
+  *"[nodeploy]"*)
+	exit 0
+    ;;
+esac
+
 CONFIGURATION="$1"
 
 if [ -z "$CONFIGURATION" ]; then

submodules/TelegramUI/Sources/ChatMessageInteractiveFileNode.swift

@@ -281,10 +281,7 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
                 var consumableContentIcon: UIImage?
                 for attribute in message.attributes {
                     if let attribute = attribute as? ConsumableContentMessageAttribute {
-                        var isConsumed = attribute.consumed
-                        if let channel = message.peers[message.id.peerId] as? TelegramChannel, case .broadcast = channel.info {
-                            isConsumed = true
-                        }
+                        let isConsumed = attribute.consumed
                         if !isConsumed {
                             if incoming {
                                 consumableContentIcon = PresentationResourcesChat.chatBubbleConsumableContentIncomingIcon(presentationData.theme.theme)