diff --git a/LICENSE b/LICENSE
index 5ee77394f..c004853bf 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,6 @@
-Copyright 2025 Aviva Ruben
+MIT License
+
+Copyright (c) 2025 Jollywhoppers
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 3926116f3..70aa6474e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Bitchsky Social App 🧙
-Hey, bitches! This is the codebase for the Bitchsky app, based on [social.daniela.lol](https://github.com/kittibytess/deer-social) based on [deer.social](https://github.com/a-viv-a/deer-social).
+Hey, bitches! This is the codebase for the Bitchsky app, based on [social.daniela.lol](https://github.com/kittibytess/deer-social) and code from prior [Bluesky](https://github.com/bluesky-social/social-app) forks.
Get the app itself:
@@ -21,7 +21,7 @@ alt="Get it on Obtainium" align="center" height="54" />
- Share links to bitchsky.app or bsky.app
- Embed player works with [stream.place](https://stream.place/) links!
- No push notifications (may be added later)
-- Kept super up-to-date (rarely unstable as a result)
+- Kept super up-to-date (sporadically unstable as a result)
### Experiments
@@ -63,7 +63,7 @@ You can disable the visiblity of all metrics individually, including the number
## Upcoming or wishful features
-- OpenGraph support for sharing profiles & skeets
+- Better OpenGraph support for sharing profiles & skeets (including videos)
- Selecting a custom AppView
- Seeing past blocks in threads (the nuclear block for reply chains)
- Configure the location used to determine regional labelers
@@ -75,6 +75,7 @@ You can disable the visiblity of all metrics individually, including the number
- [ ] ./src/alf/themes.ts (improve contrast, esp. of links)
- [ ] ./src/lib/styles.ts (change likes color, remove gradient from new skeet button)
- [ ] ./src/style.css (change links color)
+ - [ ] ./assets/app-icons/ (change new bksy logos to fit Bitchsky -remove from social embed!)
- [ ] Setup App Linking for Android (.well-known w/ app package fingerprint)
- [ ] Automatic PDS detection like other social-app forks
- [ ] Like of or repost of repost icons from blacksky
@@ -82,8 +83,18 @@ You can disable the visiblity of all metrics individually, including the number
- [ ] Change ChatEmptyPill things for English locale
- [ ] stuff from forks like [deer.aylac.top](https://github.com/ayla6/deer-social-test) for pronouns+
- [ ] Visual replies indicator like the [Firmament userstyle](https://bitchsky.app/profile/did:plc:jwhxcrf5uvl3vyw7nurecgt5/post/3m4rr3vzmak2a)
+- [ ] Additional translation service providers + setting (Deepl, Kagi)
+- [ ] Collapse labels past the 1st (or 2nd,...; customizable) from the same labeler into a labeler clip of the same style "(+)"
+- [ ] Move Mutuals label to the follow button
+- [ ] New fun language(s)
- [ ] Bitchsky PDS and .social site
+#### Bugs
+
+- [ ] Fix app crash on tapping profile header (./src/view/com/util/UserBanner.tsx)
+- [ ] Fix inability to zoom in on image lightboxes
+- [ ] Fix chat input overlapping with chat messages (going upwards)
+
### Even more wishful or far off
- [ ] iOS app IPA?
@@ -103,33 +114,33 @@ The [Build Instructions](./docs/build.md) are a good place to get started with t
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 Bitchsky.
-Bitchsky 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.*`.
+Bitchsky is a fork of the official Bluesky 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
> Bitchsky is a community fork, and we'd love to merge your PR!
-As a rule of thumb, the best features for Bitchsky are those that offer a strong positives that have a disproportionately positive impact on the user experience compared to the maintenance overhead. Unlike some open source projects, since Bitchsky 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 skeets 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.
+As a rule of thumb, the best features for Bitchsky are those that have a disproportionately positive impact on the user experience compared to the maintenance overhead. Unlike some open source projects, since Bitchsky 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 skeets 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.
-For this reason, bias towards features that change a relatively small amount of code that is present upstream.
+For this reason, only features that require changing only a small amount of code from upstream should be considered.
Without an overriding motivation, opinionated features should exist behind a toggle that is not enabled by default. This allows Bitchsky to cater to as many users as possible.
-**Guidelines:**
+### 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.
+ - This isn't strictly necessary, but the lead developers would love to give their 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 React Query with Redux Toolkit or something.
+ - Changing "Quote" to "Bitch."
+ - Refactoring the codebase, e.g., to replace React Query with Redux Toolkit, etc.
- Include a new toggle and preference for your feature.
If we don't merge your PR for whatever reason, you are welcome to fork and/or self-host:
## Forking guidelines
-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.
+Just like social-app, you have our blessing 🪄✨ to fork this application! However, it's very important to make it clear to users when you're giving them a fork.
Please be sure to:
@@ -153,4 +164,4 @@ Bluesky Social PBC has committed to a software patent non-aggression pledge. For
## P.S.
-We ❤️ you and all of the ways you support us. Thank you for making Bluesky & Bitchsky so great!
+We ❤️ you and all of the ways you support us. Thank you for making Bluesky & Bitchsky so great! ^.^
diff --git a/src/view/com/composer/Composer.tsx b/src/view/com/composer/Composer.tsx
index 7746d93c3..02be10675 100644
--- a/src/view/com/composer/Composer.tsx
+++ b/src/view/com/composer/Composer.tsx
@@ -1064,7 +1064,7 @@ function ComposerTopBar({
<>
{publishingStage}
-
+
>
) : (