diff --git a/src/Simplex/Chat/Library/Commands.hs b/src/Simplex/Chat/Library/Commands.hs index 646377ac9c..df03a776fe 100644 --- a/src/Simplex/Chat/Library/Commands.hs +++ b/src/Simplex/Chat/Library/Commands.hs @@ -4918,17 +4918,7 @@ runRelayGroupLinkChecks user = do else void $ withStore' $ \db -> updateRelayOwnStatusFromTo db gInfo RSActive RSInactive _ -> pure () _ -> pure () - sendRelayCapIfNeeded cxt gInfo - sendRelayCapIfNeeded cxt gInfo = do - ChatConfig {webPreviewConfig} <- asks config - let currentWebDomain = (\WebPreviewConfig {webDomain} -> webDomain) <$> webPreviewConfig - sentWebDomain <- withStore' (`getRelaySentWebDomain` gInfo) - when (currentWebDomain /= sentWebDomain) $ do - owners <- withStore' $ \db -> getGroupOwners db cxt user gInfo - let capableOwners = filter (\m -> memberCurrent m && m `supportsVersion` relayWebCapVersion) owners - unless (null capableOwners) $ do - void $ sendGroupMessage' user gInfo capableOwners (XGrpRelayCap RelayCapabilities {webDomain = currentWebDomain}) - withStore' $ \db -> updateRelaySentWebDomain db gInfo currentWebDomain + sendRelayCapIfNeeded user gInfo checkRelayInactiveGroups = do cxt <- chatStoreCxt ttl <- asks (relayInactiveTTL . config) diff --git a/src/Simplex/Chat/Library/Internal.hs b/src/Simplex/Chat/Library/Internal.hs index 325e552d44..0b19c5a261 100644 --- a/src/Simplex/Chat/Library/Internal.hs +++ b/src/Simplex/Chat/Library/Internal.hs @@ -2126,6 +2126,22 @@ sendGroupMessage' user gInfo members chatMsgEvent = ((Right msg) :| [], _) -> pure msg _ -> throwChatError $ CEInternalError "sendGroupMessage': expected 1 message" +-- Relay advertises its current web preview capability to channel owners. +-- Idempotent: sends only when the configured web domain differs from what was last sent, and only to +-- owners whose recorded chat version supports relayWebCapVersion (older apps can't parse XGrpRelayCap). +sendRelayCapIfNeeded :: User -> GroupInfo -> CM () +sendRelayCapIfNeeded user gInfo = do + ChatConfig {webPreviewConfig} <- asks config + let currentWebDomain = (\WebPreviewConfig {webDomain} -> webDomain) <$> webPreviewConfig + sentWebDomain <- withStore' (`getRelaySentWebDomain` gInfo) + when (currentWebDomain /= sentWebDomain) $ do + cxt <- chatStoreCxt + owners <- withStore' $ \db -> getGroupOwners db cxt user gInfo + let capableOwners = filter (\m -> memberCurrent m && m `supportsVersion` relayWebCapVersion) owners + unless (null capableOwners) $ do + void $ sendGroupMessage' user gInfo capableOwners (XGrpRelayCap RelayCapabilities {webDomain = currentWebDomain}) + withStore' $ \db -> updateRelaySentWebDomain db gInfo currentWebDomain + sendGroupMessages :: MsgEncodingI e => User -> GroupInfo -> Maybe GroupChatScope -> ShowGroupAsSender -> [GroupMember] -> NonEmpty (ChatMsgEvent e) -> CM (NonEmpty (Either ChatError SndMessage), GroupSndResult) sendGroupMessages user gInfo scope asGroup members events = do -- TODO [knocking] send current profile to pending member after approval? diff --git a/src/Simplex/Chat/Library/Subscriber.hs b/src/Simplex/Chat/Library/Subscriber.hs index b948d7727b..671b7a53df 100644 --- a/src/Simplex/Chat/Library/Subscriber.hs +++ b/src/Simplex/Chat/Library/Subscriber.hs @@ -3323,6 +3323,8 @@ processAgentMessageConn cxt user@User {userId} corrId agentConnId agentMessage = unless (useRelays' g'') $ void $ forkIO $ void $ setGroupLinkData' NRMBackground user g'' Just _ -> updateGroupPrefs_ msgSigned g m $ fromMaybe defaultBusinessGroupPrefs $ groupPreferences p' + -- relay advertises its web capability now that the owner's version is known (bumped by saveGroupRcvMsg) + when (isRelay (membership g)) $ sendRelayCapIfNeeded user g pure $ Just DJSGroup {jobSpec = DJDeliveryJob {includePending = True}} xGrpPrefs :: GroupInfo -> GroupMember -> GroupPreferences -> RcvMessage -> CM (Maybe DeliveryJobScope) diff --git a/website/src/_includes/navbar.html b/website/src/_includes/navbar.html index 34ee893dd3..cec2aa0a01 100644 --- a/website/src/_includes/navbar.html +++ b/website/src/_includes/navbar.html @@ -148,7 +148,7 @@ - {% if ('blog' not in page.url) and ('about' not in page.url) and ('donate' not in page.url) and ('privacy' not in page.url) and ('directory' not in page.url) and ('credits' not in page.url) and ('file' not in page.url) and ('links' not in page.url) %} + {% if ('blog' not in page.url) and ('about' not in page.url) and ('donate' not in page.url) and ('privacy' not in page.url) and ('directory' not in page.url) and ('credits' not in page.url) and ('file' not in page.url) and ('links' not in page.url) and ('news' not in page.url) %}
{% for language in languages.languages %} diff --git a/website/src/blog.html b/website/src/blog.html index 2e62702248..5e8a2f8dfa 100644 --- a/website/src/blog.html +++ b/website/src/blog.html @@ -41,7 +41,8 @@ active_blog: true
-

Latest news

+

Latest news

+

Open SimpleX Network News channel

{% for blog in collections.blogs %} {% if not(blog.data.draft) %} diff --git a/website/src/js/channel-preview.jsc b/website/src/js/channel-preview.jsc index be572fd8de..5cd4a390cb 100644 --- a/website/src/js/channel-preview.jsc +++ b/website/src/js/channel-preview.jsc @@ -94,6 +94,15 @@ const STYLE = ` text-overflow: ellipsis; } +.simplex-preview-container .simplex-preview-header-name { + background: none; + -webkit-background-clip: border-box; + background-clip: border-box; + color: var(--sp-text); + -webkit-text-fill-color: var(--sp-text); + text-fill-color: var(--sp-text); +} + .simplex-preview-header-description { font-size: 13px; color: var(--sp-text-secondary); @@ -492,16 +501,18 @@ const STYLE = ` min-width: 0; max-width: 640px; overflow-y: auto; - overscroll-behavior: contain; position: relative; } .simplex-preview-info { overflow-y: auto; - overscroll-behavior: contain; background: var(--sp-bg); } +.simplex-preview-scroll-lock { + overflow: hidden; +} + .simplex-preview-info-close { display: none; } @@ -696,12 +707,13 @@ const STYLE = ` .simplex-preview-info { display: none; position: fixed; - top: 0; + top: var(--sp-top-offset, 0px); left: 0; right: 0; bottom: 0; z-index: 100; padding: 16px; + overscroll-behavior: contain; } .simplex-preview-info.open { display: block; @@ -786,6 +798,13 @@ function initChannelPreview(container) { if (container.dataset.darkBackground) { container.style.setProperty('--sp-dark-bg', container.dataset.darkBackground); } + const topOffset = parseInt(container.dataset.topOffset || '0', 10); + if (topOffset > 0) { + container.style.setProperty('--sp-top-offset', topOffset + 'px'); + container.style.marginTop = topOffset + 'px'; + container.style.height = 'calc(100vh - ' + topOffset + 'px)'; + container.style.height = 'calc(100dvh - ' + topOffset + 'px)'; + } container.innerHTML = '

Loading channel...

'; fetchPreview(relayScheme, relayDomains, channelLink, channelId).then(data => { @@ -885,12 +904,16 @@ function render(container, data, channelLink, showAppBadges) { if (window.innerWidth < 1000) { info.classList.add('open'); main.style.overflow = 'hidden'; + document.documentElement.classList.add('simplex-preview-scroll-lock'); + document.body.classList.add('simplex-preview-scroll-lock'); } }); closeBtn.addEventListener('click', () => { info.classList.remove('open'); main.style.overflow = ''; + document.documentElement.classList.remove('simplex-preview-scroll-lock'); + document.body.classList.remove('simplex-preview-scroll-lock'); }); setupSecretToggles(container); diff --git a/website/src/js/directory.jsc b/website/src/js/directory.jsc index 6959cd41a5..09d8ffa67f 100644 --- a/website/src/js/directory.jsc +++ b/website/src/js/directory.jsc @@ -1,5 +1,3 @@ -#include "simplex-lib.jsc" - const simplexDirectoryDataURL = 'https://directory.simplex.chat/data/'; // const simplexDirectoryDataURL = 'http://localhost:8080/directory-data/'; @@ -7,6 +5,7 @@ const simplexDirectoryDataURL = 'https://directory.simplex.chat/data/'; const simplexUsersGroup = 'SimpleX users group'; (function() { +#include "simplex-lib.jsc" if (!document.location.pathname.startsWith('/directory')) return; let allEntries = []; diff --git a/website/src/news.html b/website/src/news.html new file mode 100644 index 0000000000..8b0ab9b494 --- /dev/null +++ b/website/src/news.html @@ -0,0 +1,16 @@ +--- +layout: layouts/main.html +title: "SimpleX Network News" +description: "The news about SimpleX Network technology, governance and anything related to its development." +templateEngineOverride: njk +--- + +
+