blade/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2024-12-17 17:20:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

core: include pending group link connections into chat previews on joining side (#1291)

Browse Source
This commit is contained in:
JRoberts
2022-11-04 12:00:03 +04:00
committed by GitHub
parent 5243613045
commit d432dfba21
8 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Simplex/Chat/Call.hs
+3 -3
View File
@@ -21,7 +21,7 @@ import Data.Time.Clock (UTCTime)
import Database.SQLite.Simple.FromField (FromField (..))
import Database.SQLite.Simple.ToField (ToField (..))
import GHC.Generics (Generic)
import Simplex.Chat.Types (Contact, ContactId, decodeJson, encodeJson)
import Simplex.Chat.Types (Contact, ContactId, decodeJSON, encodeJSON)
import qualified Simplex.Messaging.Crypto as C
import Simplex.Messaging.Encoding.String
import Simplex.Messaging.Parsers (dropPrefix, enumJSON, fromTextField_, fstToLower, singleFieldJSON)
@@ -100,10 +100,10 @@ instance ToJSON CallState where
toEncoding = J.genericToEncoding $ singleFieldJSON fstToLower
instance ToField CallState where
toField = toField . encodeJson
toField = toField . encodeJSON
instance FromField CallState where
fromField = fromTextField_ decodeJson
fromField = fromTextField_ decodeJSON
newtype CallId = CallId ByteString
deriving (Eq, Show)