Merge commit 'cbf23d0df5f077b3029c18b4c57e6c72a69f969f' into beta

Author: laktyushin

.gitlab-ci.yml

@@ -79,7 +79,8 @@ experimental_i:
   script:
     - export PATH=/opt/homebrew/opt/ruby/bin:$PATH                                  
     - export PATH=`gem environment gemdir`/bin:$PATH
-    - python3 -u build-system/Make/Make.py remote-build --darwinContainers="$DARWIN_CONTAINERS" --darwinContainersHost="$DARWIN_CONTAINERS_HOST" --cacheHost="$TELEGRAM_BAZEL_CACHE_HOST" --configurationPath="build-system/appstore-configuration.json" --gitCodesigningRepository="$TELEGRAM_GIT_CODESIGNING_REPOSITORY" --gitCodesigningType=adhoc --configuration=release_arm64
+    - python3 -u build-system/Make/Make.py remote-build --darwinContainers="$DARWIN_CONTAINERS" --darwinContainersHost="$DARWIN_CONTAINERS_HOST" --cacheHost="$TELEGRAM_BAZEL_CACHE_HOST" --configurationPath="build-system/appcenter-configuration.json" --gitCodesigningRepository="$TELEGRAM_GIT_CODESIGNING_REPOSITORY" --gitCodesigningType=adhoc --configuration=release_arm64
+    - python3 -u build-system/Make/DeployToFirebase.py --configuration="$TELEGRAM_PRIVATE_DATA_PATH/firebase-configurations/firebase-internal.json" --ipa="build/artifacts/Telegram.ipa" --dsyms="build/artifacts/Telegram.DSYMs.zip"
   environment:
     name: experimental
   artifacts:

Random.txt

@@ -1 +1 @@
-eb0ad702db3f1d1c0afe18fdddf9fd4ba4562edd550a0b414b087d26caac1bda
+c796824aa8245ce7309426caa3c4816024abd71d21f3805988aa953a4e826169

Telegram/BUILD

@@ -526,6 +526,12 @@ official_communication_notifications_fragment = """
 """
 communication_notifications_fragment = official_communication_notifications_fragment if telegram_bundle_id in official_bundle_ids else ""
 
+official_notification_filtering_fragment = """
+<key>com.apple.developer.usernotifications.filtering</key>
+<true/>
+"""
+notification_filtering_fragment = official_notification_filtering_fragment if telegram_bundle_id == "ph.telegra.Telegraph" else ""
+
 store_signin_fragment = """
 <key>com.apple.developer.applesignin</key>
 <array>
@@ -547,6 +553,7 @@ plist_fragment(
         unrestricted_voip_fragment,
         carplay_fragment,
         communication_notifications_fragment,
+        notification_filtering_fragment,
         signin_fragment,
     ])
 )

Telegram/Telegram-iOS/en.lproj/Localizable.strings

@@ -14065,6 +14065,7 @@ Sorry for the inconvenience.";
 "Privacy.Gifts.AcceptedTypes.Unlimited" = "Unlimited";
 "Privacy.Gifts.AcceptedTypes.Limited" = "Limited-Edition";
 "Privacy.Gifts.AcceptedTypes.Unique" = "Unique";
+"Privacy.Gifts.AcceptedTypes.Channel" = "From Channels";
 "Privacy.Gifts.AcceptedTypes.Premium" = "Premium Subscriptions";
 "Privacy.Gifts.AcceptedTypes.Info" = "Choose the types of gifts that you allow others to send you.";
 
@@ -15156,3 +15157,269 @@ Error: %8$@";
 "Chat.NewThreadInfo.Text" = "Type any message to\ncreate a new thread.";
 "Chat.InlineTopicMenu.NewForumThreadTab" = "New Chat";
 "Chat.GenericForuThreadStatus" = "thread";
+
+"Privacy.SavedMusic" = "Saved Music";
+"Privacy.SavedMusic.WhoCanSeeMyMusic" = "WHO CAN SEE MY SAVED MUSIC";
+"Privacy.SavedMusic.CustomHelp" = "You can restrict who can see your saved music with granular precision.";
+"Privacy.SavedMusic.AlwaysShareWith.Title" = "Always Share With";
+"Privacy.SavedMusic.NeverShareWith.Title" = "Never Share With";
+
+"ScheduledMessages.Reminder.Delete" = "Delete Reminder";
+"ScheduledMessages.Reminder.DeleteMany" = "Delete Reminders";
+
+"Gift.Setup.PlaceBid" = "Place a Bid";
+"Gift.Setup.AuctionInfo" = "%@ are dropped to the top %@ by bid amount. [Learn more >]()";
+"Gift.Setup.AuctionInfo.Gifts_1" = "%@ gift";
+"Gift.Setup.AuctionInfo.Gifts_any" = "%@ gifts";
+"Gift.Setup.AuctionInfo.Bidders_1" = "%@ bidder";
+"Gift.Setup.AuctionInfo.Bidders_any" = "%@ bidders";
+
+"PrivacySettings.LoginEmailSetupInfo" = "Setup your email address for Telegram login codes.";
+
+"LoginEmail.Title" = "Add Email";
+"LoginEmail.Description" = "Please add your email address to keep access to your account.";
+
+"LoginEmail.Success.Title" = "Email added";
+"LoginEmail.Success.Text" = "Your account is now protected!";
+
+"Notification.GiftAuction.Acquired" = "You've successfully bought a gift in the auction for %@.";
+
+"Gift.Auction.Auction" = "auction";
+"Gift.Auction.Description" = "Top %@ bidders will get **%@** gifts this round. [Learn More >]()";
+"Gift.Auction.Ended" = "Auction ended";
+"Gift.Auction.FirstSale" = "First Sale";
+"Gift.Auction.LastSale" = "Last Sale";
+"Gift.Auction.Started" = "Started";
+"Gift.Auction.Ends" = "Ends";
+"Gift.Auction.AveragePrice" = "Average Price";
+"Gift.Auction.CurrentRound" = "Current Round";
+"Gift.Auction.Round" = "%@ of %@";
+"Gift.Auction.Availability" = "Availability";
+"Gift.Auction.AvailabilityOf" = "%@ of %@ left";
+"Gift.Auction.Join" = "Join Auction";
+"Gift.Auction.TimeLeftHours" = "{h}h {m}m left";
+"Gift.Auction.TimeLeftMinutes" = "{m}:{s} left";
+"Gift.Auction.ItemsBought_1" = "item bought";
+"Gift.Auction.ItemsBought_any" = "items bought";
+"Gift.Auction.ForSaleOnTelegram" = "for sale on Telegram";
+"Gift.Auction.ForSaleOnFragment" = "for sale on Fragment";
+"Gift.Auction.AveragePriceInfo" = "**%1$@** is the average sale price for %2$@ gifts.";
+"Gift.Auction.Stars_1" = "%@ Star";
+"Gift.Auction.Stars_any" = "%@ Stars";
+
+"Gift.AuctionBid.Title" = "Place a Bid";
+"Gift.AuctionBid.MinimumBid" = "minimum bid";
+"Gift.AuctionBid.UntilNext" = "until next round";
+"Gift.AuctionBid.Left" = "left";
+"Gift.AuctionBid.YourBid" = "your bid";
+"Gift.AuctionBid.Winning" = "You're winning";
+"Gift.AuctionBid.Outbid" = "You've been outbid";
+"Gift.AuctionBid.BidPreview" = "Your bid will be";
+"Gift.AuctionBid.TopWinners" = "Top 3 Winners";
+"Gift.AuctionBid.PlaceBid" = "Place a %@ Bid";
+"Gift.AuctionBid.AddToBid" = "Add %@ to Your Bid";
+"Gift.AuctionBid.Placed.Title" = "Your bid has been placed";
+"Gift.AuctionBid.Placed.Text" = "If you fall below the top %@, your bid will roll over to the next drop.";
+"Gift.AuctionBid.Increased.Title" = "Your bid has been increased";
+"Gift.AuctionBid.Increased.Text" = "If you fall below the top %@, your bid will roll over to the next drop.";
+"Gift.AuctionBid.AddMoreStars" = "Add at least %@ to increase your bid.";
+"Gift.AuctionBid.AddMoreStars.Stars_1" = "%@ Star";
+"Gift.AuctionBid.AddMoreStars.Stars_any" = "%@ Stars";
+"Gift.AuctionBid.Top" = "TOP %@";
+"Gift.AuctionBid.Custom" = "Custom";
+
+"Gift.AuctionBid.CustomBid.Title" = "Place a Custom Bid";
+"Gift.AuctionBid.CustomBid.Text" = "If you fall below the top %@, your bid will roll over to the next drop.";
+"Gift.AuctionBid.CustomBid.Placeholder" = "Amount";
+"Gift.AuctionBid.CustomBid.Done" = "Place a Bid";
+
+"Gift.Auction.Context.About" = "About";
+"Gift.Auction.Context.CopyLink" = "Copy Link";
+"Gift.Auction.Context.Share" = "Share";
+
+"Gift.ActiveAuctions.Title_1" = "%@ Active Auction";
+"Gift.ActiveAuctions.Title_any" = "%@ Active Auctions";
+"Gift.ActiveAuctions.Round" = "Round %@ of %@";
+"Gift.ActiveAuctions.Winning" = "Your bid **%@** is ranked **#%@**";
+"Gift.ActiveAuctions.Outbid" = "Your bid **%@** is outbid";
+"Gift.ActiveAuctions.RaiseBid" = "Raise Bid";
+
+"Gift.Acquired.Title_1" = "%@ Item Bought";
+"Gift.Acquired.Title_any" = "%@ Items Bought";
+"Gift.Acquired.Round" = "Round #%@";
+"Gift.Acquired.Recipient" = "Recipient";
+"Gift.Acquired.Date" = "Date";
+"Gift.Acquired.AcceptedBid" = "Accepted Bid";
+"Gift.Acquired.Top" = "TOP %@";
+
+"Gift.Options.Gift.Auction" = "auction";
+
+"Story.Camera.Live" = "Live";
+
+"Chat.Auction" = "Gift Auction";
+"Chat.Auction.ViewResults" = "VIEW RESULTS";
+"Chat.Auction.Join" = "JOIN";
+"Chat.Auction.Finished" = "finished";
+"Chat.Auction.Gifts_1" = "%@ gift";
+"Chat.Auction.Gifts_any" = "%@ gifts";
+
+"Story.Privacy.StartLiveAs" = "Start Live As";
+
+"ChatList.Auctions.ActiveAuction_1" = "Active Auction";
+"ChatList.Auctions.ActiveAuction_any" = "%@ Active Auctions";
+"ChatList.Auctions.Status.Single.Winning" = "You're winning (%@ place).";
+"ChatList.Auctions.Status.Single.PlaceFirst" = "%@st";
+"ChatList.Auctions.Status.Single.PlaceSecond" = "%@nd";
+"ChatList.Auctions.Status.Single.PlaceThird" = "%@rd";
+"ChatList.Auctions.Status.Single.PlaceNTh" = "%@th";
+"ChatList.Auctions.Status.Single.Outbid" = "You've been outbid.";
+"ChatList.Auctions.Status.Many.WinningAll" = "You're winning all of them.";
+"ChatList.Auctions.Status.Many.Outbid_1" = "You've been outbid in %@ of them.";
+"ChatList.Auctions.Status.Many.Outbid_any" = "You've been outbid in %@ of them.";
+"ChatList.Auctions.Status.Many.OutbidAll" = "You've been outbid in all of them.";
+"ChatList.Auctions.View" = "View";
+
+"Gift.Auction.Info.Title" = "Auction";
+"Gift.Auction.Info.Description" = "Join the battle for exclusive gifts.";
+
+"Gift.Auction.Info.TopBidders.Title_1" = "Top %@ Bidder";
+"Gift.Auction.Info.TopBidders.Title_any" = "Top %@ Bidders";
+"Gift.Auction.Info.TopBidders.Text" = "%@ are dropped in %@ to the top %@ by bid amount.";
+"Gift.Auction.Info.TopBidders.Gifts_1" = "%@ gift";
+"Gift.Auction.Info.TopBidders.Gifts_any" = "%@ gifts";
+"Gift.Auction.Info.TopBidders.Rounds_1" = "%@ round";
+"Gift.Auction.Info.TopBidders.Rounds_any" = "%@ rounds";
+"Gift.Auction.Info.TopBidders.Bidders_1" = "%@ bidder";
+"Gift.Auction.Info.TopBidders.Bidders_any" = "%@ bidders";
+
+"Gift.Auction.Info.Carryover.Title" = "Bid Carryover";
+"Gift.Auction.Info.Carryover.Text" = "If your bid leaves the top %@, it will automatically join the next drop.";
+
+"Gift.Auction.Info.Missed.Title" = "Missed Bidders";
+"Gift.Auction.Info.Missed.Text" = "If your bid doesn't win after the final drop, your Stars will be fully refunded.";
+
+"Gift.Auction.Info.Understood" = "Understood";
+
+"Location.SendLocation" = "Send Location";
+
+"Camera.LiveStream.Change" = "change";
+"Camera.LiveStream.StartLiveStream" = "Start Live Stream";
+
+"Camera.LiveStream.End" = "End";
+"Camera.LiveStream.End.Title" = "End Live Stream";
+"Camera.LiveStream.End.Text" = "Are you sure you want to end this live stream?";
+"Camera.LiveStream.End.End" = "End";
+"Camera.LiveStream.End.Leave" = "Leave";
+
+"Message.RepeatAt" = "%1$@ at %2$@";
+"Message.RepeatPeriod.Daily" = "daily";
+"Message.RepeatPeriod.Weekly" = "weekly";
+"Message.RepeatPeriod.Biweekly" = "biweekly";
+"Message.RepeatPeriod.Monthly" = "monthly";
+"Message.RepeatPeriod.3Months" = "every 3 months";
+"Message.RepeatPeriod.6Months" = "every 6 months";
+"Message.RepeatPeriod.Yearly" = "yearly";
+"Message.Approximate" = "appx. %@";
+
+"LiveStreamSettings.Title" = "Live Settings";
+"LiveStreamSettings.TitleEdit" = "Live Stream";
+"LiveStreamSettings.StartLiveAs" = "START LIVE AS";
+"LiveStreamSettings.WhoCanView" = "WHO CAN VIEW THIS LIVE";
+"LiveStreamSettings.WhoCanViewInfo" = "[Select people]() who won't see your live.";
+"LiveStreamSettings.ConnectStream" = "Connect Stream";
+"LiveStreamSettings.ConnectStreamInfo" = "Stream with a different app.";
+"LiveStreamSettings.AllowComments" = "Allow Comments";
+"LiveStreamSettings.AllowScreenshots" = "Allow Screenshots";
+"LiveStreamSettings.PricePerComment" = "PRICE PER COMMENT";
+"LiveStreamSettings.PricePerCommentInfo" = "The price a viewer must pay to send a comment.";
+"LiveStreamSettings.PricePerComment.Free" = "Free";
+"LiveStreamSettings.PricePerComment.Stars_1" = "%@ Star";
+"LiveStreamSettings.PricePerComment.Stars_any" = "%@ Stars";
+"LiveStreamSettings.SaveSettings" = "Save Settings";
+
+"AddContact.Title" = "New Contact";
+"AddContact.PhoneNumber.IsContact"= "This phone number is already in your contacts. [View >]()";
+"AddContact.PhoneNumber.Registered"= "This phone number is on Telegram.";
+"AddContact.PhoneNumber.NotRegistered"= "This phone number is not on Telegram. [Invite >]()";
+"AddContact.SyncToPhone" = "Sync Contact to Phone";
+"AddContact.NotePlaceholder" = "Add notes only visible to you";
+"AddContact.AddQR" = "Add via QR Code";
+
+"ScheduleMessage.Time" = "Time";
+"ScheduleMessage.Repeat" = "Repeat";
+"ScheduleMessage.RepeatPeriod.Never" = "Never";
+"ScheduleMessage.RepeatPeriod.Daily" = "Daily";
+"ScheduleMessage.RepeatPeriod.Weekly" = "Weekly";
+"ScheduleMessage.RepeatPeriod.Biweekly" = "Biweekly";
+"ScheduleMessage.RepeatPeriod.Monthly" = "Monthly";
+"ScheduleMessage.RepeatPeriod.3Months" = "Every 3 Months";
+"ScheduleMessage.RepeatPeriod.6Months" = "Every 6 Months";
+"ScheduleMessage.RepeatPeriod.Yearly" = "Yearly";
+
+"ScheduleMessage.PremiumRequired.Title" = "Premium Required";
+"ScheduleMessage.PremiumRequired.Text" = "Subscribe to **Telegram Premium** to schedule repeating messages.";
+"ScheduleMessage.PremiumRequired.Add" = "Add";
+
+"Stars.Transaction.GiftAuctionBid" = "Gift Auction Bid";
+"Stars.Intro.Transaction.GiftAuctionBid" = "Gift Auction Bid";
+
+"Stars.Intro.Transaction.LiveStreamReaction" = "Live Stream Reaction";
+"Stars.Transaction.LiveStreamReaction" = "Live Stream Reaction";
+"Stars.Transaction.LiveStreamReaction.Text" = "You receive **%@%** of the amount of each reaction.";
+
+"Stars.Intro.Transaction.LiveStreamPaidMessage_1" = "Fee for %@ Live Stream Message";
+"Stars.Intro.Transaction.LiveStreamPaidMessage_any" = "Fee for %@ Live Stream Messages";
+"Stars.Transaction.LiveStreamPaidMessage_1" = "Fee for %@ Live Stream Message";
+"Stars.Transaction.LiveStreamPaidMessage_any" = "Fee for %@ Live Stream Messages";
+"Stars.Transaction.LiveStreamPaidMessage.Text" = "You receive **%@%** of the price that you charge for each incoming message.";
+
+"Notification.StarGift.Subtitle.NoConvert" = "Display this gift on your page and turn it into a collectible.";
+"Notification.StarGift.Subtitle.OtherNoConvert" = "Display this gift on your page and turn it into a collectible.";
+"Gift.View.NoConvertDescription" = "We will notify you once it becomes eligible for unique upgrades.";
+"Gift.View.OtherNoConvertDescription" = "We will notify %1$@ once it becomes eligible for unique upgrades.";
+
+"Gift.AuctionTransfer.Title" = "Change Recipient";
+"Gift.AuctionTransfer.Text" = "The current recipient of this gift is **%@**. Change to **%@**?";
+"Gift.AuctionTransfer.TextFromYourself" = "The current recipient of this gift is you. Change to **%@**?";
+"Gift.AuctionTransfer.TextToYourself" = "The current recipient of this gift is **%@**. Change to yourself?";
+"Gift.AuctionTransfer.Change" = "Change";
+
+"Story.LiveBadge" = "LIVE";
+"SendStarReactions.LiveStreamPerk1Title" = "pin in chat";
+"SendStarReactions.LiveStreamPerk2Title" = "characters";
+"SendStarReactions.LiveStreamPerk3Title" = "emoji";
+"SendStarReactions.LiveStreamMessageTitle" = "Highlight and Pin";
+"SendStarReactions.LiveStreamReactionText" = "Highlight and pin a message\nby adding Stars for **%@**";
+"SendStarReactions.LiveStreamMessageText" = "Highlight and pin a message\nby adding Stars for **%@**";
+"SendStarReactions.OwnLiveStreamCloseButton" = "Close";
+"SendStarReactions.OwnLiveStreamInfoText" = "You can't send star reactions to own story.";
+"SendStarReactions.LiveStreamActionButton" = "Add  # %@";
+
+"LiveStream.CommentsDisabledPlaceholder" = "Comments disabled";
+"LiveStream.LoadingStatus" = "loading...";
+"LiveStream.StoryViewerEmpty" = "no viewers";
+"LiveStream.StoryViewerCount_1" = "1 watching";
+"LiveStream.StoryViewerCount_any" = "%@ watching";
+
+"LiveStream.InputPlaceholder" = "Comment";
+
+"Story.ContextMenuPip" = "Minimize";
+"Story.ContextMenuLiveSettings" = "Live Settings";
+
+"LiveStream.InputContextMenuAddStars" = "Add Stars";
+"LiveStream.InputContextMenuEditStars" = "Edit Stars";
+"LiveStream.InputContextMenuRemoveStars" = "Remove Stars";
+
+"Reminders.DeleteRepeatingTitle" = "Delete Repeating Reminder";
+"Reminders.DeleteRepeatingText" = "Are you sure you want to delete this reminder? This is a repeating reminder.";
+"Reminders.DeleteRepeatingActionSingle" = "Delete This Reminder Only";
+"Reminders.DeleteRepeatingActionMultiple" = "Delete All Future Reminders";
+
+"ScheduledMessages.DeleteRepeatingTitle" = "Delete Repeating Message";
+"ScheduledMessages.DeleteRepeatingText" = "Are you sure you want to delete this scheduled message? This is a repeating message.";
+"ScheduledMessages.DeleteRepeatingActionSingle" = "Delete This Message Only";
+"ScheduledMessages.DeleteRepeatingActionMultiple" = "Delete All Future Messages";
+
+"ChatList.AlertResumeLiveStreamTitle" = "Resume Live Stream";
+"ChatList.AlertResumeLiveStreamText" = "Do you want to resume an existing Live Stream?";
+"ChatList.AlertResumeLiveStreamAction" = "Resume";

build-system/Make/RemoteBuild.py

@@ -25,18 +25,20 @@ def import_module_from_file(module_name, file_path):
 
 
 def session_scp_upload(session, source_path, destination_path):
-    scp_command = 'scp -i {privateKeyPath} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -pr {source_path} containerhost@"{ipAddress}":{destination_path}'.format(
+    print('Using ssh private key path {}'.format(session.private_key_path))
+    scp_command = 'scp -v -i {privateKeyPath} -o LogLevel=VERBOSE -o BatchMode=yes -o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=/dev/null -pr {source_path} containerhost@"{ipAddress}":{destination_path}'.format(
         privateKeyPath=session.private_key_path,
         ipAddress=session.ip_address,
         source_path=shlex.quote(source_path),
         destination_path=shlex.quote(destination_path)
     )
+    print('Running: {}'.format(scp_command))
     if os.system(scp_command) != 0:
         print('Command {} finished with a non-zero status'.format(scp_command))
 
 
 def session_scp_download(session, source_path, destination_path):
-    scp_command = 'scp -i {privateKeyPath} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -pr containerhost@"{ipAddress}":{source_path} {destination_path}'.format(
+    scp_command = 'scp -i {privateKeyPath} -o LogLevel=ERROR -o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=/dev/null -pr containerhost@"{ipAddress}":{source_path} {destination_path}'.format(
         privateKeyPath=session.private_key_path,
         ipAddress=session.ip_address,
         source_path=shlex.quote(source_path),
@@ -47,7 +49,7 @@ def session_scp_download(session, source_path, destination_path):
 
 
 def session_ssh(session, command):
-    ssh_command = 'ssh -i {privateKeyPath} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null containerhost@"{ipAddress}" -o ServerAliveInterval=60 -t "{command}"'.format(
+    ssh_command = 'ssh -i {privateKeyPath} -o LogLevel=ERROR -o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=/dev/null containerhost@"{ipAddress}" -o ServerAliveInterval=60 -t "{command}"'.format(
         privateKeyPath=session.private_key_path,
         ipAddress=session.ip_address,
         command=command
@@ -105,7 +107,7 @@ def remote_build_darwin_containers(darwin_containers_path, darwin_containers_hos
 
     def handle_ssh_credentials(credentials):
         with DarwinContainers.ContainerSession(credentials=credentials) as session:
-            print('Uploading data to container...')
+            print('Uploading data to container {}...'.format(session.ip_address))
 
             session_scp_upload(session=session, source_path=build_input_data_path, destination_path='telegram-build-input')
             session_scp_upload(session=session, source_path='{base_dir}/{buildbox_dir}/transient-data/source.tar'.format(base_dir=base_dir, buildbox_dir=buildbox_dir), destination_path='')