Merge branch 'main' into login-button

web/template/about.tmpl

@@ -91,7 +91,7 @@ Polls can have up to
                 <li><a href="#contact">Contact</a></li>
                 <li><a href="#features">Features</a></li>
                 <li><a href="#languages">Languages</a></li>
-                <li><a href="#signup">Register an Account on {{ .instance.Title -}}</li>
+                <li><a href="#signup">Register an Account on {{ .instance.Title -}}</a></li>
                 <li><a href="#rules">Rules</a></li>
                 <li><a href="#terms">Terms and Conditions</a></li>
                 <li><a href="#moderated-servers">Moderated Servers</a></li>
@@ -172,7 +172,7 @@ Polls can have up to
             <p>
                 ActivityPub instances federate with other instances by exchanging data with them over the network.
                 Exchanged data includes things like accounts, statuses, likes, boosts, and media attachments.
-                This exchange of data can prevented for instances on specific domains via a domain block created
+                This exchange of data can be prevented for instances on specific domains via a domain block created
                 by an instance admin. When an instance is domain blocked by another instance:
             </p>
             <ul>
@@ -190,4 +190,4 @@ Polls can have up to
         </div>
     </section>
 </main>
-{{- end }}
+{{- end }}

web/template/index_apps.tmpl

@@ -29,27 +29,27 @@
         <ul class="applist nodot" role="group">
             <li class="applist-entry">
                 <div class="applist-text">
-                    <p><strong>Semaphore</strong> is a web client designed for speed and simplicity.</p>
+                    <p><strong>Pinafore</strong> is a web client designed for speed and simplicity.</p>
                     <a
-                        href="https://semaphore.social/"
+                        href="https://pinafore.social/"
                         rel="nofollow noreferrer noopener"
                         target="_blank"
                     >
-                        Use Semaphore
+                        Use Pinafore
                     </a>
                 </div>
                 <svg
                     role="img"
-                    aria-labelledby="semaphore-title semaphore-desc"
+                    aria-labelledby="pinafore-title pinafore-desc"
                     class="applist-logo redraw"
                     xmlns="http://www.w3.org/2000/svg"
-                    viewBox="0 0 146 120"
+                    viewBox="0 0 10000 10000"
                     width="100"
                     height="100"
                 >
-                    <title id="semaphore-title">The Semaphore logo</title>
-                    <desc id="semaphore-desc">A waving flag</desc>
-                    <path d="M68.13 0C53.94 0 42.81 20 13.9 27.1l-2.23-5.29a6.5 6.5 0 0 0-5.17-10.4 6.5 6.5 0 0 0-.81 12.95L46.2 120l5.99-2.5-14.42-33.33c22.8-6.86 32.51-22.16 49.83-20.58 9.9.9 4.87 19.56 8.11 17.93 16.22-8.15 32.44-11.41 50.29-11.41-7.96-9.78-17.38-20.55-22.71-31.74L120.8 32c-2.32-7.33-2.56-14.75.87-22.22-9.74-3.26-21.1 0-32.45 4.9C82.2 9.77 79.5 0 68.13 0zM15.26 30.42c8.95 6.63 13.63 13.86 16.07 20.94l1.62 6.32c1.24 6.58 1.07 12.8 1.27 18.03z"></path>
+                    <title id="pinafore-title">The Pinafore logo</title>
+                    <desc id="pinafore-desc">A sailboat</desc>
+                    <path d="M9212 5993H5987V823c1053 667 2747 2177 3225 5170zM3100 2690A12240 12240 0 01939 6035h2161zm676 7210h2448a3067 3067 0 003067-3067H5052V627a527 527 0 00-1052 0v6206H709a3067 3067 0 003067 3067z"></path>
                 </svg>
             </li>
             <li class="applist-entry">
@@ -115,4 +115,4 @@
         </ul>
     </div>
 </section>
-{{- end }}
+{{- end }}

web/template/page_header.tmpl

@@ -17,6 +17,29 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */ -}}
 
+{{- define "trustedProxiesRec" -}}
+{{- .with }}
+<div class="trusted-proxies-rec">
+    <p>
+        <strong>Warning!</strong> It looks like <code>trusted-proxies</code> is not set correctly in this instance's configuration.
+        This may cause rate-limiting issues and, by extension, federation issues.
+    </p>
+    <p>
+        If you are the instance admin, you should fix this by adding <code>{{- .trustedProxiesRec -}}</code> to your <code>trusted-proxies</code>.
+    </p>
+    <p>
+        For more information, see
+        <a
+            href="https://docs.gotosocial.org/en/latest/configuration/trusted_proxies/"
+            rel="nofollow noreferrer noopener"
+            target="_blank"
+        >
+            the documentation
+        </a>.
+    </p>
+</div> 
+{{- end -}}
+
 {{- define "thumbnailDescription" -}}
 {{- if .instance.ThumbnailDescription -}}
 {{- .instance.ThumbnailDescription -}}
@@ -56,6 +79,9 @@ Instance Logo
 {{- end -}}
 
 {{- with . }}
+{{- if .trustedProxiesRec }}
+{{- template "trustedProxiesRec" . }}
+{{- end }}
 <a aria-label="{{- .instance.Title -}}. Go to instance homepage" href="/" class="nounderline">
     <picture>
         {{- if .instance.ThumbnailStatic }}

web/template/page_stylesheets.tmpl

@@ -32,10 +32,16 @@
 {{- range .stylesheets }}
 <link rel="preload" href="{{- . -}}" as="style">
 {{- end }}
+{{- if .instance.CustomCSS }}
+<link rel="preload" href="/custom.css" as="style">
+{{- end }}
 <link rel="stylesheet" href="/assets/dist/_colors.css">
 <link rel="stylesheet" href="/assets/dist/base.css">
 <link rel="stylesheet" href="/assets/dist/page.css">
 {{- range .stylesheets }}
 <link rel="stylesheet" href="{{- . -}}">
 {{- end }}
+{{- if .instance.CustomCSS }}
+<link rel="stylesheet" href="/custom.css">
+{{- end }}
 {{- end }}

web/template/status_info.tmpl

@@ -26,6 +26,14 @@
                 <time datetime="{{- .CreatedAt -}}">{{- .CreatedAt | timestampPrecise -}}</time>
             </dd>
         </div>
+        {{- if .EditedAt -}}
+        <div class="stats-item edited-at text-cutoff">
+            <dt class="sr-only">Edited</dt>
+            <dd>
+                (last edited <time datetime="{{- .EditedAt -}}">{{- .EditedAt | timestampPrecise -}}</time>)
+            </dd>
+        </div>
+        {{ end }}
         <div class="stats-grouping">
             <div class="stats-item" title="Replies">
                 <dt>