- New in v6.5.3:
-
- - relays reject groups that were removed, can be manually re-allowed
-
- New in v6.5:
+ New in v6.5.4:
Public channels - speak freely!
- Reliability: many relays per channel.
diff --git a/simplex-chat.cabal b/simplex-chat.cabal
index 166c31aa25..2fa70c0dbd 100644
--- a/simplex-chat.cabal
+++ b/simplex-chat.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
-- see: https://github.com/sol/hpack
name: simplex-chat
-version: 6.5.3.0
+version: 6.5.4.1
category: Web, System, Services, Cryptography
homepage: https://github.com/simplex-chat/simplex-chat#readme
author: simplex.chat
diff --git a/src/Simplex/Chat/Protocol.hs b/src/Simplex/Chat/Protocol.hs
index 7c9776e7b8..b692dba04d 100644
--- a/src/Simplex/Chat/Protocol.hs
+++ b/src/Simplex/Chat/Protocol.hs
@@ -263,12 +263,12 @@ data ReportReason = RRSpam | RRContent | RRCommunity | RRProfile | RROther | RRU
deriving (Eq, Show)
data RelayCapabilities = RelayCapabilities
- { baseWebUrl :: Maybe Text
+ { webDomain :: Maybe Text
}
deriving (Eq, Show)
defaultRelayCapabilities :: RelayCapabilities
-defaultRelayCapabilities = RelayCapabilities {baseWebUrl = Nothing}
+defaultRelayCapabilities = RelayCapabilities {webDomain = Nothing}
$(pure [])
diff --git a/src/Simplex/Chat/Store/Groups.hs b/src/Simplex/Chat/Store/Groups.hs
index 98881d38d0..0794969ad8 100644
--- a/src/Simplex/Chat/Store/Groups.hs
+++ b/src/Simplex/Chat/Store/Groups.hs
@@ -1371,9 +1371,9 @@ groupRelayQuery =
|]
toGroupRelay :: (Int64, GroupMemberId, DBEntityId, ShortLinkContact, Text, Text, Maybe Text, Maybe ImageData, Text, BoolInt) :. (Maybe BoolInt, BoolInt, BoolInt, RelayStatus, Maybe ShortLinkContact, Maybe Text) -> GroupRelay
-toGroupRelay ((groupRelayId, groupMemberId, chatRelayId, address, displayName, fullName, shortDescr, image, domains, BI preset) :. (tested, BI enabled, BI deleted, relayStatus, relayLink, baseWebUrl)) =
+toGroupRelay ((groupRelayId, groupMemberId, chatRelayId, address, displayName, fullName, shortDescr, image, domains, BI preset) :. (tested, BI enabled, BI deleted, relayStatus, relayLink, webDomain)) =
let userChatRelay = UserChatRelay {chatRelayId, address, relayProfile = toRelayProfile (displayName, fullName, shortDescr, image), domains = T.splitOn "," domains, preset, tested = unBI <$> tested, enabled, deleted}
- relayCap = RelayCapabilities {baseWebUrl}
+ relayCap = RelayCapabilities {webDomain}
in GroupRelay {groupRelayId, groupMemberId, userChatRelay, relayStatus, relayLink, relayCap}
createRelayForOwner :: DB.Connection -> VersionRangeChat -> TVar ChaChaDRG -> User -> GroupInfo -> UserChatRelay -> ExceptT StoreError IO GroupMember
@@ -1515,7 +1515,7 @@ setRelayLinkConfId db m confId relayLink = do
(relayLink, currentTs, groupMemberId' m)
updateRelayCapabilities :: DB.Connection -> GroupMember -> RelayCapabilities -> IO ()
-updateRelayCapabilities db m RelayCapabilities {baseWebUrl} = do
+updateRelayCapabilities db m RelayCapabilities {webDomain} = do
currentTs <- getCurrentTime
DB.execute
db
@@ -1524,7 +1524,7 @@ updateRelayCapabilities db m RelayCapabilities {baseWebUrl} = do
SET base_web_url = ?, updated_at = ?
WHERE group_member_id = ?
|]
- (baseWebUrl, currentTs, groupMemberId' m)
+ (webDomain, currentTs, groupMemberId' m)
getRelayConfId :: DB.Connection -> GroupMember -> ExceptT StoreError IO ConfirmationId
getRelayConfId db m =