yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Do not prompt for app install on public shares, closes #7198

Browse Source
This commit is contained in:
Tom Moor
2024-07-06 11:10:58 -04:00
parent e07be1ee5e
commit 1efd3b6f96
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/routes/app.ts
View File

@@ -52,6 +52,7 @@ export const renderApp = async (
canonical?: string; canonical?: string;
shortcutIcon?: string; shortcutIcon?: string;
rootShareId?: string; rootShareId?: string;
isShare?: boolean;
analytics?: Integration<IntegrationType.Analytics>[]; analytics?: Integration<IntegrationType.Analytics>[];
} = {} } = {}
) => { ) => {
@@ -108,11 +109,15 @@ export const renderApp = async (
.replace(/\{lang\}/g, unicodeCLDRtoISO639(env.DEFAULT_LANGUAGE)) .replace(/\{lang\}/g, unicodeCLDRtoISO639(env.DEFAULT_LANGUAGE))
.replace(/\{title\}/g, escape(title)) .replace(/\{title\}/g, escape(title))
.replace(/\{description\}/g, escape(description)) .replace(/\{description\}/g, escape(description))
.replace(
/\{manifest-url\}/g,
options.isShare ? "" : "/static/manifest.webmanifest"
)
.replace(/\{canonical-url\}/g, canonical) .replace(/\{canonical-url\}/g, canonical)
.replace(/\{shortcut-icon\}/g, shortcutIcon) .replace(/\{shortcut-icon-url\}/g, shortcutIcon)
.replace(/\{cdn-url\}/g, env.CDN_URL || "")
.replace(/\{prefetch\}/g, shareId ? "" : prefetchTags) .replace(/\{prefetch\}/g, shareId ? "" : prefetchTags)
.replace(/\{slack-app-id\}/g, env.public.SLACK_APP_ID || "") .replace(/\{slack-app-id\}/g, env.public.SLACK_APP_ID || "")
.replace(/\{cdn-url\}/g, env.CDN_URL || "")
.replace(/\{script-tags\}/g, scriptTags) .replace(/\{script-tags\}/g, scriptTags)
.replace(/\{csp-nonce\}/g, ctx.state.cspNonce); .replace(/\{csp-nonce\}/g, ctx.state.cspNonce);
}; };
@@ -175,6 +180,7 @@ export const renderShare = async (ctx: Context, next: Next) => {
? team.avatarUrl ? team.avatarUrl
: undefined, : undefined,
analytics, analytics,
isShare: true,
rootShareId, rootShareId,
canonical: share canonical: share
? `${share.canonicalUrl}${documentSlug && document ? document.url : ""}` ? `${share.canonicalUrl}${documentSlug && document ? document.url : ""}`

4
server/static/index.html
View File

@@ -9,10 +9,10 @@
<meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="description" content="{description}" /> <meta name="description" content="{description}" />
<meta name="darkreader-lock" /> <meta name="darkreader-lock" />
<link rel="manifest" href="/static/manifest.webmanifest" /> <link rel="manifest" href="{manifest-url}" />
<link rel="canonical" href="{canonical-url}" data-react-helmet="true" /> <link rel="canonical" href="{canonical-url}" data-react-helmet="true" />
{prefetch} {prefetch}
<link rel="shortcut icon" type="image/png" href="{shortcut-icon}" sizes="32x32" /> <link rel="shortcut icon" type="image/png" href="{shortcut-icon-url}" sizes="32x32" />
<link rel="apple-touch-icon" type="image/png" href="{cdn-url}/static/images/apple-touch-icon.png" sizes="192x192" /> <link rel="apple-touch-icon" type="image/png" href="{cdn-url}/static/images/apple-touch-icon.png" sizes="192x192" />
<link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="Outline" /> <link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="Outline" />
<style> <style>