patches to change default glitch settings for logged out users

README.md

@@ -39,6 +39,7 @@ systemctl restart mastodon-*
 
 - [`favicons.patch`](patches/favicons.patch): Use custom icon images instead of Mastodon logo
 - [`robots.patch`](patches/robots.patch): Disallow search engines for all of Mastodon
+- [`increase-sidekiq-http-timeout.patch`](patches/increase-sidekiq-http-timeout.patch): Minor increase in time before Sidekiq decides a remove instance isn't available. **Use this one carefully!**
 - [`system-font.patch`](patches/system-font.patch): Use the system's default sans-serif font stack instead of Roboto
   - [Additional `glitch-soc` patch](patches/glitch/system-font.patch)
 - [`hide-contact-email.patch`](patches/hide-contact-email.patch): Hides the `mailto:` link on the About page
@@ -47,7 +48,10 @@ systemctl restart mastodon-*
   - [Additional `glitch-soc` patch](patches/glitch/hide-rules.patch)
 - [`hide-signup.patch`](patches/hide-signup.patch): Hide the "create account" button (for aesthetics, **not security!**)
   - [Additional `glitch-soc` patch](patches/glitch/hide-signup.patch)
-- [`glitch-soc` only] [`sidebar-logo.patch`](patches/glitch/sidebar-logo.patch): Restore Mastodon logo in logged-out sidebar
+- `glitch-soc` only:
+  - [`custom-glitch-defaults.patch`](patches/glitch/custom-glitch-defaults.patch): Sets default Glitch appearance settings for logged-out users
+  - [`remove-glitch-cruft.patch`](patches/glitch/remove-glitch-cruft.patch): Removes a bunch of junk no longer used by `glitch-soc`
+  - [`sidebar-logo.patch`](patches/glitch/sidebar-logo.patch): Restore Mastodon logo in logged-out sidebar
 
 ## License
 

etc/nginx/nginx.conf

@@ -22,7 +22,6 @@ http {
 	sendfile on;
 	tcp_nopush on;
 	tcp_nodelay on;
-	keepalive_timeout 65;
 	types_hash_max_size 2048;
 
 	##

patches/glitch/custom-glitch-defaults.patch

@@ -0,0 +1,53 @@
+diff --git a/app/javascript/flavours/glitch/reducers/local_settings.js b/app/javascript/flavours/glitch/reducers/local_settings.js
+index 81ab1cb0d..8aa07d4c3 100644
+--- a/app/javascript/flavours/glitch/reducers/local_settings.js
++++ b/app/javascript/flavours/glitch/reducers/local_settings.js
+@@ -11,7 +11,7 @@ const initialState = ImmutableMap({
+   navbar_under : false,
+   side_arm  : 'none',
+   side_arm_reply_mode : 'keep',
+-  show_reply_count : false,
++  show_reply_count : true,
+   always_show_spoilers_field: false,
+   confirm_missing_media_description: false,
+   confirm_boost_missing_media_description: false,
+@@ -19,10 +19,10 @@ const initialState = ImmutableMap({
+   prepend_cw_re: true,
+   preselect_on_reply: true,
+   inline_preview_cards: true,
+-  hicolor_privacy_icons: false,
++  hicolor_privacy_icons: true,
+   show_content_type_choice: false,
+   tag_misleading_links: true,
+-  rewrite_mentions: 'no',
++  rewrite_mentions: 'acct',
+   content_warnings : ImmutableMap({
+     filter       : null,
+     media_outside: false,
+@@ -33,7 +33,7 @@ const initialState = ImmutableMap({
+     auto        : ImmutableMap({
+       all              : false,
+       notifications    : true,
+-      lengthy          : true,
++      lengthy          : false,
+       reblogs          : false,
+       replies          : false,
+       media            : false,
+@@ -45,7 +45,7 @@ const initialState = ImmutableMap({
+     show_action_bar : true,
+   }),
+   media     : ImmutableMap({
+-    letterbox        : true,
++    letterbox        : false,
+     fullwidth        : true,
+     reveal_behind_cw : false,
+     pop_in_player    : true,
+@@ -56,7 +56,7 @@ const initialState = ImmutableMap({
+     tab_badge     : true,
+   }),
+   status_icons : ImmutableMap({
+-    language:   true,
++    language:   false,
+     reply:      true,
+     local_only: true,
+     media:      true,

patches/increase-sidekiq-http-timeout.patch

@@ -0,0 +1,13 @@
+diff --git a/app/lib/request.rb b/app/lib/request.rb
+index 96d934a8f..63acfd5c6 100644
+--- a/app/lib/request.rb
++++ b/app/lib/request.rb
+@@ -20,7 +20,7 @@ class Request
+   # We enforce a 5s timeout on DNS resolving, 5s timeout on socket opening
+   # and 5s timeout on the TLS handshake, meaning the worst case should take
+   # about 15s in total
+-  TIMEOUT = { connect: 5, read: 10, write: 10 }.freeze
++  TIMEOUT = { connect: 10, read: 15, write: 15 }.freeze
+ 
+   include RoutingHelper
+ 

scripts/apply_patches.sh

@@ -21,11 +21,11 @@ fi
 
 # apply custom patches
 cd "$APP_ROOT"
-sudo -u mastodon git apply --allow-binary-replacement "$SCRIPTS_ROOT"/patches/*.patch
+sudo -u mastodon git apply --reject --allow-binary-replacement "$SCRIPTS_ROOT"/patches/*.patch
 if [ -d "$APP_ROOT/app/javascript/flavours/glitch" ];
 then
   # apply additional glitch-only patches:
-  sudo -u mastodon git apply --allow-binary-replacement "$SCRIPTS_ROOT"/patches/glitch/*.patch
+  sudo -u mastodon git apply --reject --allow-binary-replacement "$SCRIPTS_ROOT"/patches/glitch/*.patch
 fi
 
 # update dependencies