From 1dbccd8be16a299f09c52fdbfb73e7871544b036 Mon Sep 17 00:00:00 2001 From: shum Date: Thu, 22 Oct 2026 03:42:36 +0000 Subject: [PATCH] store: one addressText for the names views --- apps/simplex-store-service/src/StoreService/Names/View.hs | 2 +- .../src/StoreService/Web/Names/Search.hs | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/apps/simplex-store-service/src/StoreService/Names/View.hs b/apps/simplex-store-service/src/StoreService/Names/View.hs index c67f5c6b1c..96de0f3847 100644 --- a/apps/simplex-store-service/src/StoreService/Names/View.hs +++ b/apps/simplex-store-service/src/StoreService/Names/View.hs @@ -2,7 +2,7 @@ {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE OverloadedStrings #-} -module StoreService.Names.View (ViewReads (..), registrationView, readViewChain, viewJSON, tldText) where +module StoreService.Names.View (ViewReads (..), registrationView, readViewChain, viewJSON, addressText, tldText) where import Data.Aeson ((.=)) import qualified Data.Aeson as J diff --git a/apps/simplex-store-service/src/StoreService/Web/Names/Search.hs b/apps/simplex-store-service/src/StoreService/Web/Names/Search.hs index 35bf4d1555..4ab8d095c5 100644 --- a/apps/simplex-store-service/src/StoreService/Web/Names/Search.hs +++ b/apps/simplex-store-service/src/StoreService/Web/Names/Search.hs @@ -16,14 +16,11 @@ import qualified Data.ByteString.Char8 as B import Data.Char (isDigit) import Data.Text (Text) import qualified Data.Text as T -import Data.Text.Encoding (decodeLatin1) import Data.Time.Clock.POSIX (utcTimeToPOSIXSeconds) import Network.HTTP.Types (status200) import Network.Wai (Request, Response, ResponseReceived, queryString) import Simplex.Chat.Badges.Code (maxNameLength, minNameLength) import Simplex.Messaging.Agent.Store.Common (DBStore, withTransaction) -import Simplex.Messaging.Encoding.String (strEncode) -import Simplex.Messaging.Eth.Address (Address) import Simplex.Messaging.SimplexName (LabelHash (..)) import Simplex.Messaging.Util (tshow) import StoreService.Config (ChainConfig (..), NamesConfig (..)) @@ -33,7 +30,7 @@ import StoreService.Names.Contracts import StoreService.Names.Links (LinkKind (..), linkKindOf) import StoreService.Names.Profiles (Entity, Profiles, linkEntity, linkPreview) import StoreService.Names.Store (isLabelRegistering) -import StoreService.Names.View (tldText) +import StoreService.Names.View (addressText, tldText) import StoreService.Web.Http (Respond, badRequest, invalidLink, invalidName, jsonResponse, maxBodyBytes, providerUnavailable, readBoundedBody) import System.Timeout (timeout) import Text.Read (readMaybe) @@ -125,6 +122,3 @@ previewHandler ps req respond = Just (J.String link) | Just kind <- linkKindOf link -> respond . jsonResponse status200 . J.toJSON =<< linkPreview ps kind link _ -> respond invalidLink _ -> respond badRequest - -addressText :: Address -> Text -addressText = decodeLatin1 . strEncode