.gitattributes

 public/** filter=lfs diff=lfs merge=lfs -text
 assets/js/pack.*.js.map filter=lfs diff=lfs merge=lfs -text
 assets/js/pack.*.js filter=lfs diff=lfs merge=lfs -text
+*.woff2 filter=lfs diff=lfs merge=lfs -text

Gemfile.lock

@@ -22,17 +22,19 @@ PATH
       jekyll-relative-urls (~> 0)
       jekyll-seo-tag (~> 2)
       jekyll-write-and-commit-changes (~> 0)
-      sutty-liquid (~> 0.11.3)
+      ruby-brs (~> 1.3.3)
+      sutty-liquid (~> 0.12.0)
 
 GEM
   remote: https://gems.sutty.nl/
   specs:
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
+    adsp (1.0.10)
     ansi (1.5.0)
     ast (2.4.2)
     bigdecimal (3.1.1)
-    brotli (0.2.3-x86_64-linux-musl)
+    brotli (0.5.0-x86_64-linux-musl)
     climate_control (1.2.0)
     coderay (1.1.3)
     colorator (1.1.0)
@@ -96,7 +98,7 @@ GEM
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
-    faraday-http-cache (2.5.0)
+    faraday-http-cache (2.5.1)
       faraday (>= 0.8)
     faraday-httpclient (1.0.1)
     faraday-multipart (1.0.4)
@@ -106,7 +108,7 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
+    faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fast_blank (1.0.1-x86_64-linux-musl)
     ffi (1.17.0-x86_64-linux-musl)
@@ -139,8 +141,8 @@ GEM
       distributed-press-api-client (~> 0.5.0)
       jekyll (~> 4)
       marcel (~> 1)
-    jekyll-brotli (2.4.2)
-      brotli (~> 0.2.0)
+    jekyll-brotli (2.4.3)
+      brotli (~> 0.5.0)
       jekyll (>= 3.0, < 5.0)
     jekyll-commonmark (1.4.0)
       commonmarker (~> 0.22)
@@ -168,7 +170,7 @@ GEM
       jekyll (~> 4)
     jekyll-ignore-layouts (0.1.2)
       jekyll (~> 4)
-    jekyll-images (0.4.2)
+    jekyll-images (0.4.4)
       jekyll (~> 4)
       ruby-filemagic (~> 0.7)
       ruby-vips (~> 2)
@@ -201,18 +203,19 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.22.0)
+    logger (1.5.0)
+    loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     marcel (1.0.4)
     mercenary (0.4.0)
-    method_source (1.0.0)
+    method_source (1.1.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
+    mini_portile2 (2.8.8)
     multi_xml (0.7.1)
       bigdecimal (~> 3.1)
-    multipart-post (2.3.0)
-    nokogiri (1.16.7-x86_64-linux-musl)
+    multipart-post (2.4.1)
+    nokogiri (1.17.2-x86_64-linux-musl)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oga (3.4-x86_64-linux-musl)
@@ -226,28 +229,35 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (6.0.1)
-    racc (1.7.3-x86_64-linux-musl)
+    racc (1.8.1-x86_64-linux-musl)
+    rails-html-sanitizer (1.6.2)
+      loofah (~> 2.21)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rake (12.3.3)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.3.8)
+    rexml (3.3.9)
     rouge (3.30.0)
+    ruby-brs (1.3.3-x86_64-linux-musl)
+      adsp (~> 1.0)
     ruby-filemagic (0.7.3-x86_64-linux-musl)
     ruby-ll (2.1.3-x86_64-linux-musl)
       ansi
       ast
     ruby-oembed (0.16.1)
-    ruby-vips (2.2.0)
+    ruby-vips (2.2.2)
       ffi (~> 1.12)
+      logger
     ruby2_keywords (0.0.5)
-    rugged (1.7.1-x86_64-linux-musl)
+    rugged (1.7.2-x86_64-linux-musl)
     safe_yaml (1.0.6)
     sassc (2.4.0-x86_64-linux-musl)
       ffi (~> 1.9)
-    sutty-liquid (0.11.11)
+    sutty-liquid (0.12.3)
       fast_blank (~> 1.0)
       jekyll (~> 4)
+      rails-html-sanitizer (~> 1.6.0)
     terminal-table (2.0.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     unicode-display_width (1.8.0)
@@ -266,4 +276,4 @@ DEPENDENCIES
   sutty-base-jekyll-theme!
 
 BUNDLED WITH
-   2.3.26
+   2.4.22

Taskfile.yaml

@@ -160,3 +160,25 @@ tasks:
     - "node_modules/fork-awesome/fonts/forkawesome-webfont.woff2"
     generates:
     - "assets/fonts/forkawesome-webfont.woff2"
+  gem-audit:
+    desc: "Audit Gem dependencies"
+    deps:
+    - "bundler-audit"
+    cmds:
+    - "{{.HAINISH}} bundle audit --update"
+  node-audit:
+    desc: "Audit Node dependencies"
+    deps:
+    - "pnpm"
+    cmds:
+    - "{{.HAINISH}} pnpm audit"
+  notify:
+    internal: true
+    cmds:
+    - "echo -e \"\a\""
+  bundler-audit:
+    internal: true
+    cmds:
+    - "{{.HAINISH}} gem install bundler-audit"
+    status:
+    - "test -f ../hain/usr/bin/bundler-audit"

_bin/download_google_font

@@ -2,12 +2,12 @@
 
 import_url="$1"
 font_family="$(echo "${import_url}" | cut -d "=" -f 2 | cut -d "&" -f 1)"
-font_snake_case="$(echo "${font_family}" | tr "+" "_" | tr ":" "_" | tr "@" "_" | tr "," "_" | tr [:upper:] [:lower:] )"
+font_snake_case="$(echo "${font_family}" | sed -re "s/[;+:@,]/_/g" | tr [:upper:] [:lower:] )"
 scss_file="_sass/${font_snake_case}.scss"
 font_dir="assets/fonts/"
 
 if test -f "${scss_file}"; then
-  echo "${font_family} ya existe"
+  echo "${font_family} ya existe en ${scss_file}"
   exit 0
 fi
 
@@ -22,3 +22,5 @@ grep -Eo "https://[^\"')]+" "${css_tempfile}" | sort -u | wget -i - -x -nH -nv -
 cd -
 
 sed -r -e "s,https://fonts\.gstatic\.com/s/,../fonts/," "${css_tempfile}" > "${scss_file}"
+
+echo "@import \"${font_snake_case}\";" >> _sass/fonts.scss

_config.yml

@@ -43,6 +43,21 @@ sass:
 #  style: "compressed"
   load_paths:
   - "node_modules"
+# Excluir archivos de desarrollo
+exclude:
+- Dockerfile
+- Gemfile
+- Gemfile.lock
+- node_modules
+- package.json
+- pnpm-lock.yaml
+- purgecss.config.js
+- README.md
+- yarn.lock
+- Taskfile.yaml
+- Taskfile.yml
+- fa.txt
+- "*.gemspec"
 # Opciones para generar las URLs de las páginas.  Por defecto Jekyll
 # crea /categoria/año/mes/dia/titulo.html que me parece innecesariamente
 # larga.
@@ -77,3 +92,5 @@ defaults:
     type: posts
   values:
     activity: false
+url: https://sutty-base.sutty.nl
+hostname: sutty-base.sutty.nl

_data/actions.yml

+actions:
+  - title: "reply"
+    icon: "reply"
+  - title: "favorite"
+    icon: "star-o"
+  - title: "bookmark"
+    icon: "bookmark-o"
+  - title: "boost"
+    icon: "retweet"

_data/activity_pub.yml

+---
+actor_url: https://sutty-base.sutty.nl/about.jsonld
+actor: "@sutty-base@sutty-base.sutty.nl"
+public_key_url: https://sutty-base.sutty.nl/about.jsonld#main-key

_data/en.yml

@@ -49,6 +49,9 @@ date:
 time:
   am: am
   pm: pm
+  format: "%H:%M"
+date_time:
+  format: '%d %b %Y %H:%M'
 layouts:
   about: "About this site"
   code_of_conduct: "Code of conduct"
@@ -102,3 +105,71 @@ device_detector:
     Click the same button to close this message.
 button_copy:
   confirmation: "%s copied"
+fediverse_interactions:
+- value: "conversation"
+  title: "Conversation"
+  selected: true
+- value: "reactions"
+  title: "Reactions"
+- value: "both"
+  title: "Conversation and reactions"
+- value: "nothing"
+  title: "Nothing"
+no_interactions_yet:
+  conversation: "There are no replies to show yet."
+  reactions: "There are no reactions to show yet."
+  both: "There is nothing to show you yet."
+ver_interacciones: "See from Fedi"
+reply: 
+  text: "In response to"
+  link_text: "a post on the Fediverse."
+close: "Close"
+login_modal:
+  authorize_interaction_unsupported: "Remote interactions are not supported by this instance. You can still copy-paste this page's address into your preferred client's search bar to interact from the Fediverse."
+  boost: 
+    title: "boost"
+    text: "Boost $usuarie's post"
+  reply: 
+    title: "reply"
+    text: "Reply to $usuarie's post"
+  favorite: 
+    title: favorite
+    text: "Favorite $usuarie's post"
+  bookmark: 
+    title: bookmark
+    text: "Bookmark $usuarie's post"
+  top_text: |
+    To interact with a post in the Fediverse, you will need to do so from an account from any of its instances.
+    **Do you have an account?**
+
+    <mark class="primary background-transparent">Note: you will need to reselect the <strong>$action</strong> option from your account.</mark>
+  question: "**Where is your account hosted?**"
+  small_text: |
+    Tip: That's the website where you signed up. If you don't remember, look for the welcome e-mail in your inbox. 
+    You can also enter your full username! (e.g. @sutty@todon.nl)  
+  bottom_text: |
+    Want to reply from another Fediverse-integrated Sutty website?
+    You can do so from the panel.
+    Keep in mind that for now it isn't possible to favorite, retoot or bookmark from here.
+
+    Don't have a Fediverse account yet? 
+    [You can choose how to create one.](https://joinfediverse.wiki/How_do_I_get_an_account%3F)  
+  placeholder: "Domain of your home server, e.g. rebel.ar"
+help: |
+  The Fediverse is a federated social network made up of thousands of instances (servers) by and for
+  the people, not controlled by any company and free from algorithms that decide what content you
+  can consume. Anyone can create a Fediverse account, by first choosing an instance. With your account you
+  can write, reply, like and save, and interact with services geared towards microblogging, images, music,
+  videos and much more.
+  You can now:
+  - [Learn more about the Fediverse](https://sutty.nl/)
+  - Pick an instance from [https://joinfediverse.wiki/instances](https://joinfediverse.wiki/instances)
+  or [https://fediverse.to](https://fediverse.to) and create an account.
+sensitive: "Sensitive content"
+take_me_home: "Take me home"
+total_shares: "Total shares"
+total_likes: "Total likes"
+globe: "Public"
+activities:
+  Announce: "Boost"
+  Like: "Fave"

_data/es.yml

@@ -49,6 +49,9 @@ date:
 time:
   am: am
   pm: pm
+  format: "%H:%M"
+date_time:
+  format: '%d %b %Y %H:%M'
 layouts:
   about: "Información del sitio"
   code_of_conduct: "Código de conducta"
@@ -102,3 +105,72 @@ device_detector:
     Usa el mismo botón para cerrar este mensaje.
 button_copy:
   confirmation: "%s copiado"
+fediverse_interactions:
+- value: "conversation"
+  title: "Conversación"
+  selected: true
+- value: "reactions"
+  title: "Reacciones"
+- value: "both"
+  title: "Conversación y reacciones"
+- value: "nothing"
+  title: "Nada"
+ver_interacciones: "Ver del Fediverso"
+no_interactions_yet:
+  conversation: "Todavía no hay respuestas para mostrar."
+  reactions: "Todavía no hay reacciones para mostrar."
+  both: "Todavía no hay nada para mostrar."
+reply: 
+  text: "En respuesta a"
+  link_text: "una publicación en el Fediverso."
+close: "Cerrar"
+login_modal:
+  authorize_interaction_unsupported: "La interacción remota no está soportada por esta instancia. Todavía podés copiar y pegar la dirección de esta página en el buscador de tu cliente favorito para poder interactuar desde el Fediverso."
+  boost:
+    title: "impulsar" 
+    text: "Impulsar la publicación de $usuarie"
+  reply:
+    title: "responder" 
+    text: "Responder a la publicación de $usuarie"
+  favorite:
+    title: "favoritear" 
+    text: "Favoritear la publicación de $usuarie"
+  bookmark:
+    title: "guardar" 
+    text: "Guardar la publicación de $usuarie"
+  top_text: |
+    Para interactuar en el Fediverso, siempre es necesario hacerlo desde una cuenta en cualquiera de sus instancias. 
+    ¿Tienes una cuenta?
+
+    <mark class="primary background-transparent">Nota: deberás volver a marcar <strong>$action</strong> desde tu instancia.</mark>
+  question: "**¿Dónde tienes tu cuenta?**"
+  small_text: |
+    Pista: ese es el sitio donde te registraste. Si no lo recuerdas, 
+    busca el correo electrónico de bienvenida en tu bandeja de entrada. 
+    También puedes introducir tu nombre de usuario completo (por ejemplo @sutty@todon.nl)
+  bottom_text: |
+    ¿Quieres responder desde otro sitio de Sutty que tenga habilitada la integración con el Fediverso? 
+    Para escribir una respuesta, puedes hacerlo desde el panel. 
+    Ten en cuenta que por ahora no es posible marcar como favorito, retootear o guardar.
+
+    ¿Aún no tienes cuenta en el Fediverso? 
+    [Puedes elegir cómo crearla.](https://joinfediverse.wiki/What_is_the_Fediverse%3F/es#%C2%BFC%C3%B3mo_puedo_crear_una_cuenta?)
+  placeholder: "Dominio de tu servidor, por ejemplo rebel.ar"
+help: |
+  El Fediverso es una red social federada de miles de instancias (servidores) de y por la gente,
+  no controlada por ninguna empresa ni con algoritmos que decidan por vos. Cualquiera puede crearse
+  una cuenta en el Fediverso, eligiendo primero la instancia. Con una cuenta podés escribir, responder, marcar
+  de varias formas, e interactuar con servicios de microblogging, imágenes, música y sonidos, videos y mucho más.
+  Ahora podés:
+
+  - [Conocer más del Fediverso](https://sutty.nl/)
+  - Elegir una instancia para crear una cuenta en [https://joinfediverse.wiki/instances](https://joinfediverse.wiki/instances)
+  y/o [https://fediverse.to](https://fediverse.to)
+sensitive: "Contenido sensible"
+take_me_home: "Ir a casa"
+total_shares: "Cantidad de veces compartido"
+total_likes: "Cantidad de Me gusta"
+globe: "Público"
+activities:
+  Announce: "Impulso"
+  Like: "Favorito"

_data/layouts/theme.yml

@@ -22,10 +22,18 @@ font_family_sans_serif:
   values:
     en:
       "": "Default"
-      Roboto: "Roboto"
+      Roboto, sans-serif: "Roboto"
+      Roboto Mono, monospace: "Roboto Mono (monospace)"
+      Inter, sans-serif: "Inter"
+      Saira, sans-serif: "Saira"
+      Baskervville, serif: "Baskervville (serif)"
     es:
       "": "Default"
-      Roboto: "Roboto"
+      Roboto, sans-serif: "Roboto"
+      Roboto Mono, monospace: "Roboto Mono (monospace)"
+      Inter, sans-serif: "Inter"
+      Saira, sans-serif: "Saira"
+      Baskervville, serif: "Baskervville (serif)"
 font_family_monospace:
   type: "predefined_value"
   label:
@@ -40,12 +48,12 @@ font_family_monospace:
   values:
     en:
       "": "Default"
-      Roboto Mono: "Roboto Mono"
-      Liberation Mono: "Liberation Mono"
+      Roboto Mono, monospace: "Roboto Mono"
+      Liberation Mono, monospace: "Liberation Mono"
     es:
       "": "Default"
-      Roboto Mono: "Roboto Mono"
-      Liberation Mono: "Liberation Mono"
+      Roboto Mono, monospace: "Roboto Mono"
+      Liberation Mono, monospace: "Liberation Mono"
 headings_font_family:
   type: "predefined_value"
   label:
@@ -60,10 +68,18 @@ headings_font_family:
   values:
     en:
       "": "Default"
-      Roboto: "Roboto"
+      Roboto, sans-serif: "Roboto"
+      Roboto Mono, monospace: "Roboto Mono (monospace)"
+      Inter, sans-serif: "Inter"
+      Saira, sans-serif: "Saira"
+      Baskervville, serif: "Baskervville (serif)"
     es:
       "": "Default"
-      Roboto: "Roboto"
+      Roboto, sans-serif: "Roboto"
+      Roboto Mono, monospace: "Roboto Mono (monospace)"
+      Inter, sans-serif: "Inter"
+      Saira, sans-serif: "Saira"
+      Baskervville, serif: "Baskervville (serif)"
 enable_rounded:
   type: "boolean"
   label:

_data/theme.yml

@@ -50,6 +50,9 @@ font_sizes:
   22: "1.375"
   24: "1.5"
   26: "1.625"
+font_weight_medium: "500 !default"
+font_weight_semibold: "600 !default"
+font_weight_bolder: "800 !default"
 display1_size: "6rem"
 display2_size: "5.55rem"
 display3_size: "5rem"

_includes/activity_pub/alternate.html

+<link href="{{ include.id }}" rel="alternate" type="application/activity+json" />
+<link href="{{ include.id }}" rel="alternate" type='application/ld+json; profile="https://www.w3.org/ns/activitystreams"' />

_includes/activity_pub/image_modal.html

@@ -5,7 +5,7 @@
 {%- endcomment -%}
 
 {% assign alt = include.image.name | strip_html | escape %}
-{% assign src = include.image.url | strip_html | uri_escape %}
+{% assign src = include.image.url | strip_html | component_escape %}
 {% assign extra = 'data-action="click->modal#show"' %}
 
 {% capture body %}

_includes/activity_pub/interactions.html

@@ -61,8 +61,13 @@
   <div class="w-100 fade show" data-tabs-target="tab" id="both">
     {% unless all_interactions == empty %}
       {% for interaction in all_interactions %}
-        {% assign minus = forloop.index0 | minus: 1 %}
-        {% assign previous = all_interactions[minus] %}
+        {% if forloop.index0 > 0 %}
+          {% assign minus = forloop.index0 | minus: 1 %}
+          {% assign previous = all_interactions[minus] %}
+        {% else %}
+          {% assign previous = nil %}
+        {% endif %}
+
         {% if interaction.type == 'Announce' or interaction.type == 'Like' %}
           {% include_cached activity_pub/reaction.html activity=interaction previous=previous %}
         {% else %}

_includes/activity_pub/login_modal.html

@@ -36,7 +36,7 @@
     class="needs-validation"
     data-controller="authorize-interaction"
     data-action="authorize-interaction#submit:prevent"
-    data-authorize-interaction-uri-value="{{ include.uri | strip_html | absolute_url | uri_escape }}"
+    data-authorize-interaction-uri-value="{{ include.uri | strip_html | absolute_url | component_escape }}"
     >
     <div class="form-row align-items-center border-lg border-lg-primary py-1">
       <div class="col-12 col-lg mb-1 mb-lg-0">

_includes/activity_pub/reactions.html

@@ -6,8 +6,12 @@
 {%- endcomment -%}
 
 {% for reaction in include.reactions %}
-  {% assign minus = forloop.index0 | minus: 1 %}
-  {% assign previous = include.reactions[minus] %}
+  {% if forloop.index0 > 0 %}
+    {% assign minus = forloop.index0 | minus: 1 %}
+    {% assign previous = include.reactions[minus] %}
+  {% else %}
+    {% assign previous = nil %}
+  {% endif %}
 
   {%
     include activity_pub/reaction.html

_includes/activity_pub/toot_card.html

@@ -17,7 +17,7 @@
       src=include.profile.icon.url
       alt=include.profile.icon.name
       width=40
-      embed_class="mr-2 align-self-center w-49px"
+      component_class="mr-2 align-self-center w-48px"
       img_class="h-100 object-fit-cover"
     %}
 

_includes/buttons/link.html

@@ -9,6 +9,6 @@ Un botón con link. Utiliza la etiqueta `<a>`
 
 {%- assign extra = include.href | start_with: "http://" | value_if: 'rel="noopener" target="_blank"' -%}
 {%- assign extra = include.href | start_with: "https://" | value_if: 'rel="noopener" target="_blank"' -%}
-{%- assign extra = include.href | uri_escape | prepend: 'href="' | append: '" ' | append: extra | append: " " | append: include.extra -%}
+{%- assign extra = include.href | component_escape | prepend: 'href="' | append: '" ' | append: extra | append: " " | append: include.extra -%}
 
 {%- include buttons/generic.html element="a" class=include.class content=include.content extra=extra -%}

_includes/date.html

+{% comment %}
+  La fecha de un artículo
+
+  @param :date [String] La fecha con formato
+  @param :extra [String] Atributos extra
+{% endcomment %}
+
+<time
+	datetime="{{ include.date | date_to_xmlschema }}"
+	{{ include.extra }}>
+	{{- include.date | date_local: include.format -}}
+</time>

_includes/embed_responsive.html

@@ -9,8 +9,9 @@ Se suele usar para las imágenes de grillas.
 @param :alt [String] La descripción de la imagen
 @param :width [Integer] El ancho
 @param :component_class [String] Las clases del componente embed_responsive
+@param :img_class [String] Las clases de la imagen
 {%- endcomment -%}
 
-<div class="embed-responsive embed-responsive-{{ include.x }}by{{ include.y }} {{ include.component_class }}">
-  {%- include picture.html class="embed-responsive-item" img_class="w-100 h-100 fit-cover" src=include.src alt=include.alt width=include.width -%}
+<div class="embed-responsive embed-responsive-{{ include.x }}by{{ include.y }} {{ include.component_class }}" {{ include.extra }}>
+  {%- include picture.html class="embed-responsive-item" img_class=include.img_class src=include.src alt=include.alt width=include.width -%}
 </div>