dandri/simplex-chat
1
0 Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-10-23 02:12:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into ab/names-lookup-api

Browse Source
This commit is contained in:
Alain Brenzikofer committed 2026-09-23 19:39:09 +02:00
2 parents 0dd4cea07c 692b0026e7
commit 75b59f4dec
238 files changed
+6294 -4002
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

apps/ios/Shared/Model/SimpleXAPI.swift
+7 -6
View File
@@ -2205,12 +2205,7 @@ func redeemErrorText(_ error: Error) -> String {
case .invalidCode: return NSLocalizedString("This code is not valid.", comment: "alert message")
case .serviceNotConfigured: return NSLocalizedString("This app version cannot redeem badge codes.", comment: "alert message")
case .badgeActive: return NSLocalizedString("This profile already has a badge. Redeem the code on another profile, or once this badge ends.", comment: "alert message")
case .serviceError(.codeInvalid): return NSLocalizedString("This code was not recognised.", comment: "alert message")
case .serviceError(.codeUsed): return NSLocalizedString("This code has already been used.", comment: "alert message")
case .serviceError(.codeExpired): return NSLocalizedString("This code has expired.", comment: "alert message")
case .serviceError(.rateLimited): return NSLocalizedString("Too many attempts. Please try again later.", comment: "alert message")
case .serviceError(.unsupportedVersion): return NSLocalizedString("This app version is too old for the badge service. Please update the app.", comment: "alert message")
case .serviceError: break
case let .serviceError(code): if let text = badgeServiceErrorText(code) { return text }
case let .invalidResponse(message):
return String.localizedStringWithFormat(NSLocalizedString("The badge service sent an unexpected response: %@", comment: "alert message"), message)
case .unknownKeyIndex, .credentialNotVerified: return NSLocalizedString("This app version cannot verify this badge. Please update the app.", comment: "alert message")
@@ -2231,6 +2226,12 @@ func apiGetBadgeStateSync(_ userId: Int64) throws -> BadgeState? {
throw r.unexpected
}
func apiGetBadgeLedger(_ userId: Int64, _ badgePurchaseId: Int64) async throws -> [StatementEntry] {
let r: ChatResponse2 = try await chatSendCmd(.apiGetBadgeLedger(userId: userId, badgePurchaseId: badgePurchaseId))
if case let .badgeLedger(_, badgeLedger) = r { return badgeLedger }
throw r.unexpected
}
func apiAckBadgeAlert(_ userId: Int64, _ badgePurchaseId: Int64, _ alertKind: BadgeAlertKind, snooze: Bool, episode: String) async throws -> BadgeState? {
let r: ChatResponse2 = try await chatSendCmd(.apiAckBadgeAlert(userId: userId, badgePurchaseId: badgePurchaseId, alertKind: alertKind, snooze: snooze, episode: episode))
if case let .badgeState(_, badgeState) = r { return badgeState }