Merge branch 'main' into hailey/add-license-info

 This is the 1st commit message:

add acknowledges file

rename script

rename script

add generation to dockerfile

add to go server

use a different name and path

add script to package.json

update .gitignore

add package

update robots


 The commit message #2 will be skipped:


 add package


 The commit message #3 will be skipped:


 update .gitignore


 The commit message #4 will be skipped:


 add script to package.json


 The commit message #5 will be skipped:


 use a different name and path


 The commit message #6 will be skipped:


 add to go server


 The commit message #7 will be skipped:


 add generation to dockerfile


 The commit message #8 will be skipped:


 rename script

.gitignore

@@ -118,3 +118,6 @@ src/locale/locales/**/*.js
 
 # ogcard assets
 bskyogcard/src/assets/fonts/noto-*
+
+# license file
+bskyweb/static/ACKNOWLEDGEMENTS.txt

Dockerfile

@@ -38,6 +38,7 @@ RUN \. "$NVM_DIR/nvm.sh" && \
   echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env && \
   npm install --global yarn && \
   yarn && \
+  yarn generate-acknowledgements-file && \
   yarn intl:build && \
   EXPO_PUBLIC_BUNDLE_IDENTIFIER=$EXPO_PUBLIC_BUNDLE_IDENTIFIER EXPO_PUBLIC_BUNDLE_DATE=$() yarn build-web
 

bskyweb/cmd/bskyweb/server.go

@@ -177,6 +177,7 @@ func serve(cctx *cli.Context) error {
 	}())
 
 	e.GET("/robots.txt", echo.WrapHandler(staticHandler))
+	e.GET("/ACKNOWLEDGEMENTS.txt", echo.WrapHandler(staticHandler))
 	e.GET("/ips-v4", echo.WrapHandler(staticHandler))
 	e.GET("/ips-v6", echo.WrapHandler(staticHandler))
 	e.GET("/.well-known/*", echo.WrapHandler(staticHandler))

bskyweb/static/robots.txt

@@ -8,3 +8,4 @@
 User-Agent: *
 Allow: /
 Disallow: /video-download
+Disallow: /ACKNOWLEDGEMENTS.txt

package.json

@@ -49,7 +49,8 @@
     "export": "npx expo export",
     "make-deploy-bundle": "bash scripts/bundleUpdate.sh",
     "generate-webpack-stats-file": "EXPO_PUBLIC_GENERATE_STATS=1 yarn build-web",
-    "open-analyzer": "EXPO_PUBLIC_OPEN_ANALYZER=1 yarn build-web"
+    "open-analyzer": "EXPO_PUBLIC_OPEN_ANALYZER=1 yarn build-web",
+    "generate-acknowledgements-file": "npx generate-license-file --input ./package.json --output ./bskyweb/static/ACKNOWLEDGEMENTS.txt"
   },
   "dependencies": {
     "@atproto/api": "0.13.0",

src/view/screens/Settings/index.tsx

@@ -23,6 +23,7 @@ import {useModalControls} from '#/state/modals'
 import {clearStorage} from '#/state/persisted'
 import {
   useInAppBrowser,
+  useOpenLink,
   useSetInAppBrowser,
 } from '#/state/preferences/in-app-browser'
 import {useDeleteActorDeclaration} from '#/state/queries/messages/actor-declaration'
@@ -162,6 +163,7 @@ export function SettingsScreen({}: Props) {
   const queryClient = useQueryClient()
   const pal = usePalette('default')
   const {_} = useLingui()
+  const openLink = useOpenLink()
   const setMinimalShellMode = useSetMinimalShellMode()
   const inAppBrowserPref = useInAppBrowser()
   const setUseInAppBrowser = useSetInAppBrowser()
@@ -882,29 +884,38 @@ export function SettingsScreen({}: Props) {
           </TouchableOpacity>
         </View>
 
-        <View
-          style={[
-            {flexWrap: 'wrap', gap: 12, paddingHorizontal: 18},
-            s.flexRow,
-          ]}>
-          <TextLink
-            type="md"
-            style={pal.link}
-            href="https://bsky.social/about/support/tos"
-            text={_(msg`Terms of Service`)}
-          />
-          <TextLink
-            type="md"
-            style={pal.link}
-            href="https://bsky.social/about/support/privacy-policy"
-            text={_(msg`Privacy Policy`)}
-          />
-          <TextLink
-            type="md"
-            style={pal.link}
-            href={STATUS_PAGE_URL}
-            text={_(msg`Status Page`)}
-          />
+        <View style={[{gap: 12, paddingHorizontal: 18, paddingTop: 8}]}>
+          <View style={{flexDirection: 'row', gap: 24}}>
+            <TextLink
+              type="md"
+              style={[s.flex1, pal.link]}
+              href="https://bsky.social/about/support/tos"
+              text={_(msg`Terms of Service`)}
+            />
+            <TextLink
+              type="md"
+              style={[s.flex1, pal.link]}
+              href="https://bsky.social/about/support/privacy-policy"
+              text={_(msg`Privacy Policy`)}
+            />
+          </View>
+          <View style={{flexDirection: 'row', gap: 24}}>
+            <TextLink
+              type="md"
+              style={[s.flex1, pal.link]}
+              href="https://bsky.app/ACKNOWLEDGEMENTS.txt"
+              onPress={() => {
+                openLink('https://bsky.app/ACKNOWLEDGEMENTS.txt')
+              }}
+              text={_(msg`Acknowledgements`)}
+            />
+            <TextLink
+              type="md"
+              style={[s.flex1, pal.link]}
+              href={STATUS_PAGE_URL}
+              text={_(msg`Status Page`)}
+            />
+          </View>
         </View>
         <View style={s.footerSpacer} />
       </ScrollView>