From 6da1b23c6b9597b1df87a06d45f6a5fbcd7a4243 Mon Sep 17 00:00:00 2001 From: Daniela Henkel Date: Sat, 6 Sep 2025 17:03:01 +0200 Subject: [PATCH] replace deer.social with social.daniela.lol on site --- app.config.js | 8 +++++-- deer-static-about/index.html | 6 ++--- functions/profile/[handleOrDID].ts | 6 ++--- .../profile/[handleOrDID]/post/[rkey].ts | 24 +++++++++---------- src/lib/constants.ts | 2 +- src/lib/strings/embed-player.ts | 6 ++--- src/lib/strings/headings.ts | 2 +- src/lib/strings/url-helpers.ts | 9 ++++--- src/screens/Settings/AboutSettings.tsx | 4 ++-- src/state/persisted/schema.ts | 2 +- src/view/com/auth/SplashScreen.web.tsx | 2 +- src/view/screens/PrivacyPolicy.tsx | 4 ++-- src/view/screens/TermsOfService.tsx | 4 ++-- src/view/shell/Drawer.tsx | 4 ++-- src/view/shell/desktop/RightNav.tsx | 4 ++-- web/index.html | 2 +- 16 files changed, 48 insertions(+), 41 deletions(-) diff --git a/app.config.js b/app.config.js index fb2be916f..0b23e15cd 100644 --- a/app.config.js +++ b/app.config.js @@ -18,7 +18,7 @@ module.exports = function (_config) { const IS_DEV = !IS_TESTFLIGHT || !IS_PRODUCTION const ASSOCIATED_DOMAINS = [ - 'applinks:deer.social', + 'applinks:social.daniela.lol', // When testing local services, enter an ngrok (et al) domain here. It must use a standard HTTP/HTTPS port. ...(IS_DEV || IS_TESTFLIGHT ? [] : []), ] @@ -63,7 +63,7 @@ module.exports = function (_config) { 'Used to save images to your library.', NSPhotoLibraryUsageDescription: 'Used for profile pictures, posts, and other kinds of content', - CFBundleSpokenName: 'deer.social', + CFBundleSpokenName: 'social.daniela.lol', CFBundleLocalizations: [ 'en', 'an', @@ -159,6 +159,10 @@ module.exports = function (_config) { action: 'VIEW', autoVerify: true, data: [ + { + scheme: 'https', + host: 'social.daniela.lol', + }, { scheme: 'https', host: 'deer.social', diff --git a/deer-static-about/index.html b/deer-static-about/index.html index 873d02e91..aff5cfd0c 100644 --- a/deer-static-about/index.html +++ b/deer-static-about/index.html @@ -7,8 +7,8 @@ name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1.00001, viewport-fit=cover" /> - deer.social | about - + social.daniela.lol | about + @@ -16,7 +16,7 @@

redirecting to github readme...

diff --git a/functions/profile/[handleOrDID].ts b/functions/profile/[handleOrDID].ts index aad768258..a32fc37c4 100644 --- a/functions/profile/[handleOrDID].ts +++ b/functions/profile/[handleOrDID].ts @@ -81,11 +81,11 @@ class HeadHandler { ` : view.avatar - ? html`` - : '' + ? html`` + : '' element.append( html` - + diff --git a/functions/profile/[handleOrDID]/post/[rkey].ts b/functions/profile/[handleOrDID]/post/[rkey].ts index b9c2f7192..c2447277c 100644 --- a/functions/profile/[handleOrDID]/post/[rkey].ts +++ b/functions/profile/[handleOrDID]/post/[rkey].ts @@ -130,21 +130,21 @@ class HeadHandler { const embedElems = !embed ? '' : AppBskyEmbedImages.isView(embed) - ? html`${embed.images.map( - i => html``, - )} - ` - : // TODO: in the future, embed videos - 'thumbnail' in embed && embed.thumbnail - ? html` - - - ` - : html`` + ? html`${embed.images.map( + i => html``, + )} + ` + : // TODO: in the future, embed videos + 'thumbnail' in embed && embed.thumbnail + ? html` + + + ` + : html`` element.append( html` - + diff --git a/src/lib/constants.ts b/src/lib/constants.ts index 145016225..f0c84844a 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -11,7 +11,7 @@ export const BSKY_SERVICE = 'https://bsky.social' export const BSKY_SERVICE_DID = 'did:web:bsky.social' export const PUBLIC_BSKY_SERVICE = 'https://public.api.bsky.app' export const DEFAULT_SERVICE = BSKY_SERVICE -export const HELP_DESK_URL = `https://github.com/a-viv-a/deer-social/issues/new/choose` +export const HELP_DESK_URL = `https://github.com/danielah05/deer-social/issues/new/choose` export const EMBED_SERVICE = 'https://embed.bsky.app' export const EMBED_SCRIPT = `${EMBED_SERVICE}/static/embed.js` export const BSKY_DOWNLOAD_URL = 'https://bsky.app/download' diff --git a/src/lib/strings/embed-player.ts b/src/lib/strings/embed-player.ts index 94bc851fb..3db310e3f 100644 --- a/src/lib/strings/embed-player.ts +++ b/src/lib/strings/embed-player.ts @@ -9,10 +9,10 @@ const IFRAME_HOST = isWeb ? // @ts-ignore only for web window.location.host === 'localhost:8100' ? 'http://localhost:8100' - : 'https://deer.social' + : 'https://social.daniela.lol' : __DEV__ && !process.env.JEST_WORKER_ID - ? 'http://localhost:8100' - : 'https://deer.social' + ? 'http://localhost:8100' + : 'https://social.daniela.lol' export const embedPlayerSources = [ 'youtube', diff --git a/src/lib/strings/headings.ts b/src/lib/strings/headings.ts index 786d73dca..e36c310b5 100644 --- a/src/lib/strings/headings.ts +++ b/src/lib/strings/headings.ts @@ -1,4 +1,4 @@ export function bskyTitle(page: string, unreadCountLabel?: string) { const unreadPrefix = unreadCountLabel ? `(${unreadCountLabel}) ` : '' - return `${unreadPrefix}${page} — deer.social` + return `${unreadPrefix}${page} — social.daniela.lol` } diff --git a/src/lib/strings/url-helpers.ts b/src/lib/strings/url-helpers.ts index 07a7b3c6c..38e7a33f9 100644 --- a/src/lib/strings/url-helpers.ts +++ b/src/lib/strings/url-helpers.ts @@ -7,9 +7,10 @@ import {isInvalidHandle} from '#/lib/strings/handles' import {startUriToStarterPackUri} from '#/lib/strings/starter-pack' import {logger} from '#/logger' -export const BSKY_APP_HOST = 'https://deer.social' +export const BSKY_APP_HOST = 'https://social.daniela.lol' const BSKY_TRUSTED_HOSTS = [ 'deer\\.social', + 'social\\.daniela\\.lol', 'bsky\\.app', 'bsky\\.social', 'blueskyweb\\.xyz', @@ -80,7 +81,7 @@ export function toShortUrl(url: string): string { export function toShareUrl(url: string): string { if (!url.startsWith('https')) { - const urlp = new URL('https://deer.social') + const urlp = new URL('https://social.daniela.lol') urlp.pathname = url url = urlp.toString() } @@ -95,7 +96,9 @@ export function isBskyAppUrl(url: string): boolean { return ( url.startsWith('https://bsky.app/') || (url.startsWith('https://deer.social/') && - !url.startsWith('https://deer.social/about')) + !url.startsWith('https://deer.social/about')) || + (url.startsWith('https://social.daniela.lol/') && + !url.startsWith('https://social.daniela.lol/about')) ) } diff --git a/src/screens/Settings/AboutSettings.tsx b/src/screens/Settings/AboutSettings.tsx index 839c94aef..7d35eb216 100644 --- a/src/screens/Settings/AboutSettings.tsx +++ b/src/screens/Settings/AboutSettings.tsx @@ -78,7 +78,7 @@ export function AboutSettingsScreen({}: Props) { @@ -86,7 +86,7 @@ export function AboutSettingsScreen({}: Props) { diff --git a/src/state/persisted/schema.ts b/src/state/persisted/schema.ts index 658b55d1a..744eab0e5 100644 --- a/src/state/persisted/schema.ts +++ b/src/state/persisted/schema.ts @@ -206,7 +206,7 @@ export const defaults: Schema = { showLinkInHandle: false, deerVerification: { enabled: false, - // https://deer.social/profile/did:plc:p2cp5gopk7mgjegy6wadk3ep/post/3lndyqyyr4k2k + // https://social.daniela.lol/profile/did:plc:p2cp5gopk7mgjegy6wadk3ep/post/3lndyqyyr4k2k trusted: [ 'did:plc:z72i7hdynmk6r22z27h6tvur', 'did:plc:eclio37ymobqex2ncko63h4r', diff --git a/src/view/com/auth/SplashScreen.web.tsx b/src/view/com/auth/SplashScreen.web.tsx index e0d0fbdde..a3d3d606d 100644 --- a/src/view/com/auth/SplashScreen.web.tsx +++ b/src/view/com/auth/SplashScreen.web.tsx @@ -166,7 +166,7 @@ function Footer() { ]}> + to="https://github.com/danielah05/deer-social"> Github diff --git a/src/view/screens/PrivacyPolicy.tsx b/src/view/screens/PrivacyPolicy.tsx index 2b036d791..ee9817f43 100644 --- a/src/view/screens/PrivacyPolicy.tsx +++ b/src/view/screens/PrivacyPolicy.tsx @@ -39,8 +39,8 @@ export const PrivacyPolicyScreen = (_props: Props) => { The Privacy Policy has been moved to{' '} diff --git a/src/view/screens/TermsOfService.tsx b/src/view/screens/TermsOfService.tsx index 6c6b7b10b..67ae84194 100644 --- a/src/view/screens/TermsOfService.tsx +++ b/src/view/screens/TermsOfService.tsx @@ -38,8 +38,8 @@ export const TermsOfServiceScreen = (_props: Props) => { The Terms of Service have been moved to{' '} diff --git a/src/view/shell/Drawer.tsx b/src/view/shell/Drawer.tsx index 6fb0817f5..37e429e7e 100644 --- a/src/view/shell/Drawer.tsx +++ b/src/view/shell/Drawer.tsx @@ -695,12 +695,12 @@ function ExtraLinks() { + to="https://social.daniela.lol/about/tos"> Terms of Service Privacy Policy diff --git a/src/view/shell/desktop/RightNav.tsx b/src/view/shell/desktop/RightNav.tsx index d400125e6..bc41cd9b6 100644 --- a/src/view/shell/desktop/RightNav.tsx +++ b/src/view/shell/desktop/RightNav.tsx @@ -110,13 +110,13 @@ export function DesktopRightNav({routeName}: {routeName: string}) { )} {_(msg`Privacy`)} {' • '} {_(msg`Terms`)} diff --git a/web/index.html b/web/index.html index d379b9c94..15df93175 100644 --- a/web/index.html +++ b/web/index.html @@ -105,7 +105,7 @@ ">

JavaScript Required

This is a heavily interactive web application, and JavaScript is required. Simple HTML interfaces are possible, but that is not what this is. -

Learn more about Bluesky at bsky.social and atproto.com, or this fork at github.com/a-viv-a/deer.social. +

Learn more about Bluesky at bsky.social and atproto.com, or this fork at github.com/danielah05/deer-social. -- 2.51.2