From 8d15bc27d96f58d37b33b7bc8230498607bab874 Mon Sep 17 00:00:00 2001 From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com> Date: Thu, 5 Mar 2026 13:49:31 +0400 Subject: [PATCH] core: fix orphan instances --- src/Simplex/Chat/Types.hs | 2 -- src/Simplex/Chat/Types/Shared.hs | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Simplex/Chat/Types.hs b/src/Simplex/Chat/Types.hs index 2ed3298460..ee2ac1447b 100644 --- a/src/Simplex/Chat/Types.hs +++ b/src/Simplex/Chat/Types.hs @@ -2003,8 +2003,6 @@ $(JQ.deriveJSON defaultJSON ''PendingContactConnection) $(JQ.deriveJSON defaultJSON ''GroupSupportChat) -$(JQ.deriveJSON (enumJSON $ dropPrefix "RS") ''RelayStatus) - $(JQ.deriveJSON defaultJSON ''GroupMember) $(JQ.deriveJSON (enumJSON $ dropPrefix "MF") ''MsgFilter) diff --git a/src/Simplex/Chat/Types/Shared.hs b/src/Simplex/Chat/Types/Shared.hs index f33719a434..dfc932c35d 100644 --- a/src/Simplex/Chat/Types/Shared.hs +++ b/src/Simplex/Chat/Types/Shared.hs @@ -1,15 +1,18 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE TemplateHaskell #-} module Simplex.Chat.Types.Shared where import Data.Aeson (FromJSON (..), ToJSON (..)) +import qualified Data.Aeson.TH as JQ import qualified Data.Attoparsec.ByteString.Char8 as A import qualified Data.ByteString.Char8 as B import Data.Text (Text) import Simplex.Chat.Options.DB (FromField (..), ToField (..)) import Simplex.Messaging.Agent.Store.DB (fromTextField_) import Simplex.Messaging.Encoding.String +import Simplex.Messaging.Parsers (dropPrefix, enumJSON) import Simplex.Messaging.Util ((<$?>)) data GroupMemberRole @@ -105,3 +108,5 @@ instance TextEncoding RelayStatus where instance FromField RelayStatus where fromField = fromTextField_ textDecode instance ToField RelayStatus where toField = toField . textEncode + +$(JQ.deriveJSON (enumJSON $ dropPrefix "RS") ''RelayStatus)