diff --git a/.github/ISSUE_TEMPLATE/bug_report_fabric.yml b/.github/ISSUE_TEMPLATE/bug_report_fabric.yml deleted file mode 100644 index 65d14ce86..000000000 --- a/.github/ISSUE_TEMPLATE/bug_report_fabric.yml +++ /dev/null @@ -1,69 +0,0 @@ -name: "Bug Report - Fabric/New Architecture" -description: "Create a bug report for builds using the New Architecture. If you are not sure what that means, don't use this template, and instead use the default bug report template." -labels: ["bug", "fabric"] -body: - - type: checkboxes - attributes: - label: You're running a build that uses the React Native New Architecture, right? - description: This template is specifically for issues related to builds that use the React Native New Architecture. If you are not sure what that means, this template is probably not relevant to you, and you should use the default Bug Report template. - options: - - label: I am running a build that uses the New Architecture - required: true - - type: markdown - attributes: - value: | - Thanks for taking the time to report an issue you've found in the app! Before you submit this issue, please make sure you've searched for similar issues that are already open and being tracked. If you find an open issue that seems relevant to yours, it is best to leave a response there with your information instead of opening a new issue, since it helps to consolidate the info in one place. - - type: textarea - attributes: - label: Steps to Reproduce - description: | - Please provide the steps that may reproduce the issue that you are experiencing. The more concise of a - reproduction that you provide, the easier it will be for us to identify the issue and fix it in a timely manner. - placeholder: | - 1. Go to '...' - 2. Click on '....' - 3. Scroll down to '....' - 4. See error - validations: - required: true - - type: textarea - attributes: - label: Attachments - description: | - If possible, please provide any images or videos that may help us understand the issue you are experiencing. - validations: - required: false - - type: dropdown - attributes: - label: What platform(s) does this occur on? - multiple: true - options: - - iOS - - Android - validations: - required: true - - type: input - attributes: - label: Device Info - description: | - Please provide the device information that you are using when experiencing this issue. This can include the - device model, operating system version, and any other relevant information. - validations: - required: false - - type: input - attributes: - label: What version of the app are you using? - description: | - You can easily find this information by visting the Settings screen in the app, and tapping on the version info - at the bottom of the screen. All the relevant information will be copied to your clipboard, and you will be - able to share it here. - validations: - required: true - - type: textarea - attributes: - label: Additional Information - description: | - Please provide any additional information that you think may be helpful in identifying the issue you are - experiencing. This can include any error messages, logs, or other information that you think may be relevant. - validations: - required: false diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index c71cf63a1..d8c2de4e4 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -1,5 +1,5 @@ name: "Feature Request" -description: "Suggest an idea for the social.daniela.lol app." +description: "Suggest an idea for the Bitchsky Social app." labels: ["feature-request"] body: - type: markdown diff --git a/bskyogcard/src/util.ts b/bskyogcard/src/util.ts index 2b86ded06..cab82bacd 100644 --- a/bskyogcard/src/util.ts +++ b/bskyogcard/src/util.ts @@ -30,7 +30,7 @@ const emojiCache = new Map() function getEmojiUrl(code: string) { return ( - 'https://cdnjs.cloudflare.com/ajax/libs/twemoji/14.0.2/svg/' + + 'https://cdnjs.cloudflare.com/ajax/libs/twemoji/16.0.2/svg/' + code.toLowerCase() + '.svg' ) diff --git a/functions/profile/[handleOrDID].ts b/functions/profile/[handleOrDID].ts index a32fc37c4..8e3164262 100644 --- a/functions/profile/[handleOrDID].ts +++ b/functions/profile/[handleOrDID].ts @@ -85,7 +85,7 @@ class HeadHandler { : '' element.append( html` - + diff --git a/functions/profile/[handleOrDID]/post/[rkey].ts b/functions/profile/[handleOrDID]/post/[rkey].ts index c2447277c..b475c0722 100644 --- a/functions/profile/[handleOrDID]/post/[rkey].ts +++ b/functions/profile/[handleOrDID]/post/[rkey].ts @@ -144,7 +144,7 @@ class HeadHandler { element.append( html` - + diff --git a/package.json b/package.json index a9b8a271a..0f35209a3 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "social.daniela.lol", + "name": "Bitchsky", "version": "1.110.0", "private": true, "engines": { diff --git a/src/lib/strings/embed-player.ts b/src/lib/strings/embed-player.ts index fecff359a..b7b3c6cf2 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://social.daniela.lol' + : 'https://bitchsky.app' : __DEV__ && !process.env.JEST_WORKER_ID ? 'http://localhost:8100' - : 'https://social.daniela.lol' + : 'https://bitchsky.app' export const embedPlayerSources = [ 'youtube', diff --git a/src/lib/strings/url-helpers.ts b/src/lib/strings/url-helpers.ts index 2cc6531d4..d454ae19f 100644 --- a/src/lib/strings/url-helpers.ts +++ b/src/lib/strings/url-helpers.ts @@ -10,7 +10,7 @@ import {logger} from '#/logger' export const BSKY_APP_HOST = 'https://bitchsky.app' const BSKY_TRUSTED_HOSTS = [ 'bitchsky\\.app', - 'deer\\.social', + 'bitchsky\\.app', 'bsky\\.app', 'bsky\\.social', 'blueskyweb\\.xyz', diff --git a/src/screens/Settings/AboutSettings.tsx b/src/screens/Settings/AboutSettings.tsx index 5683364bd..9c566603d 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/screens/Signup/StepInfo/index.tsx b/src/screens/Signup/StepInfo/index.tsx index 93aed6bcb..7ec466d9c 100644 --- a/src/screens/Signup/StepInfo/index.tsx +++ b/src/screens/Signup/StepInfo/index.tsx @@ -170,7 +170,7 @@ export function StepInfo({ - social.daniela.lol is part of the{' '} + Bitchsky is part of the{' '} { Don't have an account provider or an existing Bluesky account? To create a new account on a Bluesky-hosted PDS, sign up through{' '} + {/* TODO: Xan: change to say sign up for a Bitchsky account */} { bsky.app }{' '} - first, then return to social.daniela.lol and log in with the - account you created. + first, then return to Bitchsky and log in with the account you + created. )} diff --git a/src/state/persisted/schema.ts b/src/state/persisted/schema.ts index e8159186f..79e2d0185 100644 --- a/src/state/persisted/schema.ts +++ b/src/state/persisted/schema.ts @@ -220,7 +220,7 @@ export const defaults: Schema = { hideSimilarAccountsRecomm: false, deerVerification: { enabled: false, - // https://social.daniela.lol/profile/did:plc:p2cp5gopk7mgjegy6wadk3ep/post/3lndyqyyr4k2k + // https://bitchsky.app/profile/did:plc:p2cp5gopk7mgjegy6wadk3ep/post/3lndyqyyr4k2k // using https://bverified.vercel.app/ as a source trusted: [ 'did:plc:z72i7hdynmk6r22z27h6tvur', diff --git a/src/state/queries/constellation.ts b/src/state/queries/constellation.ts index 527fb97af..1ea10020a 100644 --- a/src/state/queries/constellation.ts +++ b/src/state/queries/constellation.ts @@ -22,7 +22,7 @@ type Collection = const headers = new Headers({ Accept: 'application/json', - 'User-Agent': 'social.daniela.lol (contact @daniela.lol)', + 'User-Agent': 'Bitchsky (bitchsky.app)', }) const makeReqUrl = ( diff --git a/src/view/screens/PrivacyPolicy.tsx b/src/view/screens/PrivacyPolicy.tsx index ee9817f43..ad418d8d4 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 67ae84194..c27735bdc 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 053f2cb91..02a516c4c 100644 --- a/src/view/shell/Drawer.tsx +++ b/src/view/shell/Drawer.tsx @@ -695,12 +695,12 @@ function ExtraLinks() { + to="https://bitchsky.app/about/tos"> Terms of Service Privacy Policy diff --git a/src/view/shell/desktop/RightNav.tsx b/src/view/shell/desktop/RightNav.tsx index 3de1d58fb..d554afef1 100644 --- a/src/view/shell/desktop/RightNav.tsx +++ b/src/view/shell/desktop/RightNav.tsx @@ -109,13 +109,13 @@ export function DesktopRightNav({routeName}: {routeName: string}) { )} {_(msg`Privacy`)} {' • '} {_(msg`Terms`)}