From cd61767f68beab5a343bf0e4747f34c6111bcb3a Mon Sep 17 00:00:00 2001
From: Ilya Laktyushin <ilya@laktyush.in>
Date: Wed, 3 Apr 2024 13:09:40 +0400
Subject: [PATCH] Various fixes

---
 submodules/PremiumUI/Sources/CreateGiveawayController.swift | 6 ++++--
 .../Sources/TelegramEngine/Messages/AdMessages.swift        | 2 +-
 .../Sources/ChatMessageWebpageBubbleContentNode.swift       | 3 ---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/submodules/PremiumUI/Sources/CreateGiveawayController.swift b/submodules/PremiumUI/Sources/CreateGiveawayController.swift
index 846d11ad8f..9976989cf2 100644
--- a/submodules/PremiumUI/Sources/CreateGiveawayController.swift
+++ b/submodules/PremiumUI/Sources/CreateGiveawayController.swift
@@ -854,7 +854,7 @@ public func createGiveawayController(context: AccountContext, updatedPresentatio
     let expiryDate = calendar.date(byAdding: .day, value: 3, to: calendar.date(from: components)!)!
     let expiryTime = Int32(expiryDate.timeIntervalSince1970)
     
-    let minDate = currentTime + 60 * 30
+    let minDate = currentTime + 60 * 1
     let maxDate = currentTime + context.userLimits.maxGiveawayPeriodSeconds
     
     let initialState: CreateGiveawayControllerState = CreateGiveawayControllerState(mode: .giveaway, subscriptions: initialSubscriptions, time: expiryTime)
@@ -1099,7 +1099,9 @@ public func createGiveawayController(context: AccountContext, updatedPresentatio
             let quantity: Int32
             switch state.mode {
             case .giveaway:
-                purpose = .giveaway(boostPeer: peerId, additionalPeerIds: state.channels.filter { $0 != peerId }, countries: state.countries, onlyNewSubscribers: state.onlyNewEligible, showWinners: state.showWinners, prizeDescription: state.prizeDescription.isEmpty ? nil : state.prizeDescription, randomId: Int64.random(in: .min ..< .max), untilDate: state.time, currency: currency, amount: amount)
+                let currentTime = Int32(CFAbsoluteTimeGetCurrent() + kCFAbsoluteTimeIntervalSince1970)
+                let untilDate = max(state.time, currentTime + 60)
+                purpose = .giveaway(boostPeer: peerId, additionalPeerIds: state.channels.filter { $0 != peerId }, countries: state.countries, onlyNewSubscribers: state.onlyNewEligible, showWinners: state.showWinners, prizeDescription: state.prizeDescription.isEmpty ? nil : state.prizeDescription, randomId: Int64.random(in: .min ..< .max), untilDate: untilDate, currency: currency, amount: amount)
                 quantity = selectedProduct.giftOption.storeQuantity
             case .gift:
                 purpose = .giftCode(peerIds: state.peers, boostPeer: peerId, currency: currency, amount: amount)
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Messages/AdMessages.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/AdMessages.swift
index 83ad6be77b..1ac7a60ab0 100644
--- a/submodules/TelegramCore/Sources/TelegramEngine/Messages/AdMessages.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/AdMessages.swift
@@ -230,7 +230,7 @@ private class AdMessagesHistoryContextImpl {
             self.sponsorInfo = try container.decodeIfPresent(String.self, forKey: .sponsorInfo)
             self.additionalInfo = try container.decodeIfPresent(String.self, forKey: .additionalInfo)
             
-            self.canReport = try container.decodeIfPresent(Bool.self, forKey: .displayAvatar) ?? false
+            self.canReport = try container.decodeIfPresent(Bool.self, forKey: .canReport) ?? false
         }
 
         public func encode(to encoder: Encoder) throws {
diff --git a/submodules/TelegramUI/Components/Chat/ChatMessageWebpageBubbleContentNode/Sources/ChatMessageWebpageBubbleContentNode.swift b/submodules/TelegramUI/Components/Chat/ChatMessageWebpageBubbleContentNode/Sources/ChatMessageWebpageBubbleContentNode.swift
index 39318cae99..4315bccdf9 100644
--- a/submodules/TelegramUI/Components/Chat/ChatMessageWebpageBubbleContentNode/Sources/ChatMessageWebpageBubbleContentNode.swift
+++ b/submodules/TelegramUI/Components/Chat/ChatMessageWebpageBubbleContentNode/Sources/ChatMessageWebpageBubbleContentNode.swift
@@ -510,9 +510,6 @@ public final class ChatMessageWebpageBubbleContentNode: ChatMessageBubbleContent
                         break
                     }
                 }
-                if adAttribute.displayAvatar && adAttribute.canReport, let profileImage = item.message.author?.smallProfileImage {
-                    mediaAndFlags = (TelegramMediaImage(imageId: MediaId(namespace: 0, id: 0), representations: [profileImage], immediateThumbnailData: nil, reference: nil, partialReference: nil, flags: []), [.preferMediaInline])
-                }
 
                 if adAttribute.canReport {
                     titleBadge = item.presentationData.strings.Message_AdWhatIsThis