Modern theme update to latest version

.env.production.migration

@@ -1,47 +0,0 @@
-# Generated with mastodon:setup on 2022-11-15 15:48:19 UTC
-
-LOCAL_DOMAIN=wobbl.xyz
-SECRET_KEY_BASE=c83da357f00bdffa6701aa01e6c9bc116c6ef9279df7dcf1d8c38d23c819ac9de81302113b1e2c10ecdb927b15f06001cb75a90c8cfe7b9b98be95b1dd5188ba
-OTP_SECRET=792df590b3e0796e6ba6703e516efe83c839d5d4be3769bfa043b0e91d155ffb74f0e2d536db5c92142aaccddbf66b1c26c34d77be418a015e3f2463a6e22320
-VAPID_PRIVATE_KEY=WY5iQamqojTy6wbgrafpzqc8I98TLA-ICd3jJlPqmVg=
-VAPID_PUBLIC_KEY=BH4EG4Ptt-__2lG7J8r7E10KDREzkSQWlqWjk12ZypX7_-z4STFDKqhLEnW_k73tSZY9DIBpePgD2oE6WfV52tU=
-DB_HOST=wobbl-db-do-user-12896033-0.b.db.ondigitalocean.com
-DB_PORT=25061
-DB_NAME=mastodon_production
-DB_USER=doadmin
-DB_PASS=AVNS_PRyTPQxHtb2b0hVU6k9
-PREPARED_STATEMENTS=false
-REDIS_HOST=localhost
-REDIS_PORT=6379
-SMTP_SERVER=smtppro.zoho.com
-SMTP_PORT=465
-SMTP_LOGIN=drew@gyro-tech.net
-SMTP_PASSWORD=xBb11buC51Uw
-SMTP_AUTH_METHOD=plain
-SMTP_OPENSSL_VERIFY_MODE=none
-SMTP_FROM_ADDRESS=Mastodon <notifications@wobbl.xyz>
-SMTP_SSL=true
-S3_ALIAS_HOST=media.wobbl.xyz
-S3_ENABLED=true
-S3_BUCKET=wobblstore
-AWS_ACCESS_KEY_ID=DO00CAHETF4R6VJUL2CY
-AWS_SECRET_ACCESS_KEY=2TdKYVE2Q7tl4gl5kNHAN9hedJ/4IOWSTciIKshviR0
-S3_PROTOCOL=https
-S3_REGION=us-east-1
-S3_HOSTNAME=wobblstore.nyc3.digitaloceanspaces.com
-S3_ENDPOINT=https://nyc3.digitaloceanspaces.com
-ES_ENABLED=true
-ES_HOST=localhost
-ES_PORT=9200
-DEEPL_API_KEY="eb039661-3635-bf38-6d92-19a2a15c0795:fx"
-DEEPL_PLAN=free
-STATSD_ADDR=localhost:9125
-MAX_TOOT_CHARS=1500
-
-
-# Scaling work
-WEB_CONCURRENCY=5
-MAX_THREADS=5
-DB_POOL=18
-
-MAX_IMAGE_SIZE=16777216

.env.production.old

@@ -1,48 +0,0 @@
-# Generated with mastodon:setup on 2022-11-15 15:48:19 UTC
-
-LOCAL_DOMAIN=wobbl.xyz
-SECRET_KEY_BASE=c83da357f00bdffa6701aa01e6c9bc116c6ef9279df7dcf1d8c38d23c819ac9de81302113b1e2c10ecdb927b15f06001cb75a90c8cfe7b9b98be95b1dd5188ba
-OTP_SECRET=792df590b3e0796e6ba6703e516efe83c839d5d4be3769bfa043b0e91d155ffb74f0e2d536db5c92142aaccddbf66b1c26c34d77be418a015e3f2463a6e22320
-VAPID_PRIVATE_KEY=WY5iQamqojTy6wbgrafpzqc8I98TLA-ICd3jJlPqmVg=
-VAPID_PUBLIC_KEY=BH4EG4Ptt-__2lG7J8r7E10KDREzkSQWlqWjk12ZypX7_-z4STFDKqhLEnW_k73tSZY9DIBpePgD2oE6WfV52tU=
-DB_HOST=/var/run/postgresql
-DB_PORT=5432
-DB_NAME=mastodon_production
-DB_USER=mastodon
-DB_PASS=bDyxK8nLdCgm
-#PREPARED_STATEMENTS=false
-REDIS_HOST=localhost
-REDIS_PORT=6379
-SMTP_SERVER=smtppro.zoho.com
-SMTP_PORT=465
-SMTP_LOGIN=drew@gyro-tech.net
-SMTP_PASSWORD=xBb11buC51Uw
-SMTP_AUTH_METHOD=plain
-SMTP_OPENSSL_VERIFY_MODE=none
-SMTP_FROM_ADDRESS=Mastodon <notifications@wobbl.xyz>
-SMTP_SSL=true
-S3_ALIAS_HOST=media.wobbl.xyz
-S3_ENABLED=true
-S3_BUCKET=wobblstore
-AWS_ACCESS_KEY_ID=DO00CAHETF4R6VJUL2CY
-AWS_SECRET_ACCESS_KEY=2TdKYVE2Q7tl4gl5kNHAN9hedJ/4IOWSTciIKshviR0
-S3_PROTOCOL=https
-S3_REGION=us-east-1
-S3_HOSTNAME=wobblstore.nyc3.digitaloceanspaces.com
-S3_ENDPOINT=https://nyc3.digitaloceanspaces.com
-ES_ENABLED=true
-ES_HOST=localhost
-ES_PORT=9200
-DEEPL_API_KEY="eb039661-3635-bf38-6d92-19a2a15c0795:fx"
-DEEPL_PLAN=free
-STATSD_ADDR=localhost:9125
-MAX_TOOT_CHARS=1500
-
-
-# Scaling work
-WEB_CoNCURRENCY=5
-MAX_THREADS=5
-DB_POOL=25
-
-# Image Size
-MAX_IMAGE_SIZE=16777216

app/javascript/flavours/glitch/packs/common-modern.js

@@ -0,0 +1,8 @@
+import 'packs/public-path';
+import { start } from '@rails/ujs';
+import 'flavours/glitch/styles/modern.scss';
+
+start();
+
+//  This ensures that webpack compiles our images.
+require.context('../images', true);

app/javascript/flavours/glitch/styles/modern.scss

@@ -0,0 +1,5 @@
+@import 'index';
+
+@import 'modern/modern';
+
+@import 'modern/diff';

app/javascript/flavours/glitch/styles/modern/diff.css

@@ -0,0 +1,294 @@
+body.app-body.flavour-modern-glitch
+  > #mastodon
+  .compose-form__autosuggest-wrapper
+  > :last-child {
+  padding-bottom: 2em !important;
+}
+
+body.app-body.flavour-modern-glitch > #mastodon .compose-form__buttons {
+  width: 100%;
+}
+
+body.app-body.flavour-modern-glitch
+  > #mastodon
+  .compose-form__buttons
+  > div:last-child {
+  margin-inline-start: auto;
+}
+
+body.app-body.flavour-modern-glitch > #mastodon .compose-form__buttons-wrapper {
+  position: relative;
+}
+
+body.app-body.flavour-modern-glitch > #mastodon .character-counter__wrapper {
+  position: absolute;
+  inset-inline-end: 0;
+  bottom: 100%;
+  margin: 4px;
+  border-radius: 6px;
+  padding: 0.1em 0.5em;
+}
+
+body.app-body.flavour-modern-glitch
+  > #mastodon
+  .character-counter__wrapper
+  span {
+  font-size: 0.9em;
+  font-weight: 500;
+}
+
+body.app-body.flavour-modern-glitch > #mastodon .collapsed .status__content {
+  height: auto !important;
+  overflow: visible;
+}
+
+body.app-body.flavour-modern-glitch
+  > #mastodon
+  .collapsed
+  .status__content
+  .status__content__text {
+  mask: linear-gradient(to bottom, #000 50px, transparent) !important;
+  -webkit-mask: linear-gradient(to bottom, #000 50px, transparent) !important;
+  max-height: 100px;
+}
+
+body.app-body.flavour-modern-glitch
+  > #mastodon
+  .collapsed
+  .status__content
+  p:not(:last-child) {
+  margin-bottom: 0.4em;
+}
+
+body.app-body.flavour-modern-glitch > #mastodon .collapsed .status__content br {
+  display: block;
+}
+
+body.app-body.flavour-modern-glitch
+  > #mastodon
+  .collapsed
+  .status__content::after {
+  content: unset;
+}
+
+body.app-body.flavour-modern-glitch
+  > #mastodon
+  .collapsed.muted
+  .status__content__text
+  ~ * {
+  display: none;
+}
+
+body.app-body.flavour-modern-glitch
+  > #mastodon
+  .status:not(.status-direct)
+  > .status__content {
+  margin-block: -90px -100px !important;
+  padding-block: 100px !important;
+}
+
+body.app-body.flavour-modern-glitch
+  > #mastodon
+  .status:not(.status-direct)
+  > .status__content
+  .status__content__text {
+  margin-top: 0;
+}
+
+body.app-body.flavour-modern-glitch
+  > #mastodon
+  .status:not(.status-direct)
+  > .status__content
+  > :last-child:not(.status__content__text) {
+  margin-bottom: 5px !important;
+}
+
+body.app-body.flavour-modern-glitch > #mastodon .status .full-width {
+  margin-inline: 0 !important;
+}
+
+body.app-body.flavour-modern-glitch > #mastodon .status .status__action-bar {
+  position: static;
+}
+
+body.app-body.flavour-modern-glitch
+  > #mastodon
+  .status__info
+  .notification__message {
+  padding-top: 0 !important;
+  padding-inline-start: 0 !important;
+}
+
+body.app-body.flavour-modern-glitch > #mastodon .status__display-name {
+  line-height: 22px;
+}
+
+body.app-body.flavour-modern-glitch > #mastodon .display-name__account {
+  font-size: 15px;
+}
+
+body.app-body.flavour-modern-glitch
+  > #mastodon
+  .media-gallery__item
+  > .media-gallery__preview {
+  display: unset;
+}
+
+body.app-body.flavour-modern-glitch > #mastodon .status__action-bar-spacer {
+  min-width: 5px;
+}
+
+body.app-body.flavour-modern-glitch > #mastodon .status__relative-time {
+  margin-inline: auto 5px !important;
+  z-index: 2;
+  flex-grow: 0 !important;
+}
+
+body.app-body.flavour-modern-glitch > #mastodon .reactions-bar {
+  width: unset;
+  margin-top: 8px;
+}
+
+body.app-body.flavour-modern-glitch > #mastodon .reactions-bar button {
+  border-radius: 6px !important;
+  padding-block: 2px;
+}
+@media (pointer: coarse) {
+  body.app-body.flavour-modern-glitch > #mastodon .reactions-bar button {
+    padding: 4px 8px !important;
+  }
+
+  body.app-body.flavour-modern-glitch
+    > #mastodon
+    .reactions-bar
+    button
+    .reactions-bar__item__emoji {
+    height: 18px;
+    width: 18px;
+  }
+}
+
+body.app-body.flavour-modern-glitch > #mastodon .reactions-bar:empty {
+  display: none;
+}
+
+body.app-body.flavour-modern-glitch
+  > #mastodon
+  .collapsed
+  > .status__info
+  .notification__message {
+  padding-bottom: 0 !important;
+}
+
+body.app-body.flavour-modern-glitch
+  > #mastodon
+  .notification
+  > .notification__message {
+  padding-inline: 15px !important;
+  padding-top: 18px !important;
+}
+
+body.app-body.flavour-modern-glitch > #mastodon .notification .account {
+  padding-inline-start: 0 !important;
+}
+
+body.app-body.flavour-modern-glitch
+  > #mastodon
+  .notification__favourite-icon-wrapper {
+  position: static;
+  margin-inline-end: 10px;
+}
+
+body.app-body.flavour-modern-glitch
+  > #mastodon
+  .notification__favourite-icon-wrapper
+  i {
+  width: 1.28571429em !important;
+  text-align: center;
+}
+
+body.app-body.flavour-modern-glitch > #mastodon .status__prepend,
+body.app-body.flavour-modern-glitch
+  > #mastodon
+  .status__info
+  .notification__message {
+  padding-bottom: 15px !important;
+  padding-top: 0 !important;
+  margin-top: -5px !important;
+}
+
+body.app-body.flavour-modern-glitch
+  > #mastodon
+  .status__prepend
+  .status__prepend-icon-wrapper,
+body.app-body.flavour-modern-glitch
+  > #mastodon
+  .status__info
+  .notification__message
+  .status__prepend-icon-wrapper {
+  all: unset;
+  margin-inline-end: 10px;
+  display: flex;
+}
+
+body.app-body.flavour-modern-glitch
+  > #mastodon
+  .status__prepend
+  .status__prepend-icon-wrapper
+  i,
+body.app-body.flavour-modern-glitch
+  > #mastodon
+  .status__info
+  .notification__message
+  .status__prepend-icon-wrapper
+  i {
+  margin: auto;
+}
+
+body.app-body.flavour-modern-glitch
+  > #mastodon
+  .detailed-status__wrapper
+  .focusable:not(.status)::before {
+  content: unset !important;
+}
+
+body.app-body.flavour-modern-glitch > #mastodon .setting-text {
+  border-radius: 0 !important;
+  margin: 4px;
+  width: calc(100% - 8px);
+}
+
+body.app-body.flavour-modern-glitch > #mastodon .column-settings__pillbar {
+  border-radius: var(--radius);
+}
+
+body.app-body.flavour-modern-glitch > #mastodon .pillbar-button {
+  border-radius: 0 !important;
+  padding: 6px;
+}
+
+body.app-body.flavour-modern-glitch
+  > #mastodon
+  .account-card
+  .media-modal__close {
+  left: 10px;
+  top: 10px;
+}
+
+body.app-body.flavour-modern-glitch
+  > #mastodon
+  .account-card
+  .media-modal__close::before {
+  content: '';
+  position: absolute;
+  inset: -60px -30px;
+  background: linear-gradient(to right, #000, transparent);
+  transform: rotate(45deg);
+  z-index: -1;
+  opacity: 0.5;
+}
+
+.layout-multiple-columns.flavour-modern-glitch .drawer__inner {
+  margin-top: -10px;
+  padding-top: 30px !important;
+}

app/javascript/flavours/modern-glitch/names.yml

@@ -0,0 +1,8 @@
+en:
+  flavours:
+    modern-glitch:
+      description: Modern Mastodon theme - with Glitch-SOC support
+      name: Modern - Glitch
+  skins:
+    modern-glitch:
+      default: Default

app/javascript/flavours/modern-glitch/theme.yml

@@ -0,0 +1,49 @@
+#  (REQUIRED) The location of the pack files.
+pack:
+  admin:
+    - packs/admin.jsx
+    - packs/public.jsx
+  auth: packs/public.jsx
+  common:
+    filename: packs/common-modern.js
+    stylesheet: true
+  embed: packs/public.jsx
+  error: packs/error.js
+  home:
+    filename: packs/home.js
+    preload:
+      - flavours/glitch/async/compose
+      - flavours/glitch/async/getting_started
+      - flavours/glitch/async/home_timeline
+      - flavours/glitch/async/notifications
+  mailer:
+  modal:
+  public: packs/public.jsx
+  settings: packs/settings.js
+  sign_up: packs/sign_up.js
+  share: packs/share.jsx
+
+#  (OPTIONAL) The directory which contains localization files for
+#  the flavour, relative to this directory. The contents of this
+#  directory must be `.json` files whose names correspond to
+#  language tags and whose default exports are a messages object.
+locales: locales
+
+#  (OPTIONAL) Which flavour to inherit locales from
+inherit_locales: vanilla
+
+#  (OPTIONAL) A file to use as the preview screenshot for the flavour,
+#  or an array thereof. These are the full path from `app/javascript/`.
+screenshot: flavours/glitch/images/modern-preview.jpg
+
+#  (OPTIONAL) The directory which contains the pack files.
+#  Defaults to the theme directory (`app/javascript/themes/[theme]`),
+#  which should be sufficient for like 99% of use-cases lol.
+
+pack_directory: app/javascript/flavours/glitch
+
+#  (OPTIONAL) By default the theme will fallback to the default theme
+#  if a particular pack is not provided. You can specify different
+#  fallbacks here, or disable fallback behaviours altogether by
+#  specifying a `null` value.
+fallback:

app/javascript/skins/modern-glitch/modern-light/common.scss

@@ -0,0 +1,3 @@
+@import 'flavours/glitch/styles/mastodon-light/variables';
+@import 'flavours/glitch/styles/modern';
+@import 'flavours/glitch/styles/mastodon-light/diff';

app/javascript/skins/modern-glitch/modern-light/names.yml

@@ -0,0 +1,4 @@
+en:
+  skins:
+    modern-glitch:
+      modern-light: Default (light)

app/javascript/skins/modern-glitch/wobbl-modern-light/common.scss

@@ -0,0 +1,3 @@
+@import 'flavours/glitch/styles/wobbl-light/variables';
+@import 'flavours/glitch/styles/modern';
+@import 'flavours/glitch/styles/mastodon-light/diff';

app/javascript/skins/modern-glitch/wobbl-modern-light/names.yml

@@ -0,0 +1,4 @@
+en:
+  skins:
+    modern-glitch:
+      wobbl-modern-light: Wobbl Red (light)

app/javascript/skins/modern-glitch/wobbl-modern/common.scss

@@ -0,0 +1,2 @@
+@import 'flavours/glitch/styles/wobbl/variables';
+@import 'flavours/glitch/styles/modern';

app/javascript/skins/modern-glitch/wobbl-modern/names.yml

@@ -0,0 +1,4 @@
+en:
+  skins:
+    modern-glitch:
+      wobbl-modern: Wobbl Red

app/javascript/skins/modern-glitch/wobbl-old-modern-light/common.scss

@@ -0,0 +1,3 @@
+@import 'flavours/glitch/styles/wobbl-old-light/variables';
+@import 'flavours/glitch/styles/modern';
+@import 'flavours/glitch/styles/mastodon-light/diff';

app/javascript/skins/modern-glitch/wobbl-old-modern-light/names.yml

@@ -0,0 +1,4 @@
+en:
+  skins:
+    modern-glitch:
+      wobbl-old-modern-light: Wobbl Orange (light)

app/javascript/skins/modern-glitch/wobbl-old-modern/common.scss

@@ -0,0 +1,2 @@
+@import 'flavours/glitch/styles/wobbl-old/variables';
+@import 'flavours/glitch/styles/modern';

app/javascript/skins/modern-glitch/wobbl-old-modern/names.yml

@@ -0,0 +1,4 @@
+en:
+  skins:
+    modern-glitch:
+      wobbl-old-modern: Wobbl Orange

config/environments/development.rb

@@ -10,6 +10,8 @@ Rails.application.configure do
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
+  config.hosts << 'wobbldev.tarrien.net'
+
   # Do not eager load code on boot.
   config.eager_load = false
 

config/puma.rb

@@ -9,7 +9,7 @@ threads min_threads_count, max_threads_count
 if ENV['SOCKET']
   bind "unix://#{ENV['SOCKET']}"
 else
-  bind "tcp://#{ENV.fetch('BIND', '127.0.0.1')}:#{ENV.fetch('PORT', 3000)}"
+  bind "tcp://#{ENV.fetch('BIND', '0.0.0.0')}:#{ENV.fetch('PORT', 3000)}"
 end
 
 environment ENV.fetch('RAILS_ENV') { 'development' }

config/webpack/development.js

@@ -18,6 +18,7 @@ module.exports = merge(sharedConfig, {
   mode: 'development',
   cache: true,
   devtool: 'cheap-module-eval-source-map',
+  parallelism: 1,
 
   stats: {
     errorDetails: true,

public/robots.txt

@@ -6,3 +6,6 @@ Disallow: /
 User-agent: *
 Disallow: /media_proxy/
 Disallow: /interact/
+
+User-agent: GPTBot
+Disallow:/

stylelint.config.js

@@ -3,6 +3,7 @@ module.exports = {
   ignoreFiles: [
     'app/javascript/styles/mastodon/reset.scss',
     'app/javascript/flavours/glitch/styles/reset.scss',
+    'app/javascript/flavours/glitch/styles/modern/modern.css',
     'app/javascript/styles/win95.scss',
     'coverage/**/*',
     'node_modules/**/*',

yarn.lock

@@ -10707,9 +10707,9 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2
     source-map "^0.6.1"
 
 postcss@^8.2.15, postcss@^8.4.24:
-  version "8.4.26"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.26.tgz#1bc62ab19f8e1e5463d98cf74af39702a00a9e94"
-  integrity sha512-jrXHFF8iTloAenySjM/ob3gSj7pCu0Ji49hnjqzsgSRa50hkWCKD0HQ+gMNJkW38jBI68MpAAg7ZWwHwX8NMMw==
+  version "8.4.27"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.27.tgz#234d7e4b72e34ba5a92c29636734349e0d9c3057"
+  integrity sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==
   dependencies:
     nanoid "^3.3.6"
     picocolors "^1.0.0"
@@ -11776,7 +11776,7 @@ sass-loader@^10.2.0:
     schema-utils "^3.0.0"
     semver "^7.3.2"
 
-sass@^1.38.0, sass@^1.62.1:
+sass@^1.38.0:
   version "1.63.6"
   resolved "https://registry.yarnpkg.com/sass/-/sass-1.63.6.tgz#481610e612902e0c31c46b46cf2dad66943283ea"
   integrity sha512-MJuxGMHzaOW7ipp+1KdELtqKbfAWbH7OLIdoSMnVe3EXPMTmxTmlaZDCTsgIpPCs3w99lLo9/zDKkOrJuT5byw==
@@ -11785,6 +11785,15 @@ sass@^1.38.0, sass@^1.62.1:
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
+sass@^1.62.1:
+  version "1.64.1"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.64.1.tgz#6a46f6d68e0fa5ad90aa59ce025673ddaa8441cf"
+  integrity sha512-16rRACSOFEE8VN7SCgBu1MpYCyN7urj9At898tyzdXFhC+a+yOX5dXwAR7L8/IdPJ1NB8OYoXmD55DM30B2kEQ==
+  dependencies:
+    chokidar ">=3.0.0 <4.0.0"
+    immutable "^4.0.0"
+    source-map-js ">=0.6.2 <2.0.0"
+
 sax@~1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"