diff --git a/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt b/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt index a817c402e..7f295029d 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt @@ -3398,7 +3398,6 @@ class AutoAccept(val acceptIncognito: Boolean, val autoReply: MsgContent?) { @Serializable data class CoreVersionInfo( val version: String, - val buildTimestamp: String, val simplexmqVersion: String, val simplexmqCommit: String ) diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/VersionInfoView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/VersionInfoView.kt index ee2443d72..64a541a3a 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/VersionInfoView.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/VersionInfoView.kt @@ -23,7 +23,6 @@ fun VersionInfoView(info: CoreVersionInfo) { Text(String.format(stringResource(R.string.app_version_name), BuildConfig.VERSION_NAME)) Text(String.format(stringResource(R.string.app_version_code), BuildConfig.VERSION_CODE)) Text(String.format(stringResource(R.string.core_version), info.version)) - Text(String.format(stringResource(R.string.core_build_timestamp), info.buildTimestamp)) val simplexmqCommit = if (info.simplexmqCommit.length >= 7) info.simplexmqCommit.substring(startIndex = 0, endIndex = 7) else info.simplexmqCommit Text(String.format(stringResource(R.string.core_simplexmq_version), info.simplexmqVersion, simplexmqCommit)) } diff --git a/apps/android/app/src/main/res/values-cs/strings.xml b/apps/android/app/src/main/res/values-cs/strings.xml index 92a218538..449f875ce 100644 --- a/apps/android/app/src/main/res/values-cs/strings.xml +++ b/apps/android/app/src/main/res/values-cs/strings.xml @@ -655,7 +655,6 @@ Verze aplikace Verze aplikace: v%s Verze jádra: v%s - Jádro sestaveno: %s Smazat adresu\? Všechny vaše kontakty zůstanou připojeny. Žádosti o kontakt diff --git a/apps/android/app/src/main/res/values-de/strings.xml b/apps/android/app/src/main/res/values-de/strings.xml index 4f27d3191..e9ae2b7b0 100644 --- a/apps/android/app/src/main/res/values-de/strings.xml +++ b/apps/android/app/src/main/res/values-de/strings.xml @@ -1000,7 +1000,6 @@ App Build: %s App Version App Version: v%s - Core übersetzt am: %s Core Version: v%s Profil hinzufügen Alle Chats und Nachrichten werden gelöscht! Dies kann nicht rückgängig gemacht werden! diff --git a/apps/android/app/src/main/res/values-es/strings.xml b/apps/android/app/src/main/res/values-es/strings.xml index 7e0b3ad4c..23da22ba2 100644 --- a/apps/android/app/src/main/res/values-es/strings.xml +++ b/apps/android/app/src/main/res/values-es/strings.xml @@ -253,7 +253,6 @@ Base de Datos y \nContraseña Contribuye - Core compilado: %s Core versión: v%s Solicitud del contacto Eliminar imagen diff --git a/apps/android/app/src/main/res/values-fr/strings.xml b/apps/android/app/src/main/res/values-fr/strings.xml index e5e6fd6ed..8921f5e40 100644 --- a/apps/android/app/src/main/res/values-fr/strings.xml +++ b/apps/android/app/src/main/res/values-fr/strings.xml @@ -925,7 +925,6 @@ simplexmq : v%s (%2s) Build de l\'app : %s Version de l\'app : v%s - Cœur compilé le : %s Version du cœur : v%s Nombre de PING Toutes les discussions et tous les messages seront supprimés - il est impossible de revenir en arrière ! diff --git a/apps/android/app/src/main/res/values-it/strings.xml b/apps/android/app/src/main/res/values-it/strings.xml index 2ee5625f2..ef1aadacc 100644 --- a/apps/android/app/src/main/res/values-it/strings.xml +++ b/apps/android/app/src/main/res/values-it/strings.xml @@ -927,7 +927,6 @@ simplexmq: v%s (%2s) Build dell\'app: %s Versione app: v%s - Core compilato il: %s I server per le nuove connessioni del profilo di chat attuale Aggiungi profilo Eliminare il profilo di chat\? diff --git a/apps/android/app/src/main/res/values-ja/strings.xml b/apps/android/app/src/main/res/values-ja/strings.xml index fa9a28cda..849783d91 100644 --- a/apps/android/app/src/main/res/values-ja/strings.xml +++ b/apps/android/app/src/main/res/values-ja/strings.xml @@ -540,7 +540,6 @@ マークダウン (書式編集) ガイド サーバを手動で入力 接続にオニオンのホストが必要となります。 - コアのビルド@: %s アドレスを作成 アドレスを削除しますか? 表示の名前: diff --git a/apps/android/app/src/main/res/values-ko/strings.xml b/apps/android/app/src/main/res/values-ko/strings.xml index ff1516331..79771994c 100644 --- a/apps/android/app/src/main/res/values-ko/strings.xml +++ b/apps/android/app/src/main/res/values-ko/strings.xml @@ -206,7 +206,6 @@ 대화 상대와 메시지가 삭제돼요. 삭제 후 되돌릴 수 없어요! 대화 상대와 종단간 암호화됨 대화 상대와 아직 연결되지 않았어요! - 코어 빌드: %s %1$s에 생성 완료 일회용 초대 링크 생성 비밀 그룹 생성 diff --git a/apps/android/app/src/main/res/values-lt/strings.xml b/apps/android/app/src/main/res/values-lt/strings.xml index 41214385d..30600ff52 100644 --- a/apps/android/app/src/main/res/values-lt/strings.xml +++ b/apps/android/app/src/main/res/values-lt/strings.xml @@ -159,7 +159,6 @@ Neteisingas saugumo kodas! Įrašyti serverius Įrašyti serverius\? - Branduolys sudarytas: %s Sukurti adresą Ištrinti adresą Klaida įrašant naudotojo slaptažodį diff --git a/apps/android/app/src/main/res/values-nl/strings.xml b/apps/android/app/src/main/res/values-nl/strings.xml index 3206df448..8abc6ca75 100644 --- a/apps/android/app/src/main/res/values-nl/strings.xml +++ b/apps/android/app/src/main/res/values-nl/strings.xml @@ -174,7 +174,6 @@ Bijdragen ICE servers configureren Verbinding - Core gebouwd op: %s Core versie: v%s verbonden Verbinden… diff --git a/apps/android/app/src/main/res/values-pl/strings.xml b/apps/android/app/src/main/res/values-pl/strings.xml index f5ae2d8e4..486914072 100644 --- a/apps/android/app/src/main/res/values-pl/strings.xml +++ b/apps/android/app/src/main/res/values-pl/strings.xml @@ -344,7 +344,6 @@ \nUwaga: jeśli masz wiele połączeń, zużycie baterii i ruchu może być znacznie wyższe, a niektóre połączenia mogą się nie udać. Profil czatu Połączenie - Kompilacja rdzenia: %s Wersja rdzenia: v%s Błąd zapisu serwerów ICE Serwery ICE (po jednym na linię) diff --git a/apps/android/app/src/main/res/values-pt-rBR/strings.xml b/apps/android/app/src/main/res/values-pt-rBR/strings.xml index 52724438d..97e242bbc 100644 --- a/apps/android/app/src/main/res/values-pt-rBR/strings.xml +++ b/apps/android/app/src/main/res/values-pt-rBR/strings.xml @@ -664,7 +664,6 @@ Os hosts Onion serão necessários para a conexão. Os hosts Onion serão necessários para a conexão. Versão principal: v%s - Núcleo construído em: %s Leia mais no nosso repositório do GitHub. Pode ser mudado mais tarde via configurações. %1$s quer se conectar com você via diff --git a/apps/android/app/src/main/res/values-ru/strings.xml b/apps/android/app/src/main/res/values-ru/strings.xml index dc7079464..5b5939b69 100644 --- a/apps/android/app/src/main/res/values-ru/strings.xml +++ b/apps/android/app/src/main/res/values-ru/strings.xml @@ -1025,7 +1025,6 @@ Отдельное TCP-соединение (и авторизация SOCKS) будет использоваться для каждого контакта и члена группы. \nОбратите внимание: если у Вас много контактов, потребление батареи и трафика может быть значительно выше, и некоторые соединения могут не работать. Отдельное TCP-соединение (и авторизация SOCKS) будет использоваться для каждого профиля чата, который Вы имеете в приложении. - Ядро скомпилировано: %s Версия ядра: v%s Удалить профиль чата\? Удалить профиль чата для diff --git a/apps/android/app/src/main/res/values-zh-rCN/strings.xml b/apps/android/app/src/main/res/values-zh-rCN/strings.xml index 473151925..e74fe3481 100644 --- a/apps/android/app/src/main/res/values-zh-rCN/strings.xml +++ b/apps/android/app/src/main/res/values-zh-rCN/strings.xml @@ -363,7 +363,6 @@ 端到端加密语音通话 ICE 服务器(每行一个) 创建地址 - 核心构建于:%s 核心版本: v%s 显示名: 全名: diff --git a/apps/android/app/src/main/res/values-zh-rTW/strings.xml b/apps/android/app/src/main/res/values-zh-rTW/strings.xml index e7a54a18b..c2a37deb3 100644 --- a/apps/android/app/src/main/res/values-zh-rTW/strings.xml +++ b/apps/android/app/src/main/res/values-zh-rTW/strings.xml @@ -425,7 +425,6 @@ 刪除地址 顏色 如何使用你的伺服器 - 核心建立於:%s 使用連結連接 💻 桌面版:於應用程式內掃描一個已存在的二維碼,透過二維碼掃描。 設定 diff --git a/apps/android/app/src/main/res/values/strings.xml b/apps/android/app/src/main/res/values/strings.xml index 873305dde..6aa7a83b4 100644 --- a/apps/android/app/src/main/res/values/strings.xml +++ b/apps/android/app/src/main/res/values/strings.xml @@ -556,7 +556,6 @@ App version: v%s App build: %s Core version: v%s - Core built at: %s simplexmq: v%s (%2s) Show: Hide: diff --git a/apps/ios/Shared/Views/UserSettings/VersionView.swift b/apps/ios/Shared/Views/UserSettings/VersionView.swift index 9f13e4a95..0fc2b4cb3 100644 --- a/apps/ios/Shared/Views/UserSettings/VersionView.swift +++ b/apps/ios/Shared/Views/UserSettings/VersionView.swift @@ -18,7 +18,6 @@ struct VersionView: View { Text("App build: \(appBuild ?? "?")") if let info = versionInfo { Text("Core version: v\(info.version)") - Text("Core built at: \(info.buildTimestamp)") if let v = try? AttributedString(markdown: "simplexmq: v\(info.simplexmqVersion) ([\(info.simplexmqCommit.prefix(7))](https://github.com/simplex-chat/simplexmq/commit/\(info.simplexmqCommit)))") { Text(v) } diff --git a/apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff b/apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff index 41845a1d1..226358a00 100644 --- a/apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff +++ b/apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff @@ -947,11 +947,6 @@ Kopírovat chat item action - - Core built at: %@ - Jádro sestavené na: %@ - No comment provided by engineer. - Core version: v%@ Verze jádra: v%@ diff --git a/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff b/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff index 0340acbc5..eca31200f 100644 --- a/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff +++ b/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff @@ -947,11 +947,6 @@ Kopieren chat item action - - Core built at: %@ - Core übersetzt am: %@ - No comment provided by engineer. - Core version: v%@ Core Version: v%@ diff --git a/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff b/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff index 849f5130d..524d253fb 100644 --- a/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff +++ b/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff @@ -955,11 +955,6 @@ Copy chat item action - - Core built at: %@ - Core built at: %@ - No comment provided by engineer. - Core version: v%@ Core version: v%@ diff --git a/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff b/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff index 4276de3cd..9deefbc2d 100644 --- a/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff +++ b/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff @@ -955,11 +955,6 @@ Copiar chat item action - - Core built at: %@ - Core compilado en: %@ - No comment provided by engineer. - Core version: v%@ Versión Core: v%@ diff --git a/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff b/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff index 9e6dbbc94..c8393c13d 100644 --- a/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff +++ b/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff @@ -955,11 +955,6 @@ Copier chat item action - - Core built at: %@ - Cœur compilé le : %@ - No comment provided by engineer. - Core version: v%@ Version du cœur : v%@ diff --git a/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff b/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff index dbd6245fc..cda6d3771 100644 --- a/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff +++ b/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff @@ -955,11 +955,6 @@ Copia chat item action - - Core built at: %@ - Core compilato il: %@ - No comment provided by engineer. - Core version: v%@ Versione core: v%@ diff --git a/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff b/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff index 8f00cdfa4..5bac85622 100644 --- a/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff +++ b/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff @@ -955,11 +955,6 @@ Kopiëren chat item action - - Core built at: %@ - Core built at: %@ - No comment provided by engineer. - Core version: v%@ Core versie: v% @ diff --git a/apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff b/apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff index 8479fc7c1..895837846 100644 --- a/apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff +++ b/apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff @@ -955,11 +955,6 @@ Kopiuj chat item action - - Core built at: %@ - Kompilacja rdzenia: %@ - No comment provided by engineer. - Core version: v%@ Wersja rdzenia: v%@ diff --git a/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff b/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff index fcda6a846..074d0f1c2 100644 --- a/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff +++ b/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff @@ -947,11 +947,6 @@ Скопировать chat item action - - Core built at: %@ - Ядро скомпилировано: %@ - No comment provided by engineer. - Core version: v%@ Версия ядра: v%@ diff --git a/apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff b/apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff index a56def180..ba1c4de3d 100644 --- a/apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff +++ b/apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff @@ -955,11 +955,6 @@ 复制 chat item action - - Core built at: %@ - 核心构建于:%@ - No comment provided by engineer. - Core version: v%@ 核心版本: v%@ diff --git a/apps/ios/SimpleXChat/APITypes.swift b/apps/ios/SimpleXChat/APITypes.swift index 75c2ed540..857221cff 100644 --- a/apps/ios/SimpleXChat/APITypes.swift +++ b/apps/ios/SimpleXChat/APITypes.swift @@ -1153,7 +1153,6 @@ public enum NotificationPreviewMode: String, SelectableItem { public struct CoreVersionInfo: Decodable { public var version: String - public var buildTimestamp: String public var simplexmqVersion: String public var simplexmqCommit: String } diff --git a/apps/ios/cs.lproj/Localizable.strings b/apps/ios/cs.lproj/Localizable.strings index 75132b276..8a4ba69af 100644 --- a/apps/ios/cs.lproj/Localizable.strings +++ b/apps/ios/cs.lproj/Localizable.strings @@ -656,9 +656,6 @@ /* chat item action */ "Copy" = "Kopírovat"; -/* No comment provided by engineer. */ -"Core built at: %@" = "Jádro sestavené na: %@"; - /* No comment provided by engineer. */ "Core version: v%@" = "Verze jádra: v%@"; diff --git a/apps/ios/de.lproj/Localizable.strings b/apps/ios/de.lproj/Localizable.strings index 12ea011e4..46d5dcb98 100644 --- a/apps/ios/de.lproj/Localizable.strings +++ b/apps/ios/de.lproj/Localizable.strings @@ -656,9 +656,6 @@ /* chat item action */ "Copy" = "Kopieren"; -/* No comment provided by engineer. */ -"Core built at: %@" = "Core übersetzt am: %@"; - /* No comment provided by engineer. */ "Core version: v%@" = "Core Version: v%@"; diff --git a/apps/ios/es.lproj/Localizable.strings b/apps/ios/es.lproj/Localizable.strings index 0a3d0dc0b..4b975f3e5 100644 --- a/apps/ios/es.lproj/Localizable.strings +++ b/apps/ios/es.lproj/Localizable.strings @@ -680,9 +680,6 @@ /* chat item action */ "Copy" = "Copiar"; -/* No comment provided by engineer. */ -"Core built at: %@" = "Core compilado en: %@"; - /* No comment provided by engineer. */ "Core version: v%@" = "Versión Core: v%@"; diff --git a/apps/ios/fr.lproj/Localizable.strings b/apps/ios/fr.lproj/Localizable.strings index 1b8679333..0efce04a3 100644 --- a/apps/ios/fr.lproj/Localizable.strings +++ b/apps/ios/fr.lproj/Localizable.strings @@ -680,9 +680,6 @@ /* chat item action */ "Copy" = "Copier"; -/* No comment provided by engineer. */ -"Core built at: %@" = "Cœur compilé le : %@"; - /* No comment provided by engineer. */ "Core version: v%@" = "Version du cœur : v%@"; diff --git a/apps/ios/it.lproj/Localizable.strings b/apps/ios/it.lproj/Localizable.strings index fe173fb93..62de299b9 100644 --- a/apps/ios/it.lproj/Localizable.strings +++ b/apps/ios/it.lproj/Localizable.strings @@ -680,9 +680,6 @@ /* chat item action */ "Copy" = "Copia"; -/* No comment provided by engineer. */ -"Core built at: %@" = "Core compilato il: %@"; - /* No comment provided by engineer. */ "Core version: v%@" = "Versione core: v%@"; diff --git a/apps/ios/nl.lproj/Localizable.strings b/apps/ios/nl.lproj/Localizable.strings index 4f168cf35..92c9bc5b7 100644 --- a/apps/ios/nl.lproj/Localizable.strings +++ b/apps/ios/nl.lproj/Localizable.strings @@ -680,9 +680,6 @@ /* chat item action */ "Copy" = "Kopiëren"; -/* No comment provided by engineer. */ -"Core built at: %@" = "Core built at: %@"; - /* No comment provided by engineer. */ "Core version: v%@" = "Core versie: v% @"; diff --git a/apps/ios/pl.lproj/Localizable.strings b/apps/ios/pl.lproj/Localizable.strings index c8f52dd87..22a9b4b26 100644 --- a/apps/ios/pl.lproj/Localizable.strings +++ b/apps/ios/pl.lproj/Localizable.strings @@ -680,9 +680,6 @@ /* chat item action */ "Copy" = "Kopiuj"; -/* No comment provided by engineer. */ -"Core built at: %@" = "Kompilacja rdzenia: %@"; - /* No comment provided by engineer. */ "Core version: v%@" = "Wersja rdzenia: v%@"; diff --git a/apps/ios/ru.lproj/Localizable.strings b/apps/ios/ru.lproj/Localizable.strings index 28e626479..36a358be6 100644 --- a/apps/ios/ru.lproj/Localizable.strings +++ b/apps/ios/ru.lproj/Localizable.strings @@ -656,9 +656,6 @@ /* chat item action */ "Copy" = "Скопировать"; -/* No comment provided by engineer. */ -"Core built at: %@" = "Ядро скомпилировано: %@"; - /* No comment provided by engineer. */ "Core version: v%@" = "Версия ядра: v%@"; diff --git a/apps/ios/zh-Hans.lproj/Localizable.strings b/apps/ios/zh-Hans.lproj/Localizable.strings index cbfc39437..f3041985c 100644 --- a/apps/ios/zh-Hans.lproj/Localizable.strings +++ b/apps/ios/zh-Hans.lproj/Localizable.strings @@ -680,9 +680,6 @@ /* chat item action */ "Copy" = "复制"; -/* No comment provided by engineer. */ -"Core built at: %@" = "核心构建于:%@"; - /* No comment provided by engineer. */ "Core version: v%@" = "核心版本: v%@"; diff --git a/src/Simplex/Chat.hs b/src/Simplex/Chat.hs index 56d3054cb..a78064656 100644 --- a/src/Simplex/Chat.hs +++ b/src/Simplex/Chat.hs @@ -1467,7 +1467,7 @@ processChatCommand = \case p {groupPreferences = Just . setGroupPreference' SGFTimedMessages pref $ groupPreferences p} QuitChat -> liftIO exitSuccess ShowVersion -> do - let versionInfo = coreVersionInfo $(buildTimestampQ) $(simplexmqCommitQ) + let versionInfo = coreVersionInfo $(simplexmqCommitQ) chatMigrations <- map upMigration <$> withStore' Migrations.getCurrent agentMigrations <- withAgent getAgentMigrations pure $ CRVersionInfo {versionInfo, chatMigrations, agentMigrations} diff --git a/src/Simplex/Chat/Controller.hs b/src/Simplex/Chat/Controller.hs index 6f2dafeba..5dd604866 100644 --- a/src/Simplex/Chat/Controller.hs +++ b/src/Simplex/Chat/Controller.hs @@ -33,8 +33,7 @@ import Data.Map.Strict (Map) import Data.String import Data.Text (Text) import Data.Time (ZonedTime) -import Data.Time.Clock (UTCTime, getCurrentTime) -import Data.Time.Format (defaultTimeLocale, formatTime, iso8601DateFormat) +import Data.Time.Clock (UTCTime) import Data.Version (showVersion) import GHC.Generics (Generic) import Language.Haskell.TH (Exp, Q, runIO) @@ -73,11 +72,6 @@ versionString version = "SimpleX Chat v" <> version updateStr :: String updateStr = "To update run: curl -o- https://raw.githubusercontent.com/simplex-chat/simplex-chat/master/install.sh | bash" -buildTimestampQ :: Q Exp -buildTimestampQ = do - s <- formatTime defaultTimeLocale (iso8601DateFormat $ Just "%H:%M:%S") <$> runIO getCurrentTime - [|fromString s|] - simplexmqCommitQ :: Q Exp simplexmqCommitQ = do s <- either error B.unpack . A.parseOnly commitHashP <$> runIO (B.readFile "./cabal.project") @@ -92,11 +86,10 @@ simplexmqCommitQ = do *> "tag: " *> A.takeWhile (A.notInClass " \r\n") -coreVersionInfo :: String -> String -> CoreVersionInfo -coreVersionInfo buildTimestamp simplexmqCommit = +coreVersionInfo :: String -> CoreVersionInfo +coreVersionInfo simplexmqCommit = CoreVersionInfo { version = versionNumber, - buildTimestamp, simplexmqVersion = simplexMQVersion, simplexmqCommit } @@ -724,7 +717,6 @@ data ChatLogLevel = CLLDebug | CLLInfo | CLLWarning | CLLError | CLLImportant data CoreVersionInfo = CoreVersionInfo { version :: String, - buildTimestamp :: String, simplexmqVersion :: String, simplexmqCommit :: String } diff --git a/src/Simplex/Chat/View.hs b/src/Simplex/Chat/View.hs index 6a401f69d..754c14fd2 100644 --- a/src/Simplex/Chat/View.hs +++ b/src/Simplex/Chat/View.hs @@ -1240,10 +1240,10 @@ instance ToJSON WCallCommand where toJSON = J.genericToJSON . taggedObjectJSON $ dropPrefix "WCCall" viewVersionInfo :: ChatLogLevel -> CoreVersionInfo -> [StyledString] -viewVersionInfo logLevel CoreVersionInfo {version, buildTimestamp, simplexmqVersion, simplexmqCommit} = +viewVersionInfo logLevel CoreVersionInfo {version, simplexmqVersion, simplexmqCommit} = map plain $ if logLevel <= CLLInfo - then [versionString version <> parens buildTimestamp, updateStr, "simplexmq: " <> simplexmqVersion <> parens simplexmqCommit] + then [versionString version, updateStr, "simplexmq: " <> simplexmqVersion <> parens simplexmqCommit] else [versionString version, updateStr] where parens s = " (" <> s <> ")"