diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 975d029a9..28257571c 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 Bluesky app." +description: "Suggest an idea for the deer.social app." labels: ["feature-request"] body: - type: markdown diff --git a/LICENSE b/LICENSE index 6fffcb890..5ee77394f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2023–2025 Bluesky PBC +Copyright 2025 Aviva Ruben Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/README.md b/README.md index 64bcbcea5..376924958 100644 --- a/README.md +++ b/README.md @@ -1,74 +1,108 @@ -# Bluesky Social App +# deer.social -Welcome friends! This is the codebase for the Bluesky Social app. +This is a soft fork of [social app](https://github.com/bluesky-social/social-app). Get the app itself: -- **Web: [bsky.app](https://bsky.app)** -- **iOS: [App Store](https://apps.apple.com/us/app/bluesky-social/id6444370199)** -- **Android: [Play Store](https://play.google.com/store/apps/details?id=xyz.blueskyweb.app)** +- **Web: [deer.social](https://deer.social)** +- ~**iOS: [App Store]()**~ WIP +- ~**Android: [Play Store]()**~ WIP -## Development Resources +## Features Today + +- toggle to disable go.bsky.app link proxying for analytics +- toggle to disable default app labeler +- toggle to disable falling back to discover feed in the following feed +- see through quote blocks and detatchments (nuclear block wrt quotes) + - +- enable features gates +- configure the location used to determine regional labelers +- entirely ignore `!no-unauthenticated` labels, even for logged out users + +### WIP/Planned + +- rewrite shared URLs to reference deer.social +- opengraph support for sharing posts and profiles +- selecting custom appviews +- seeing past blocks in post threads (nuclear block for reply chains) + +## Philosophy + +- by default, deer.social should very similar to the official client + - color and branding are different to distinguish from social-app + - `!no-unauthenticated` behavior is different + - analytics are not present +- opinionated features behind toggles +- focus on high impact, low diff size patches + - specifically patches that won't require large conflicts to be resolved +- focus on power users (but all users are welome!) +- enable things that are possible but annoying today **without** egging on antisocial behavior -This is a [React Native](https://reactnative.dev/) application, written in the TypeScript programming language. It builds on the `atproto` TypeScript packages (like [`@atproto/api`](https://www.npmjs.com/package/@atproto/api)), code for which is also open source, but in [a different git repository](https://github.com/bluesky-social/atproto). +## Development Resources -There is a small amount of Go language source code (in `./bskyweb/`), for a web service that returns the React Native Web application. +This is a [React Native](https://reactnative.dev/) application, written in the TypeScript programming language. It builds on the `atproto` TypeScript packages (like [`@atproto/api`](https://www.npmjs.com/package/@atproto/api)), code for which is also open source, but in [a different git repository](https://github.com/bluesky-social/atproto). It is regularly rebased +on top of new releases of [social-app](https://github.com/bluesky-social/social-app). -The [Build Instructions](./docs/build.md) are a good place to get started with the app itself. +There is vestigial Go language source code (in `./bskyweb/`), for a web service that returns the React Native Web application in the social app deployment. However, it is not used in current +deer.social deployments. +For deer, the intended deployment is with a websever than can serve static files, and reroute to `index.html` as needed. Today [deer.social](https://deer.social) is hosted on [cloudflare pages](https://pages.cloudflare.com/). -The Authenticated Transfer Protocol ("AT Protocol" or "atproto") is a decentralized social media protocol. You don't *need* to understand AT Protocol to work with this application, but it can help. Learn more at: +The [Build Instructions](./docs/build.md) are a good place to get started with the app itself. If you use nix (and especially direnv) then `flake.nix` will get you a working environment for +the web version of the app. -- [Overview and Guides](https://atproto.com/guides/overview) -- [Github Discussions](https://github.com/bluesky-social/atproto/discussions) 👈 Great place to ask questions -- [Protocol Specifications](https://atproto.com/specs/atp) -- [Blogpost on self-authenticating data structures](https://bsky.social/about/blog/3-6-2022-a-self-authenticating-social-protocol) +The Authenticated Transfer Protocol ("AT Protocol" or "atproto") is a decentralized social media protocol. You don't *need* to understand AT Protocol to work with this application, but it can help. +You may wish to reference [resources linked in social-app](https://github.com/bluesky-social/social-app#development-resources). However, please don't harass the Bluesky team with issues or questions +pertaining to deer.social. -The Bluesky Social application encompasses a set of schemas and APIs built in the overall AT Protocol framework. The namespace for these "Lexicons" is `app.bsky.*`. +Deer is a fork of the official client, social-app. It encompasses a set of schemas and APIs built in the overall AT Protocol framework. The namespace for these "Lexicons" is `app.bsky.*`. ## Contributions -> While we do accept contributions, we prioritize high quality issues and pull requests. Adhering to the below guidelines will ensure a more timely review. +> deer.social is a community fork, and we'd love to merge your PR! + +As a rule of thumb, the best features for deer.social are ones that have a disproportionately positive impact on the user experience compared to the matinance overhead. +Unlike some open source projects, since deer.social is a soft fork, any features (patches) we add on top of upstream social-app need to be maintained. For example, +a change to the way posts are composed may be very invasive, touching lots of code across the codebase. If upstream refactors this component, we will need to rewrite this +feature to be compatible or drop it from the client. -**Rules:** +For this reason, bias towards features that change a relatively small amount of code that is present upstream. -- We may not respond to your issue or PR. -- We may close an issue or PR without much feedback. -- We may lock discussions or contributions if our attention is getting DDOSed. -- We're not going to provide support for build issues. +Without an overriding motivation, opinionated features should exist behind a toggle that is not enabled by default. This allows deer.social to cater to as many users as possible. **Guidelines:** - Check for existing issues before filing a new one please. - Open an issue and give some time for discussion before submitting a PR. + - This isn't strictly necessary, but I'd love to give my thoughts and scope out your willingness to maintain the feature before you write it. - Stay away from PRs like... - Changing "Post" to "Skeet." - Refactoring the codebase, e.g., to replace MobX with Redux or something. - - Adding entirely new features without prior discussion. +- Include a new toggle and preference for your feature. -Remember, we serve a wide community of users. Our day-to-day involves us constantly asking "which top priority is our top priority." If you submit well-written PRs that solve problems concisely, that's an awesome contribution. Otherwise, as much as we'd love to accept your ideas and contributions, we really don't have the bandwidth. That's what forking is for! +If we don't merge your PR for whatever reason, you are welcome to fork and/or self host: ## Forking guidelines -You have our blessing 🪄✨ to fork this application! However, it's very important to be clear to users when you're giving them a fork. +Just like social-app, you have our blessing 🪄✨ to fork this application! However, it's very important to be clear to users when you're giving them a fork. Please be sure to: -- Change all branding in the repository and UI to clearly differentiate from Bluesky. -- Change any support links (feedback, email, terms of service, etc) to your own systems. -- Replace any analytics or error-collection systems with your own so we don't get super confused. +- Change all branding in the repository and UI to clearly differentiate from deer.social. +- Change any support links (feedback, email, terms of service, issue tracker, etc) to your own systems. -## Security disclosures +## Self hosting & personal builds -If you discover any security issues, please send an email to security@bsky.app. The email is automatically CCed to the entire team and we'll respond promptly. +Self hosting is great! It is our intention that deer.social is easy to self host and build on your own. If you host your own instance of deer.social, or make your own builds, please +make some level of effort to clarify that it is not an "official" build or instance. This can be in the form of a different domain or branding, but can also be as simple as not +advertising your hosted instance or builds as "official" releases. -## Are you a developer interested in building on atproto? +## Security disclosures -Bluesky is an open social network built on the AT Protocol, a flexible technology that will never lock developers out of the ecosystems that they help build. With atproto, third-party integration can be as seamless as first-party through custom feeds, federated services, clients, and more. +If you discover any security issues, please send an email to aviva@rubenfamily.com. +If the issue pertains to infastructure, code, or systems outside the scope of deer.social, please refer to the +[disclosure guidelines on social-app](https://github.com/bluesky-social/social-app#security-disclosures) if it is hosted by Bluesky PBC. Otherwise, reference the +security policy of that system as applicable <3 ## License (MIT) See [./LICENSE](./LICENSE) for the full license. - -## P.S. - -We ❤️ you and all of the ways you support us. Thank you for making Bluesky a great place! diff --git a/deer-static-about/index.html b/deer-static-about/index.html new file mode 100644 index 000000000..873d02e91 --- /dev/null +++ b/deer-static-about/index.html @@ -0,0 +1,24 @@ + + + + + + + deer.social | about + + + + + + + + + +

redirecting to github readme...

+ + diff --git a/deer-static-about/normalize.css b/deer-static-about/normalize.css new file mode 100644 index 000000000..2768db43c --- /dev/null +++ b/deer-static-about/normalize.css @@ -0,0 +1,351 @@ +/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */ + +/* Document + ========================================================================== */ + +/** + * 1. Correct the line height in all browsers. + * 2. Prevent adjustments of font size after orientation changes in iOS. + */ + +html { + line-height: 1.15; /* 1 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/* Sections + ========================================================================== */ + +/** + * Remove the margin in all browsers. + */ + +body { + margin: 0; +} + +/** + * Render the `main` element consistently in IE. + */ + +main { + display: block; +} + +/** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/* Grouping content + ========================================================================== */ + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + +hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +pre { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/* Text-level semantics + ========================================================================== */ + +/** + * Remove the gray background on active links in IE 10. + */ + +a { + background-color: transparent; +} + +/** + * 1. Remove the bottom border in Chrome 57- + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ + +abbr[title] { + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ +} + +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ + +b, +strong { + font-weight: bolder; +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +code, +kbd, +samp { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/** + * Add the correct font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Remove the border on images inside links in IE 10. + */ + +img { + border-style: none; +} + +/* Forms + ========================================================================== */ + +/** + * 1. Change the font styles in all browsers. + * 2. Remove the margin in Firefox and Safari. + */ + +button, +input, +optgroup, +select, +textarea { + font-family: inherit; /* 1 */ + font-size: 100%; /* 1 */ + line-height: 1.15; /* 1 */ + margin: 0; /* 2 */ +} + +/** + * Show the overflow in IE. + * 1. Show the overflow in Edge. + */ + +button, +input { + /* 1 */ + overflow: visible; +} + +/** + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. + */ + +button, +select { + /* 1 */ + text-transform: none; +} + +/** + * Correct the inability to style clickable types in iOS and Safari. + */ + +button, +[type='button'], +[type='reset'], +[type='submit'] { + -webkit-appearance: button; +} + +/** + * Remove the inner border and padding in Firefox. + */ + +button::-moz-focus-inner, +[type='button']::-moz-focus-inner, +[type='reset']::-moz-focus-inner, +[type='submit']::-moz-focus-inner { + border-style: none; + padding: 0; +} + +/** + * Restore the focus styles unset by the previous rule. + */ + +button:-moz-focusring, +[type='button']:-moz-focusring, +[type='reset']:-moz-focusring, +[type='submit']:-moz-focusring { + outline: 1px dotted ButtonText; +} + +/** + * Correct the padding in Firefox. + */ + +fieldset { + padding: 0.35em 0.75em 0.625em; +} + +/** + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. + */ + +legend { + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + white-space: normal; /* 1 */ +} + +/** + * Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + +progress { + vertical-align: baseline; +} + +/** + * Remove the default vertical scrollbar in IE 10+. + */ + +textarea { + overflow: auto; +} + +/** + * 1. Add the correct box sizing in IE 10. + * 2. Remove the padding in IE 10. + */ + +[type='checkbox'], +[type='radio'] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ + +[type='number']::-webkit-inner-spin-button, +[type='number']::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ + +[type='search'] { + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ +} + +/** + * Remove the inner padding in Chrome and Safari on macOS. + */ + +[type='search']::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ + +::-webkit-file-upload-button { + -webkit-appearance: button; /* 1 */ + font: inherit; /* 2 */ +} + +/* Interactive + ========================================================================== */ + +/* + * Add the correct display in Edge, IE 10+, and Firefox. + */ + +details { + display: block; +} + +/* + * Add the correct display in all browsers. + */ + +summary { + display: list-item; +} + +/* Misc + ========================================================================== */ + +/** + * Add the correct display in IE 10+. + */ + +template { + display: none; +} + +/** + * Add the correct display in IE 10. + */ + +[hidden] { + display: none; +} diff --git a/deer-static-about/privacy.html b/deer-static-about/privacy.html new file mode 100644 index 000000000..573aee0ad --- /dev/null +++ b/deer-static-about/privacy.html @@ -0,0 +1,54 @@ + + + + + + + + deer.social | privacy policy + + + + + + + + + + +

deer.social Privacy Policy

+ +

Last Updated: April 17, 2025

+ +

Welcome to deer.social. This privacy policy explains our approach to your data when you use our application.

+ +

No Data Collection by deer.social

+

The deer.social application itself does not collect, store, track, or share any of your personal information or user data. We do not operate servers that store your account details, posts, or activity logs.

+

Our application functions solely as a client interface to interact with the underlying Bluesky social network (AT Protocol).

+ +

Reliance on Third-Party Services (AppView and PDS)

+

When you use deer.social, you connect to the Bluesky network through a specific AppView and your chosen Personal Data Server (PDS). These services are responsible for storing and managing your account information, posts, social graph, and other associated data.

+

Your data handling and privacy are governed by the Terms of Service and Privacy Policies of the specific AppView and PDS you use. deer.social simply acts on your behalf to communicate with these services based on the credentials you provide locally on your device.

+

We strongly recommend you review the policies of your chosen PDS provider and the AppView you are using. For reference, the Privacy Policy for the default Bluesky service (AppView provided by bsky.social) can be found here:

+

https://bsky.social/about/support/privacy-policy

+ +

Data Stored Locally on Your Device

+

To function, deer.social may store your login credentials or temporary session information on your own device. This data is not accessed by or transmitted to us.

+ +

Cookies and Analytics

+

deer.social does not use cookies or any tracking analytics.

+ +

Changes to This Policy

+

We may update this policy. If we do, we will update the "Effective Date" at the top of this page.

+ +

Contact Us

+

If you have questions specifically about the functionality of the deer.social application itself (and not about data managed by your PDS or AppView), please find our contact information on avivaruben.com.

+ + + diff --git a/deer-static-about/sakura.css b/deer-static-about/sakura.css new file mode 100644 index 000000000..d462b6d2a --- /dev/null +++ b/deer-static-about/sakura.css @@ -0,0 +1,283 @@ +/* Sakura.css v1.5.0 + * ================ + * Minimal css theme. + * Project: https://github.com/oxalorg/sakura/ + */ +/* Body */ +html { + font-size: 62.5%; + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, + 'Helvetica Neue', Arial, 'Noto Sans', sans-serif; +} + +body { + font-size: 1.8rem; + line-height: 1.618; + max-width: 38em; + margin: auto; + color: #4a4a4a; + background-color: #f9f9f9; + padding: 13px; +} + +@media (max-width: 684px) { + body { + font-size: 1.53rem; + } +} +@media (max-width: 382px) { + body { + font-size: 1.35rem; + } +} +@font-face { + font-family: 'InterVariable'; + src: url(/static/media/InterVariable.c504db5c06caaf7cdfba.woff2) + format('woff2'); + font-weight: 300 1000; + font-style: normal; + font-display: swap; +} +@font-face { + font-family: 'InterVariableItalic'; + src: url(/static/media/InterVariable-Italic.01dcbad1bac635f9c9cd.woff2) + format('woff2'); + font-weight: 300 1000; + font-style: italic; + font-display: swap; +} +h1, +h2, +h3, +h4, +h5, +h6 { + line-height: 1.1; + font-family: InterVariable, -apple-system, BlinkMacSystemFont, 'Segoe UI', + Roboto, 'Liberation Sans', Helvetica, Arial, sans-serif; + font-weight: 700; + margin-top: 3rem; + margin-bottom: 1.5rem; + overflow-wrap: break-word; + word-wrap: break-word; + -ms-word-break: break-all; + word-break: break-word; +} + +h1 { + font-size: 2.35em; +} + +h2 { + font-size: 2em; +} + +h3 { + font-size: 1.75em; +} + +h4 { + font-size: 1.5em; +} + +h5 { + font-size: 1.25em; +} + +h6 { + font-size: 1em; +} + +p { + margin-top: 0px; + margin-bottom: 2.5rem; +} + +small, +sub, +sup { + font-size: 75%; +} + +hr { + border-color: #1d7484; +} + +a { + text-decoration: none; + color: #1d7484; +} +a:visited { + color: #144f5a; +} +a:hover { + color: #982c61; + border-bottom: 2px solid #4a4a4a; +} + +ul { + padding-left: 1.4em; + margin-top: 0px; + margin-bottom: 2.5rem; +} + +li { + margin-bottom: 0.4em; +} + +blockquote { + margin-left: 0px; + margin-right: 0px; + padding-left: 1em; + padding-top: 0.8em; + padding-bottom: 0.8em; + padding-right: 0.8em; + border-left: 5px solid #1d7484; + margin-bottom: 2.5rem; + background-color: #f1f1f1; +} + +blockquote p { + margin-bottom: 0; +} + +img, +video { + height: auto; + max-width: 100%; + margin-top: 0px; + margin-bottom: 2.5rem; +} + +/* Pre and Code */ +pre { + background-color: #f1f1f1; + display: block; + padding: 1em; + overflow-x: auto; + margin-top: 0px; + margin-bottom: 2.5rem; + font-size: 0.9em; +} + +code, +kbd, +samp { + font-size: 0.9em; + padding: 0 0.5em; + background-color: #f1f1f1; + white-space: pre-wrap; +} + +pre > code { + padding: 0; + background-color: transparent; + white-space: pre; + font-size: 1em; +} + +/* Tables */ +table { + text-align: justify; + width: 100%; + border-collapse: collapse; + margin-bottom: 2rem; +} + +td, +th { + padding: 0.5em; + border-bottom: 1px solid #f1f1f1; +} + +/* Buttons, forms and input */ +input, +textarea { + border: 1px solid #4a4a4a; +} +input:focus, +textarea:focus { + border: 1px solid #1d7484; +} + +textarea { + width: 100%; +} + +.button, +button, +input[type='submit'], +input[type='reset'], +input[type='button'], +input[type='file']::file-selector-button { + display: inline-block; + padding: 5px 10px; + text-align: center; + text-decoration: none; + white-space: nowrap; + background-color: #1d7484; + color: #f9f9f9; + border-radius: 1px; + border: 1px solid #1d7484; + cursor: pointer; + box-sizing: border-box; +} +.button[disabled], +button[disabled], +input[type='submit'][disabled], +input[type='reset'][disabled], +input[type='button'][disabled], +input[type='file']::file-selector-button[disabled] { + cursor: default; + opacity: 0.5; +} +.button:hover, +button:hover, +input[type='submit']:hover, +input[type='reset']:hover, +input[type='button']:hover, +input[type='file']::file-selector-button:hover { + background-color: #982c61; + color: #f9f9f9; + outline: 0; +} +.button:focus-visible, +button:focus-visible, +input[type='submit']:focus-visible, +input[type='reset']:focus-visible, +input[type='button']:focus-visible, +input[type='file']::file-selector-button:focus-visible { + outline-style: solid; + outline-width: 2px; +} + +textarea, +select, +input { + color: #4a4a4a; + padding: 6px 10px; /* The 6px vertically centers text on FF, ignored by Webkit */ + margin-bottom: 10px; + background-color: #f1f1f1; + border: 1px solid #f1f1f1; + border-radius: 4px; + box-shadow: none; + box-sizing: border-box; +} +textarea:focus, +select:focus, +input:focus { + border: 1px solid #1d7484; + outline: 0; +} + +input[type='checkbox']:focus { + outline: 1px dotted #1d7484; +} + +label, +legend, +fieldset { + display: block; + margin-bottom: 0.5rem; + font-weight: 600; +} diff --git a/deer-static-about/tos.html b/deer-static-about/tos.html new file mode 100644 index 000000000..14d462ce4 --- /dev/null +++ b/deer-static-about/tos.html @@ -0,0 +1,65 @@ + + + + + + + + deer.social | terms of service + + + + + + + + + + +

Terms of Service for deer.social

+ +

Last Updated: April 17, 2025

+ +

Introduction

+

Welcome to deer.social! These Terms of Service ("Terms") govern your use of the deer.social application ("App"). By accessing or using the App, you agree to be bound by these Terms.

+ +

Your Agreement

+

Using deer.social signifies your acceptance of these Terms. Please also review our Privacy Policy, which explains how we handle data related to the App itself.

+ +

Relationship to Other Services and Platforms

+

deer.social functions as a client or interface. It allows you to interact with decentralized social media protocols, instances, or servers (your "AppView" or "Personal Data Server" / "PDS").

+

Important: deer.social does not host your data or control the underlying networks or servers you connect to. Your interaction with these third-party services, including the content you post and view, is governed by the Terms of Service, acceptable use policies, and privacy policies of the specific AppView and/or PDS you choose to use.

+

You are responsible for understanding and complying with the terms of those external services.

+ +

We strongly recommend you review the policies of your chosen PDS provider and the AppView you are using. For reference, the Terms of Service for the default Bluesky service (AppView provided by bsky.social) can be found here:

+

https://bsky.social/about/support/tos

+ +

User Conduct

+

Your conduct while using deer.social must comply with the terms and rules set forth by the AppView and PDS you are connected to. deer.social is merely a tool to access these services, and Aviva Ruben is not responsible for enforcing the rules of those platforms or for the content accessed through them.

+ +

Disclaimer of Warranty

+

The App is provided "AS IS" and "AS AVAILABLE," without warranty of any kind, express or implied. Aviva Ruben does not warrant that the App will meet your requirements, be available uninterrupted, secure, or error-free.

+ +

Limitation of Liability

+

To the fullest extent permitted by applicable law, Aviva Ruben shall not be liable for any indirect, incidental, special, consequential, or punitive damages, or any loss of profits or revenues, whether incurred directly or indirectly, or any loss of data, use, goodwill, or other intangible losses, resulting from:

+ +

In no event shall the aggregate liability of Aviva Ruben exceed the greater of zero U.S. dollars ($0.00).

+ +

Changes to These Terms

+

We may revise these Terms from time to time. The most current version will always be available within the App or on its associated website. By continuing to access or use the App after revisions become effective, you agree to be bound by the revised Terms.

+ +

Contact Information

+

If you have any questions about these Terms of Service, please refer to the contact information available on avivaruben.com.

+ + + diff --git a/pages_build.sh b/pages_build.sh index ac19cba42..d724fa40d 100755 --- a/pages_build.sh +++ b/pages_build.sh @@ -9,3 +9,6 @@ sed -i 's/\(src\|href\)="static/\1="\/static/g' web-build/index.html # we need to copy the static iframe html to support youtube embeds cp -r bskyweb/static/iframe/ web-build/iframe + +# copy our static pages over! +cp -r deer-static-about web-build/about diff --git a/src/lib/constants.ts b/src/lib/constants.ts index bb98f9fc8..11577d5c4 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -7,8 +7,7 @@ export const STAGING_SERVICE = 'https://staging.bsky.dev' export const BSKY_SERVICE = 'https://bsky.social' export const PUBLIC_BSKY_SERVICE = 'https://public.api.bsky.app' export const DEFAULT_SERVICE = BSKY_SERVICE -const HELP_DESK_LANG = 'en-us' -export const HELP_DESK_URL = `https://blueskyweb.zendesk.com/hc/${HELP_DESK_LANG}` +export const HELP_DESK_URL = `https://github.com/a-viv-a/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' @@ -33,22 +32,12 @@ export const DISCOVER_DEBUG_DIDS: Record = { 'did:plc:tgqseeot47ymot4zro244fj3': true, // iwsmith.bsky.social } -const BASE_FEEDBACK_FORM_URL = `${HELP_DESK_URL}/requests/new` -export function FEEDBACK_FORM_URL({ - email, - handle, -}: { +const BASE_FEEDBACK_FORM_URL = `${HELP_DESK_URL}` +export function FEEDBACK_FORM_URL(_params: { email?: string handle?: string }): string { - let str = BASE_FEEDBACK_FORM_URL - if (email) { - str += `?tf_anonymous_requester_email=${encodeURIComponent(email)}` - if (handle) { - str += `&tf_17205412673421=${encodeURIComponent(handle)}` - } - } - return str + return BASE_FEEDBACK_FORM_URL } export const MAX_DISPLAY_NAME = 64 diff --git a/src/screens/Settings/AboutSettings.tsx b/src/screens/Settings/AboutSettings.tsx index 53456c28c..44ba254b5 100644 --- a/src/screens/Settings/AboutSettings.tsx +++ b/src/screens/Settings/AboutSettings.tsx @@ -75,7 +75,7 @@ export function AboutSettingsScreen({}: Props) { @@ -83,7 +83,7 @@ export function AboutSettingsScreen({}: Props) { diff --git a/src/screens/Takendown.tsx b/src/screens/Takendown.tsx index c714a775e..240c10fb8 100644 --- a/src/screens/Takendown.tsx +++ b/src/screens/Takendown.tsx @@ -3,7 +3,7 @@ import {Modal, View} from 'react-native' import {KeyboardAwareScrollView} from 'react-native-keyboard-controller' import {useSafeAreaInsets} from 'react-native-safe-area-context' import {StatusBar} from 'expo-status-bar' -import {ComAtprotoAdminDefs, ComAtprotoModerationDefs} from '@atproto/api' +import {type ComAtprotoAdminDefs, ComAtprotoModerationDefs} from '@atproto/api' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' import {useMutation} from '@tanstack/react-query' @@ -215,7 +215,7 @@ export function Takendown() { Your account was found to be in violation of the{' '} Bluesky Social Terms of Service diff --git a/src/view/screens/PrivacyPolicy.tsx b/src/view/screens/PrivacyPolicy.tsx index 57e4652b5..3ac637643 100644 --- a/src/view/screens/PrivacyPolicy.tsx +++ b/src/view/screens/PrivacyPolicy.tsx @@ -5,7 +5,10 @@ import {useLingui} from '@lingui/react' import {useFocusEffect} from '@react-navigation/native' import {usePalette} from '#/lib/hooks/usePalette' -import {CommonNavigatorParams, NativeStackScreenProps} from '#/lib/routes/types' +import { + type CommonNavigatorParams, + type NativeStackScreenProps, +} from '#/lib/routes/types' import {s} from '#/lib/styles' import {useSetMinimalShellMode} from '#/state/shell' import {TextLink} from '#/view/com/util/Link' @@ -36,7 +39,7 @@ 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 fa40fbca3..0950d9243 100644 --- a/src/view/screens/TermsOfService.tsx +++ b/src/view/screens/TermsOfService.tsx @@ -5,7 +5,10 @@ import {useLingui} from '@lingui/react' import {useFocusEffect} from '@react-navigation/native' import {usePalette} from '#/lib/hooks/usePalette' -import {CommonNavigatorParams, NativeStackScreenProps} from '#/lib/routes/types' +import { + type CommonNavigatorParams, + type NativeStackScreenProps, +} from '#/lib/routes/types' import {s} from '#/lib/styles' import {useSetMinimalShellMode} from '#/state/shell' import {TextLink} from '#/view/com/util/Link' @@ -35,7 +38,7 @@ 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 d51db3960..e8db75177 100644 --- a/src/view/shell/Drawer.tsx +++ b/src/view/shell/Drawer.tsx @@ -641,12 +641,12 @@ function ExtraLinks() { + to="https://deer.social/about/tos"> Terms of Service Privacy Policy diff --git a/src/view/shell/desktop/RightNav.tsx b/src/view/shell/desktop/RightNav.tsx index 18ce42ee8..bb5e0ff3c 100644 --- a/src/view/shell/desktop/RightNav.tsx +++ b/src/view/shell/desktop/RightNav.tsx @@ -106,13 +106,13 @@ export function DesktopRightNav({routeName}: {routeName: string}) { )} {_(msg`Privacy`)} {' • '} {_(msg`Terms`)}