Skip to content

Commit

Permalink
1.7.6 (299)
Browse files Browse the repository at this point in the history
  • Loading branch information
@denis15yo
denis15yo committed Aug 23, 2024
1 parent 8ddc2c9 commit cf539cb
Show file tree
Hide file tree
Showing 309 changed files with 9,686 additions and 3,062 deletions.
28 changes: 23 additions & 5 deletions MODULE.bazel.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Nicegram/NGStats/Sources/ChatsSharing.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ private func extractGeoLocation(
private func extractInviteLinks(_ links: ExportedInvitations?) -> [InviteLink]? {
links?.list?.compactMap { link in
switch link {
case let .link(link, title, isPermanent, requestApproval, isRevoked, adminId, date, startDate, expireDate, usageLimit, count, requestedCount):
case let .link(link, title, isPermanent, requestApproval, isRevoked, adminId, date, startDate, expireDate, usageLimit, count, requestedCount, _):
InviteLink(link: link, title: title, isPermanent: isPermanent, requestApproval: requestApproval, isRevoked: isRevoked, adminId: adminId.id._internalGetInt64Value(), date: date, startDate: startDate, expireDate: expireDate, usageLimit: usageLimit, count: count, requestedCount: requestedCount)
case .publicJoinRequest:
nil
Expand Down
21 changes: 15 additions & 6 deletions Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"location" : "https://github.com/denis15yo/core-swift.git",
"state" : {
"branch" : "release/1.0.0",
"revision" : "ff29d19dc288c4b46f1ba16df1a9b320af384e9b"
"revision" : "78f8920a260775686dd0e04f5045677447bb7a6c"
}
},
{
Expand Down Expand Up @@ -123,7 +123,7 @@
"location" : "git@bitbucket.org:mobyrix/nicegram-assistant-ios.git",
"state" : {
"branch" : "master",
"revision" : "e9129c74ffc2bb0ff74b9ee887bcf37c5a8a00c9"
"revision" : "ae5eb736957ce58b2d3e876df90ecbd252d13fe4"
}
},
{
Expand All @@ -132,7 +132,7 @@
"location" : "git@bitbucket.org:mobyrix/nicegram-wallet-ios.git",
"state" : {
"branch" : "master",
"revision" : "64428c3992ef989f6e9fc943d111c21cc895f4d5"
"revision" : "435678b5aa662b6482f1b56ba904d64526e4b9c6"
}
},
{
Expand Down Expand Up @@ -167,8 +167,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/SDWebImage/SDWebImage.git",
"state" : {
"revision" : "5191b801aca999b704eb93f118f91468b4570571",
"version" : "5.19.6"
"revision" : "8a1be70a625683bc04d6903e2935bf23f3c6d609",
"version" : "5.19.7"
}
},
{
Expand Down Expand Up @@ -288,6 +288,15 @@
"version" : "1.1.6"
}
},
{
"identity" : "swiftui-flow",
"kind" : "remoteSourceControl",
"location" : "https://github.com/denis15yo/SwiftUI-Flow.git",
"state" : {
"branch" : "main",
"revision" : "9d122ace53e143dc3e1bf61c01a024535b0c7ab7"
}
},
{
"identity" : "swiftystorekit",
"kind" : "remoteSourceControl",
Expand Down Expand Up @@ -321,7 +330,7 @@
"location" : "https://github.com/denis15yo/ton-swift.git",
"state" : {
"branch" : "main",
"revision" : "385a83b922f6c4ba1fdb26128086ae35f95893d4"
"revision" : "e08680928f8fd83319c47f1f48301a52ba502b8b"
}
},
{
Expand Down
142 changes: 142 additions & 0 deletions Telegram/Telegram-iOS/en.lproj/Localizable.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9197,6 +9197,8 @@ Sorry for the inconvenience.";

"WebApp.LaunchMoreInfo" = "More about this bot";
"WebApp.LaunchConfirmation" = "To launch this web app, you will connect to its website.";
"WebApp.LaunchTermsConfirmation" = "By launching this mini app, you agree to the [Terms of Service for Mini Apps]().";
"WebApp.LaunchTermsConfirmation_URL" = "https://telegram.org/tos/mini-apps";
"WebApp.LaunchOpenApp" = "Open App";

"WallpaperPreview.PreviewInNightMode" = "Preview this wallpaper in night mode.";
Expand Down Expand Up @@ -12344,6 +12346,7 @@ Sorry for the inconvenience.";
"Stars.Transfer.Purchased.Stars_any" = "%@ Stars";
"Stars.Transfer.UnlockedText" = "You unlocked media for **%1$@**.";
"Stars.Transfer.UnlockInfo" = "Do you want to unlock %1$@ in **%2$@** for **%3$@**?";
"Stars.Transfer.UnlockBotInfo" = "Do you want to unlock %1$@ from **%2$@** for **%3$@**?";

"Stars.Transfer.Balance" = "Balance";

Expand Down Expand Up @@ -12516,6 +12519,7 @@ Sorry for the inconvenience.";
"Notification.StarsGift.Title_any" = "%@ Stars";
"Notification.StarsGift.Subtitle" = "Use Stars to unlock content and services on Telegram.";
"Notification.StarsGift.SubtitleYou" = "With Stars, %@ will be able to unlock content and services on Telegram.";
"Notification.StarsGift.UnknownUser" = "Unknown user";

"Bot.Settings" = "Bot Settings";

Expand Down Expand Up @@ -12544,6 +12548,11 @@ Sorry for the inconvenience.";
"WebBrowser.LinkForwardTooltip.ManyChats.One" = "Link forwarded to **%@** and %@ others";
"WebBrowser.LinkForwardTooltip.SavedMessages.One" = "Link forwarded to **Saved Messages**";

"WebBrowser.FileForwardTooltip.Chat.One" = "Document forwarded to **%@**";
"WebBrowser.FileForwardTooltip.TwoChats.One" = "Document forwarded to **%@** and **%@**";
"WebBrowser.FileForwardTooltip.ManyChats.One" = "Document forwarded to **%@** and %@ others";
"WebBrowser.FileForwardTooltip.SavedMessages.One" = "Document forwarded to **Saved Messages**";

"Stars.Intro.StarsSent_1" = "%@ Star sent.";
"Stars.Intro.StarsSent_any" = "%@ Stars sent.";
"Stars.Intro.StarsSent.ViewChat" = "View Chat";
Expand Down Expand Up @@ -12672,3 +12681,136 @@ Sorry for the inconvenience.";
"Stars.Intro.GiftStars" = "Gift Stars to Friends";

"MediaPicker.CreateSticker" = "Create a sticker from a photo";

"Channel.AdminLog.MessageToggleProfileSignaturesOn" = "%@ enabled admin profiles";
"Channel.AdminLog.MessageToggleProfileSignaturesOff" = "%@ disabled admin profiles";

"Stickers.CreateSticker" = "Create\nSticker";

"InviteLink.CreateNewInfo" = "You can create additional invite links that are limited by time, number of users, or require a paid subscription.";

"InviteLink.CopyShort" = "Copy";
"InviteLink.ShareShort" = "Share";

"Stars.Subscription.Terms" = "By subscribing you agree to the [Terms of Service]().";
"Stars.Subscription.Terms_URL" = "https://telegram.org/tos/stars";

"Stars.Transaction.Reaction.Title" = "Star reaction";
"Stars.Transaction.Reaction.Post" = "Post";

"Stars.Transaction.SubscriptionFee" = "Monthly Subscription Fee";
"Stars.Transaction.Subscription.Title" = "Subscription";
"Stars.Transaction.Subscription.Active" = "If you cancel now, you can still access your subscription until %@";
"Stars.Transaction.Subscription.Cancelled" = "You have cancelled your subscription.";
"Stars.Transaction.Subscription.Renew" = "Renew Subscription";
"Stars.Transaction.Subscription.Cancel" = "Cancel Subscription";
"Stars.Transaction.Subscription.JoinChannel" = "Join Channel";
"Stars.Transaction.Subscription.JoinAgainChannel" = "Join Channel";
"Stars.Transaction.Subscription.LeftChannel" = "You left channel but you can still get back until %@";
"Stars.Transaction.Subscription.Expired" = "Your subscription expired on %@.";
"Stars.Transaction.Subscription.PerMonth" = "%@ / month";
"Stars.Transaction.Subscription.PerMonthUsd" = "appx. %@ per month";
"Stars.Transaction.Subscription.Subscription" = "Subscription";
"Stars.Transaction.Subscription.Subscriber" = "Subscriber";

"Stars.Transaction.Subscription.Status.Expires" = "Expires";
"Stars.Transaction.Subscription.Status.Expired" = "Expired";
"Stars.Transaction.Subscription.Status.Renews" = "Renews";
"Stars.Transaction.Subscription.Status.Subscribed" = "Subscribed";

"Stars.Transaction.Subscription.Cancelled.Title" = "Subscription cancelled";
"Stars.Transaction.Subscription.Cancelled.Text" = "You will still have access to [%1$@]() until %2$@.";

"Stars.Transaction.Subscription.Renewed.Title" = "Subscription renewed";
"Stars.Transaction.Subscription.Renewed.Text" = "You renewed your subscription to [%1$@]().";

"Stars.Intro.Subscriptions.Title" = "MY SUBSCRIPTIONS";
"Stars.Intro.Subscriptions.PerMonth" = "per month";
"Stars.Intro.Subscriptions.Renews" = "renews on %@";
"Stars.Intro.Subscriptions.Expires" = "expires on %@";
"Stars.Intro.Subscriptions.Expired" = "expired on %@";
"Stars.Intro.Subscriptions.Cancelled" = "cancelled";
"Stars.Intro.Subscriptions.ExpiredStatus" = "expired";
"Stars.Intro.Subscriptions.ShowMore" = "Show More";

"Stars.Intro.Transaction.SubscriptionFee.Title" = "Monthly Subscription Fee";
"Stars.Intro.Transaction.Reaction.Title" = "Star Reaction";

"Stars.Purchase.GenericPurchasePurpose" = "Buy Stars to unlock content and services on Telegram.";
"Stars.Purchase.PurchasePurpose.subs" = "Buy Stars to keep all your subscriptions.";

"Stars.Transfer.Subscribe.Channel.Title" = "Subscribe";
"Stars.Transfer.SubscribeInfo" = "Do you want to subscribe to **%1$@** for **%2$@** per month?";
"Stars.Transfer.Subscribe" = "Subscribe";
"Stars.Transfer.Subscribe.Successful.Title" = "Subscription successful!";
"Stars.Transfer.Subscribe.Successful.Text" = "%1$@ transferred to %2$@.";

"Gallery.Ad" = "Ad";

"Chat.SensitiveContent" = "18+ Content";

"Settings.SensitiveContent" = "Show 18+ Content";
"Settings.SensitiveContentInfo" = "Do not hide media that contain content suitable only for adults.";

"SensitiveContent.Title" = "18+ Content";
"SensitiveContent.Text" = "This media may contain sensitive content suitable only for adults.\nDo you still want to view it?";
"SensitiveContent.ShowAlways" = "Always show 18+ media";
"SensitiveContent.ViewAnyway" = "View Anyway";
"SensitiveContent.SettingsInfo" = "You can update the visibility of sensitive media in [Data and Storage > Show 18+ Content]().";

"SensitiveContent.Enable.Title" = "18+ Content";
"SensitiveContent.Enable.Text" = "Confirm that you are over 18 years old and update settings to see potentially explicit and sensitive content.";
"SensitiveContent.Enable.Confirm" = "Confirm";

"Notification.Refund" = "You received a refund of {amount} from {name}";

"InviteLink.SubscriptionFee.Title" = "SUBSCRIPTION FEE";
"InviteLink.SubscriptionFee.PerMonth" = "%@ / month";
"InviteLink.SubscriptionFee.NoOneJoined" = "No one joined yet";
"InviteLink.SubscriptionFee.ApproximateIncome" = "You get approximately %@ monthly";

"InviteLink.PerMonth" = "per month";

"InviteLink.Create.Fee" = "Require Monthly Fee";
"InviteLink.Create.FeePerMonth" = "%@ / month";
"InviteLink.Create.FeePlaceholder" = "Stars amount per month";
"InviteLink.Create.FeeInfo" = "Charge a subscription fee from people joining your channel via this link. [Learn More >]()";
"InviteLink.Create.FeeEditInfo" = "If you need to change the subscription fee, create a new invite link with a different price.";
"InviteLink.Create.RequestApprovalFeeUnavailable" = "You can't enable admin approval for links that require a monthly fee.";

"WebApp.PrivacyPolicy_URL" = "https://telegram.org/privacy-tpa";

"ChatList.SubscriptionsLowBalance.Stars_1" = "%@ Star needed";
"ChatList.SubscriptionsLowBalance.Stars_any" = "%@ Stars needed";

"ChatList.SubscriptionsLowBalance.Single.Title" = "%1$@ for %2$@";
"ChatList.SubscriptionsLowBalance.Single.Text" = "Insufficient funds to cover your subscription.";

"ChatList.SubscriptionsLowBalance.Multiple.Title" = "%@ for your subscriptions";
"ChatList.SubscriptionsLowBalance.Multiple.Text" = "Insufficient funds to cover your subscriptions.";

"ChatList.Search.SectionApps" = "APPS";

"Channel.ShowAuthors" = "Show Authors' Profiles";
"Channel.ShowAuthorsFooter" = "Add names and photos of admins to the messages they post, linking to their profiles.";

"SendStarReactions.Title" = "React with Stars";
"SendStarReactions.Balance" = "Balance";
"SendStarReactions.UserLabelAnonymous" = "Anonymous";
"SendStarReactions.SliderTop" = "TOP";
"SendStarReactions.TextSentStars_1" = "You sent **1** star to support this post.";
"SendStarReactions.TextSentStars_any" = "You sent **%d** stars to support this post.";
"SendStarReactions.TextGeneric" = "Choose how many stars you want to send to **%@** to support this post.";
"SendStarReactions.SectionTop" = "Top Senders";
"SendStarReactions.ShowMyselfInTop" = "Show me in Top Senders";
"SendStarReactions.SendButtonTitle" = "Send # %@";
"SendStarReactions.TermsOfServiceFooter" = "By sending Stars you agree to the [Terms of Service](https://telegram.org/tos/stars)";

"PeerInfo.AllowedReactions.StarReactions" = "Enable Paid Reactions";
"PeerInfo.AllowedReactions.StarReactionsFooter" = "Switch this on to let your subscribers set paid reactions with Telegram Stars, which you will be able to withdraw later as TON. [Learn More >](https://telegram.org/privacy)";

"Chat.ToastStarsSent.Title_1" = "Star sent!";
"Chat.ToastStarsSent.Title_any" = "Stars sent!";
"Chat.ToastStarsSent.Text" = "You have reacted with %1$@ %2$@.";
"Chat.ToastStarsSent.TextStarAmount_1" = "star";
"Chat.ToastStarsSent.TextStarAmount_any" = "stars";
11 changes: 8 additions & 3 deletions submodules/AccountContext/Sources/AccountContext.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ public enum ResolvedUrl {
case startAttach(peerId: PeerId, payload: String?, choose: ResolvedBotChoosePeerTypes?)
case invoice(slug: String, invoice: TelegramMediaInvoice?)
case premiumOffer(reference: String?)
case starsTopup(amount: Int64?)
case starsTopup(amount: Int64, purpose: String?)
case chatFolder(slug: String)
case story(peerId: PeerId, id: Int32)
case boost(peerId: PeerId?, status: ChannelBoostStatus?, myBoostStatus: MyBoostStatus?)
Expand Down Expand Up @@ -923,7 +923,7 @@ public protocol SharedAccountContext: AnyObject {
func makeProxySettingsController(context: AccountContext) -> ViewController
func makeLocalizationListController(context: AccountContext) -> ViewController
func makeCreateGroupController(context: AccountContext, peerIds: [PeerId], initialTitle: String?, mode: CreateGroupMode, completion: ((PeerId, @escaping () -> Void) -> Void)?) -> ViewController
func makeChatRecentActionsController(context: AccountContext, peer: Peer, adminPeerId: PeerId?) -> ViewController
func makeChatRecentActionsController(context: AccountContext, peer: Peer, adminPeerId: PeerId?, starsState: StarsRevenueStats?) -> ViewController
func makePrivacyAndSecurityController(context: AccountContext) -> ViewController
func makeBioPrivacyController(context: AccountContext, settings: Promise<AccountPrivacySettings?>, present: @escaping (ViewController) -> Void)
func makeBirthdayPrivacyController(context: AccountContext, settings: Promise<AccountPrivacySettings?>, openedFromBirthdayScreen: Bool, present: @escaping (ViewController) -> Void)
Expand Down Expand Up @@ -1002,6 +1002,8 @@ public protocol SharedAccountContext: AnyObject {

func makeProxySettingsController(sharedContext: SharedAccountContext, account: UnauthorizedAccount) -> ViewController

func makeDataAndStorageController(context: AccountContext, sensitiveContent: Bool) -> ViewController

func makeInstalledStickerPacksController(context: AccountContext, mode: InstalledStickerPacksControllerMode, forceTheme: PresentationTheme?) -> ViewController

func makeChannelStatsController(context: AccountContext, updatedPresentationData: (initial: PresentationData, signal: Signal<PresentationData, NoError>)?, peerId: EnginePeer.Id, boosts: Bool, boostStatus: ChannelBoostStatus?) -> ViewController
Expand All @@ -1010,9 +1012,12 @@ public protocol SharedAccountContext: AnyObject {

func makeStarsTransactionsScreen(context: AccountContext, starsContext: StarsContext) -> ViewController
func makeStarsPurchaseScreen(context: AccountContext, starsContext: StarsContext, options: [Any], purpose: StarsPurchasePurpose, completion: @escaping (Int64) -> Void) -> ViewController
func makeStarsTransferScreen(context: AccountContext, starsContext: StarsContext, invoice: TelegramMediaInvoice, source: BotPaymentInvoiceSource, extendedMedia: [TelegramExtendedMedia], inputData: Signal<(StarsContext.State, BotPaymentForm, EnginePeer?)?, NoError>, completion: @escaping (Bool) -> Void) -> ViewController
func makeStarsTransferScreen(context: AccountContext, starsContext: StarsContext, invoice: TelegramMediaInvoice, source: BotPaymentInvoiceSource, extendedMedia: [TelegramExtendedMedia], inputData: Signal<(StarsContext.State, BotPaymentForm, EnginePeer?, EnginePeer?)?, NoError>, completion: @escaping (Bool) -> Void) -> ViewController
func makeStarsSubscriptionTransferScreen(context: AccountContext, starsContext: StarsContext, invoice: TelegramMediaInvoice, link: String, inputData: Signal<(StarsContext.State, BotPaymentForm, EnginePeer?, EnginePeer?)?, NoError>, navigateToPeer: @escaping (EnginePeer) -> Void) -> ViewController
func makeStarsTransactionScreen(context: AccountContext, transaction: StarsContext.State.Transaction, peer: EnginePeer) -> ViewController
func makeStarsReceiptScreen(context: AccountContext, receipt: BotPaymentReceipt) -> ViewController
func makeStarsSubscriptionScreen(context: AccountContext, subscription: StarsContext.State.Subscription, update: @escaping (Bool) -> Void) -> ViewController
func makeStarsSubscriptionScreen(context: AccountContext, peer: EnginePeer, pricing: StarsSubscriptionPricing, importer: PeerInvitationImportersState.Importer, usdRate: Double) -> ViewController
func makeStarsStatisticsScreen(context: AccountContext, peerId: EnginePeer.Id, revenueContext: StarsRevenueStatsContext) -> ViewController
func makeStarsAmountScreen(context: AccountContext, initialValue: Int64?, completion: @escaping (Int64) -> Void) -> ViewController
func makeStarsWithdrawalScreen(context: AccountContext, stats: StarsRevenueStats, completion: @escaping (Int64) -> Void) -> ViewController
Expand Down
Loading

0 comments on commit cf539cb

Please sign in to comment.