static-fe overhaul (#236)

makes static-fe look more like pleroma-fe, with the stylesheets matching pleroma-dark and pleroma-light based on `prefers-color-scheme`.

- [x] navbar
- [x] about sidebar
- [x] background image
- [x] statuses
  - [x] "reply to" or "edited" tags
- [x] accounts
  - [x] show more / show less
  - [x] posts / with replies / media / followers / following
    - [x] followers/following would require user card snippets
  - [x] admin/bot indicators
- [x] attachments
  - [x] nsfw attachments
- [x] fontawesome icons
- [x] clean up and sort css
- [x] add pleroma-light
- [x] replace hardcoded strings

also i forgot
- [x] repeated headers

how it looks + sneak peek at statuses:
![](https://akkoma.dev/attachments/c0d3a025-6987-4630-8eb9-5f4db6858359)

Co-authored-by: Sol Fisher Romanoff <sol@solfisher.com>
Reviewed-on: AkkomaGang/akkoma#236
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>

.gitattributes

@@ -1,10 +1,11 @@
 *.ex diff=elixir
 *.exs diff=elixir
 
-priv/static/instance/static.css diff=css
-
 # Most of js/css files included in the repo are minified bundles,
 #   and we don't want to search/diff those as text files.
 *.js binary
 *.js.map binary
 *.css binary
+
+priv/static/instance/static.css diff=css
+priv/static/static-fe/static-fe.css diff=css

CHANGELOG.md

@@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - NormalizeMarkup MRF is now on by default
 - Follow/Block/Mute imports now spin off into *n* tasks to avoid the oban timeout
 - Transient activities recieved from remote servers are no longer persisted in the database
+- Overhauled static-fe view for logged-out users
 
 ## Upgrade Notes
 - If you have an old instance, you will probably want to run `mix pleroma.database prune_task` in the foreground to catch it up with the history of your instance.

lib/pleroma/web/router.ex

@@ -728,6 +728,12 @@ defmodule Pleroma.Web.Router do
     get("/users/:nickname/feed", Feed.UserController, :feed, as: :user_feed)
   end
 
+  scope "/", Pleroma.Web.StaticFE do
+    # Profile pages for static-fe
+    get("/users/:nickname/with_replies", StaticFEController, :show)
+    get("/users/:nickname/media", StaticFEController, :show)
+  end
+
   scope "/", Pleroma.Web do
     pipe_through(:accepts_html)
     get("/notice/:id/embed_player", OStatus.OStatusController, :notice_player)
@@ -771,10 +777,16 @@ defmodule Pleroma.Web.Router do
     post("/users/:nickname/outbox", ActivityPubController, :update_outbox)
     post("/api/ap/upload_media", ActivityPubController, :upload_media)
 
+    get("/users/:nickname/collections/featured", ActivityPubController, :pinned)
+  end
+
+  scope "/", Pleroma.Web.ActivityPub do
+    # Note: html format is supported only if static FE is enabled
+    pipe_through([:accepts_html_json, :static_fe, :activitypub_client])
+
     # The following two are S2S as well, see `ActivityPub.fetch_follow_information_for_user/1`:
     get("/users/:nickname/followers", ActivityPubController, :followers)
     get("/users/:nickname/following", ActivityPubController, :following)
-    get("/users/:nickname/collections/featured", ActivityPubController, :pinned)
   end
 
   scope "/", Pleroma.Web.ActivityPub do

lib/pleroma/web/static_fe/static_fe_controller.ex

@@ -45,7 +45,7 @@ def show(%{assigns: %{notice_id: notice_id}} = conn, _params) do
     end
   end
 
-  def show(%{assigns: %{username_or_id: username_or_id}} = conn, params) do
+  def show(%{assigns: %{username_or_id: username_or_id, tab: tab}} = conn, params) do
     with {_, %User{local: true} = user} <-
            {:fetch_user, User.get_cached_by_nickname_or_id(username_or_id)},
          {_, :visible} <- {:visibility, User.visible_for(user, _reading_user = nil)} do
@@ -55,12 +55,37 @@ def show(%{assigns: %{username_or_id: username_or_id}} = conn, params) do
         params
         |> Map.take(@page_keys)
         |> Map.new(fn {k, v} -> {String.to_existing_atom(k), v} end)
+        |> Map.put(:limit, 20)
+
+      params =
+        case tab do
+          "posts" ->
+            Map.put(params, :exclude_replies, true)
+
+          "media" ->
+            Map.put(params, :only_media, true)
+
+          _ ->
+            params
+        end
 
       timeline =
+        case tab do
+          tab when tab in ["posts", "with_replies", "media"] ->
             user
             |> ActivityPub.fetch_user_activities(_reading_user = nil, params)
             |> Enum.map(&represent/1)
 
+          "following" when not user.hide_follows ->
+            User.get_friends(user)
+
+          "followers" when not user.hide_followers ->
+            User.get_followers(user)
+
+          _ ->
+            []
+        end
+
       prev_page_id =
         (params["min_id"] || params["max_id"]) &&
           List.first(timeline) && List.first(timeline).id
@@ -75,6 +100,11 @@ def show(%{assigns: %{username_or_id: username_or_id}} = conn, params) do
         meta: meta
       })
     else
+      {_, %User{} = user} ->
+        conn
+        |> put_status(:found)
+        |> redirect(external: user.uri || user.ap_id)
+
       _ ->
         not_found(conn, "User not found.")
     end
@@ -150,6 +180,23 @@ defp represent(%Activity{object: %Object{data: data}} = activity, selected) do
         nil
       end
 
+    reply_to_user =
+      if data["inReplyTo"] do
+        activity
+        |> Activity.get_in_reply_to_activity()
+        |> Map.get(:actor)
+        |> User.get_cached_by_ap_id()
+      else
+        nil
+      end
+
+    total_votes =
+      if data["oneOf"] do
+        Enum.sum(for option <- data["oneOf"], do: option["replies"]["totalItems"])
+      else
+        0
+      end
+
     %{
       user: User.sanitize_html(user),
       title: get_title(activity.object),
@@ -160,7 +207,13 @@ defp represent(%Activity{object: %Object{data: data}} = activity, selected) do
       sensitive: data["sensitive"],
       selected: selected,
       counts: get_counts(activity),
-      id: activity.id
+      id: activity.id,
+      visibility: Visibility.get_visibility(activity.object),
+      reply_to: data["inReplyTo"],
+      reply_to_user: reply_to_user,
+      edited_at: data["updated"],
+      poll: data["oneOf"],
+      total_votes: total_votes
     }
   end
 
@@ -177,7 +230,16 @@ defp assign_id(%{path_info: [_nickname, "status", notice_id]} = conn, _opts),
     do: assign(conn, :notice_id, notice_id)
 
   defp assign_id(%{path_info: ["users", user_id]} = conn, _opts),
-    do: assign(conn, :username_or_id, user_id)
+    do:
+      conn
+      |> assign(:username_or_id, user_id)
+      |> assign(:tab, "posts")
+
+  defp assign_id(%{path_info: ["users", user_id, tab]} = conn, _opts),
+    do:
+      conn
+      |> assign(:username_or_id, user_id)
+      |> assign(:tab, tab)
 
   defp assign_id(%{path_info: ["objects", object_id]} = conn, _opts),
     do: assign(conn, :object_id, object_id)

lib/pleroma/web/static_fe/static_fe_view.ex

@@ -8,7 +8,6 @@ defmodule Pleroma.Web.StaticFE.StaticFEView do
   alias Calendar.Strftime
   alias Pleroma.Emoji.Formatter
   alias Pleroma.User
-  alias Pleroma.Web.Endpoint
   alias Pleroma.Web.Gettext
   alias Pleroma.Web.MediaProxy
   alias Pleroma.Web.Metadata.Utils
@@ -22,17 +21,38 @@ def fetch_media_type(%{"mediaType" => mediaType}) do
     Utils.fetch_media_type(@media_types, mediaType)
   end
 
+  def time_ago(date) do
+    {:ok, date, _} = DateTime.from_iso8601(date)
+    now = DateTime.utc_now()
+
+    Timex.from_now(date, now)
+  end
+
   def format_date(date) do
     {:ok, date, _} = DateTime.from_iso8601(date)
     Strftime.strftime!(date, "%Y/%m/%d %l:%M:%S %p UTC")
   end
 
-  def instance_name, do: Pleroma.Config.get([:instance, :name], "Pleroma")
+  def instance_name, do: Pleroma.Config.get([:instance, :name], "Akkoma")
 
   def open_content? do
     Pleroma.Config.get(
       [:frontend_configurations, :collapse_message_with_subjects],
-      true
+      false
     )
   end
+
+  def get_attachment_name(%{"name" => name}), do: name
+
+  def get_attachment_name(_), do: ""
+
+  def poll_percentage(count, total_votes) do
+    case count do
+      0 ->
+        "0%"
+
+      _ ->
+        Integer.to_string(trunc(count / total_votes * 100)) <> "%"
+    end
+  end
 end

lib/pleroma/web/templates/layout/static_fe.html.eex

@@ -6,10 +6,39 @@
     <title><%= Pleroma.Config.get([:instance, :name]) %></title>
     <%= Phoenix.HTML.raw(assigns[:meta] || "") %>
     <link rel="stylesheet" href="/static-fe/static-fe.css">
+    <link rel="icon" type="image/png" href="/favicon.png">
   </head>
   <body>
+    <div class="background-image"></div>
+    <nav>
+      <div class="inner-nav">
+        <a class="site-brand" href="/">
+          <img class="favicon" src="/favicon.png" />
+          <span><%= Pleroma.Config.get([:instance, :name]) %></span>
+        </a>
+      </div>
+    </nav>
     <div class="container">
+      <div class="underlay"></div>
+	  <div class="column main">
         <%= @inner_content %>
       </div>
+      <div class="column sidebar">
+        <div class="about panel">
+          <div class="panel-heading">
+            <%= gettext("About %{instance}", instance: Pleroma.Config.get([:instance, :name])) %>
+          </div>
+          <div class="about-content">
+            <%= raw render_html("/static/terms-of-service.html") %>
+          </div>
+        </div>
+      </div>
+    </div>
   </body>
 </html>
+
+<style>
+  :root {
+    --background-image: url("<%= Pleroma.Config.get([:instance, :background_image]) %>");
+  }
+</style>

lib/pleroma/web/templates/static_fe/static_fe/_attachment.html.eex

@@ -1,8 +1,15 @@
+<a class="attachment" href="<%= @url %>" alt=<%= @name %>" title="<%= @name %>">
+  <%= if @nsfw do %>
+  <div class="nsfw-banner">
+    <div><%= gettext("Hover to show content") %></div>
+  </div>
+  <% end %>
   <%= case @mediaType do %>
   <% "audio" -> %>
   <audio class="u-audio" src="<%= @url %>" controls="controls"></audio>
   <% "video" -> %>
   <video class="u-video" src="<%= @url %>" controls="controls"></video>
   <% _ -> %>
-<img class="u-photo" src="<%= @url %>" alt="<%= @name %>" title="<%= @name %>">
+  <img class="u-photo" src="<%= @url %>">
   <% end %>
+</a>

lib/pleroma/web/templates/static_fe/static_fe/_notice.html.eex

@@ -1,41 +1,109 @@
-<div class="activity h-entry" <%= if @selected do %> id="selected" <% end %>>
+<div class="status-container" <%= if @selected do %> id="selected" <% end %>>
-  <p class="pull-right">
+  <div class="left-side">
-    <a class="activity-link u-url u-uid" href="<%= @link %>">
+    <a href="<%= (@user.uri || @user.ap_id) %>" rel="author noopener">
-      <time class="dt-published" datetime="<%= @published %>">
+      <div class="avatar">
-        <%= format_date(@published) %>
+        <img
+          class="u-photo" width="48" height="48"
+          src="<%= User.avatar_url(@user) |> MediaProxy.url %>"
+          title="<%= @user.nickname %>" alt="<%= @user.nickname %>"
+        />
+      </div>
+    </a>
+  </div>
+  <div class="right-side">
+    <div class="status-heading">
+      <div class="heading-name-row">
+        <div class="heading-left">
+          <h4 class="username">
+            <%= raw Formatter.emojify(@user.name, @user.emoji) %>
+          </h4>
+          <a href="<%= (@user.uri || @user.ap_id) %>" class="account-name">
+            <%= @user.nickname %>
+          </a>
+        </div>
+        <div class="heading-right">
+          <a class="timeago" href="<%= @link %>">
+            <time
+              class="dt-published" datetime="<%= @published %>"
+              title="<%= format_date(@published) %>"
+            >
+              <%= time_ago(@published) %>
             </time>
           </a>
-  </p>
+          <%= if @visibility == "public" do %>
-  <%= render("_user_card.html", %{user: @user}) %>
+          <img class="fa-icon" src="/static-fe/svg/globe-solid.svg">
-  <div class="activity-content">
+          <% else %>
-    <%= if @title != "" do %>
+          <%= if @visibility == "unlisted" do %>
+          <img class="fa-icon" src="/static-fe/svg/lock-open-solid.svg">
+          <% end %>
+          <% end %>
+        </div>
+      </div>
+      <%= if @reply_to do %>
+      <div class="heading-reply-row">
+        <a class="reply-to-link" href="<%= @reply_to %>">
+          <img class="fa-icon" src="/static-fe/svg/reply-solid.svg">
+          <%= gettext("Reply to") %>
+        </a>
+        <span class="h-card">
+          <a href="<%= (@reply_to_user.uri || @reply_to_user.ap_id) %>" class="u-url mention">
+            @<%= @reply_to_user.nickname %>
+          </a>
+        </span>
+      </div>
+      <% end %>
+      <%= if @edited_at do %>
+      <div class="heading-edited-row">
+        <%= gettext("Edited %{timeago}", timeago: time_ago(@edited_at)) %>
+      </div>
+      <% end %>
+    </div>
+    <div class="status-content">
+      <%= if @title && @title != "" do %>
+      <span class="status-summary"><%= raw @title %></span>
       <details <%= if open_content?() do %>open<% end %>>
-        <summary class="p-name"><%= raw @title %></summary>
+        <summary><%= gettext("Show content") %></summary>
-        <div class="e-content"><%= raw @content %></div>
-      </details>
-    <% else %>
-      <div class="e-content"><%= raw @content %></div>
       <% end %>
-    <%= for %{"name" => name, "url" => [url | _]} <- @attachment do %>
+        <div class="status-body">
-      <%= if @sensitive do %>
+          <%= raw @content %>
-        <details class="nsfw">
+          <%= if @poll && length(@poll) > 0 do %> 
-          <summary><%= Gettext.gettext("sensitive media") %></summary>
+          <div class="poll">
+            <%= for %{"name" => option, "replies" => %{"totalItems" => count}} <- @poll do %>
+            <div class="poll-option" title="<%= count %>/<%= @total_votes %>">
+              <span class="percentage"><%= poll_percentage(count, @total_votes) %></span>
+              <span><%= raw option %></span>
+              <div class="fill" style="width: <%= poll_percentage(count, @total_votes) %>"></div>
+            </div>
+            <% end %>
+          </div>
+          <% end %>
+          <%= if length(@attachment) > 0 do %>
+          <div class="attachments">
+            <%= for attachment = %{"url" => [url | _]} <- @attachment do %>
+              <%= render("_attachment.html", %{name: get_attachment_name(attachment),
+                  url: url["href"], mediaType: fetch_media_type(url), nsfw: @sensitive}) %>
+            <% end %>
+          </div>
+          <% end %>
+        </div>
+      <%= if @title && @title != "" do %>
+      </details>
+      <% end %>
+    </div>
+    <!-- <div class="emoji-reactions"></div> -->
+    <div class="status-actions">
       <div>
-            <%= render("_attachment.html", %{name: name, url: url["href"],
+        <img class="fa-icon" src="/static-fe/svg/reply-solid.svg">
-                                             mediaType: fetch_media_type(url)}) %>
+        <span class="action-count"><%= @counts.replies %></span>
+      </div>
+      <div>
+        <img class="fa-icon" src="/static-fe/svg/retweet-solid.svg">
+        <span class="action-count"><%= @counts.announces %></span>
+      </div>
+      <div>
+        <img class="fa-icon" src="/static-fe/svg/star-regular.svg">
+        <span class="action-count"><%= @counts.likes %></span>
+      </div>
     </div>
-        </details>
-      <% else %>
-        <%= render("_attachment.html", %{name: name, url: url["href"],
-                                         mediaType: fetch_media_type(url)}) %>
-      <% end %>
-    <% end %>
   </div>
-  <%= if @selected do %>
-    <dl class="counts">
-      <dt><%= Gettext.gettext("replies") %></dt><dd><%= @counts.replies %></dd>
-      <dt><%= Gettext.gettext("announces") %></dt><dd><%= @counts.announces %></dd>
-      <dt><%= Gettext.gettext("likes") %></dt><dd><%= @counts.likes %></dd>
-    </dl>
-  <% end %>
 </div>

lib/pleroma/web/templates/static_fe/static_fe/_user_card.html.eex

@@ -1,11 +1,21 @@
-<div class="p-author h-card">
+<div class="user-card">
-  <a class="u-url" rel="author noopener" href="<%= (@user.uri || @user.ap_id) %>">
+  <div class="left-side">
+    <a href="<%= (@user.uri || @user.ap_id) %>" rel="author noopener">
       <div class="avatar">
-      <img class="u-photo" src="<%= User.avatar_url(@user) |> MediaProxy.url %>" width="48" height="48" alt="">
+        <img
+          class="u-photo" width="48" height="48"
+          src="<%= User.avatar_url(@user) |> MediaProxy.url %>"
+          title="<%= @user.nickname %>" alt="<%= @user.nickname %>"
+        />
       </div>
-    <span class="display-name">
-      <bdi class="p-name"><%= raw Formatter.emojify(@user.name, @user.emoji) %></bdi>
-      <span class="nickname"><%= @user.nickname %></span>
-    </span>
     </a>
   </div>
+  <div class="right-side">
+    <div class="username">
+      <%= raw Formatter.emojify(@user.name, @user.emoji) %>
+    </div>
+    <a href="<%= (@user.uri || @user.ap_id) %>" class="account-name">
+      @<%= @user.nickname %>
+    </a>
+  </div>
+</div>

lib/pleroma/web/templates/static_fe/static_fe/conversation.html.eex

@@ -1,11 +1,8 @@
-<header>
+<div class="panel conversation">
-  <h1><%= link instance_name(), to: "/" %></h1>
+  <div class="panel-heading">
-</header>
+    <%= gettext("Conversation") %>
-
+  </div>
-<main>
-  <div class="conversation">
   <%= for activity <- @activities do %>
   <%= render("_notice.html", activity) %>
   <% end %>
 </div>
-</main>

lib/pleroma/web/templates/static_fe/static_fe/error.html.eex

@@ -1,7 +1,8 @@
-<header>
+<div class="panel">
-  <h1><%= gettext("Oops") %></h1>
+  <div class="panel-heading">
-</header>
+    <%= gettext("Error") %>
-
+  </div>
-<main>
+  <div class="status-container">
-  <p><%= @message %></p>
+    <%= @message %>
-</main>
+  </div>
+</div>

lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex

@@ -1,31 +1,148 @@
-<header>
+<div class="panel profile">
-  <h1><%= link instance_name(), to: "/" %></h1>
+  <div class="user-header">
-
+    <div class="user-banner"></div>
-  <h3>
+    <div class="user-info">
-    <form class="pull-right collapse" method="POST" action="<%= Helpers.util_path(@conn, :remote_subscribe) %>">
+      <div class="container">
+        <a href="<%= (@user.uri || @user.ap_id) %>" rel="author noopener">
+          <div class="avatar">
+            <img
+                class="u-photo" width="48" height="48"
+                src="<%= User.avatar_url(@user) |> MediaProxy.url %>"
+                title="<%= @user.nickname %>" alt="<%= @user.nickname %>"
+            />
+          </div>
+        </a>
+        <div class="user-summary">
+          <div class="top-line">
+            <span class="username">
+              <%= raw Formatter.emojify(@user.name, @user.emoji) %>
+            </span>
+            </div>
+          <div class="bottom-line">
+            <%= link "@#{@user.nickname}", to: (@user.uri || @user.ap_id), class: "account-name" %>
+            <%= if @user.is_admin && @user.show_role do %>
+            <span class="user-role"><%= gettext("Admin") %></span>
+            <% end %>
+            <%= if @user.is_moderator && @user.show_role do %>
+            <span class="user-role"><%= gettext("Moderator") %></span>
+            <% end %>
+            <%= if @user.actor_type == "Service" do %>
+            <span class="user-role"><%= gettext("Bot") %></span>
+            <% end %>
+            <%= if @user.is_locked do %>
+            <img class="fa-icon" src="/static-fe/svg/lock-solid.svg">
+            <% end %>
+          </div>
+        </div>
+      </div>
+      <div class="remote-follow">
+        <form method="POST" action="<%= Helpers.util_path(@conn, :remote_subscribe) %>">
           <input type="hidden" name="nickname" value="<%= @user.nickname %>">
           <input type="hidden" name="profile" value="">
-      <button type="submit" class="collapse"><%= Gettext.dpgettext("static_pages", "static fe profile page remote follow button", "Remote follow") %></button>
+          <button type="submit" class="button-default"><%= Gettext.dpgettext("static_pages", "static fe profile page remote follow button", "Remote follow") %></button>
         </form>
-    <%= raw Formatter.emojify(@user.name, @user.emoji) %> |
+      </div>
-    <%= link "@#{@user.nickname}@#{Endpoint.host()}", to: (@user.uri || @user.ap_id) %>
+    </div>
-  </h3>
+    <div class="user-counts">
-  <p><%= raw @user.bio %></p>
+      <div class="user-count">
-</header>
+        <h5><%= gettext("Posts") %></h5>
-
+        <span><%= @user.note_count %></span>
-<main>
+      </div>
+      <div class="user-count">
+        <h5><%= gettext("Following") %></h5>
+        <span><%= if @user.hide_follows_count do gettext("Hidden") else @user.following_count end %></span>
+      </div>
+      <div class="user-count">
+        <h5><%= gettext("Followers") %></h5>
+        <span><%= if @user.hide_followers_count do gettext("Hidden") else @user.follower_count end %></span>
+      </div>
+    </div>
+    <span class="user-bio"><%= raw Formatter.emojify(@user.bio, @user.emoji) %></span>
+  </div>
+  <div class="user-profile-fields">
+    <%= for field <- @user.fields do %>
+    <div class="user-profile-field">
+      <dt title="<%= field["name"] %>"><%= raw Formatter.emojify(field["name"], @user.emoji) %></dt>
+      <dd title="<%= field["value"] %>"><%= raw Formatter.emojify(field["value"], @user.emoji) %></dd>
+    </div>
+    <% end %>
+  </div>
+  <div class="tab-switcher">
+    <a href="<%= (@user.uri || @user.ap_id) %>">
+      <button class="button-default tab <%= if @tab == "posts" do %>active<% end %>">
+        <%= gettext("Posts") %>
+      </button>
+    </a>
+    <a href="<%= (@user.uri || @user.ap_id) %>/with_replies">
+      <button class="button-default tab <%= if @tab == "with_replies" do %>active<% end %>">
+        <%= gettext("With Replies") %>
+      </button>
+    </a>
+    <%= unless @user.hide_follows do %>
+    <a href="<%= (@user.uri || @user.ap_id) %>/following">
+      <button class="button-default tab <%= if @tab == "following" do %>active<% end %>">
+        <%= gettext("Following") %>
+      </button>
+    </a>
+    <% end %>
+    <%= unless @user.hide_followers do %>
+    <a href="<%= (@user.uri || @user.ap_id) %>/followers">
+      <button class="button-default tab <%= if @tab == "followers" do %>active<% end %>">
+        <%= gettext("Followers") %>
+      </button>
+    </a>
+    <% end %>
+    <a href="<%= (@user.uri || @user.ap_id) %>/media">
+      <button class="button-default tab <%= if @tab == "media" do %>active<% end %>">
+        <%= gettext("Media") %>
+      </button>
+    </a>
+  </div>
+  <%= if @prev_page_id do %>
+  <%= link gettext("Show newer"), to: "?min_id=" <> @prev_page_id, class: "load-posts" %>
+  <% end %>
   <div class="activity-stream">
+    <%= if @tab in ["posts", "with_replies", "media"] do %>
     <%= for activity <- @timeline do %>
+    <%= if(activity.user.id != @user.id) do %>
+    <div class="repeat-header">
+      <div class="left-side">
+        <a href="<%= (@user.uri || @user.ap_id) %>" rel="author noopener">
+          <div class="avatar">
+            <img
+              class="u-photo" width="48" height="48"
+              src="<%= User.avatar_url(@user) |> MediaProxy.url %>"
+              title="<%= @user.nickname %>" alt="<%= @user.nickname %>"
+            />
+          </div>
+        </a>
+      </div>
+      <div class="right-side">
+        <span class="username">
+          <a href="<%= (@user.uri || @user.ap_id) %>" class="account-name">
+            <%= raw Formatter.emojify(@user.name, @user.emoji) %>
+          </a>
+        </span>
+        <img class="fa-icon" src="/static-fe/svg/retweet-solid.svg">
+        <%= gettext("repeated") %>
+      </div>
+    </div>
+    <% end %>
     <%= render("_notice.html", Map.put(activity, :selected, false)) %>
     <% end %>
-    <p id="pagination">
+    <% else %>
-      <%= if @prev_page_id do %>
+    <%= for user <- @timeline do %>
-        <%= link "«", to: "?min_id=" <> @prev_page_id %>
+    <%= render("_user_card.html", %{user: user}) %>
     <% end %>
-      <%= if @prev_page_id && @next_page_id, do: " | " %>
-      <%= if @next_page_id do %>
-        <%= link "»", to: "?max_id=" <> @next_page_id %>
     <% end %>
-    </p>
   </div>
-</main>
+  <%= if @next_page_id do %>
+  <%= link gettext("Show older"), to: "?max_id=" <> @next_page_id, class: "load-posts" %>
+  <% end %>
+</div>
+
+<style>
+  :root {
+    --user-banner: url("<%= Pleroma.User.banner_url(@user) %>");
+  }
+</style>

lib/pleroma/web/views/layout_view.ex

@@ -4,4 +4,11 @@
 
 defmodule Pleroma.Web.LayoutView do
   use Pleroma.Web, :view
+  import Phoenix.HTML
+
+  def render_html(file) do
+    case :httpc.request(Pleroma.Web.Endpoint.url() <> file) do
+      {:ok, {{_, 200, _}, _headers, body}} -> body
+    end
+  end
 end

priv/static/static-fe/static-fe.css

@@ -1,59 +1,278 @@
+/* pleroma-light and pleroma-dark themes from pleroma-fe */
+:root {
+    --icon-filter: invert(38%) sepia(11%) saturate(209%) hue-rotate(179deg) brightness(99%) contrast(89%);
+    --wallpaper: rgba(11, 16, 23, 1);
+    --alertNeutral: rgba(185, 185, 186, 0.5);
+    --alertNeutralText: rgba(255, 255, 255, 1);
+    --avatarShadow: 0px 1px 8px 0px rgba(0, 0, 0, 0.7);
+    --loadPostsSelected: rgba(23, 34, 46, 1);
+    --loadPostsSelectedText: rgba(185, 185, 186, 1);
+    --profileBg: rgba(7, 12, 17, 1);
+    --profileTint: rgba(15, 22, 30, 0.5);
+    --btnText: rgba(185, 185, 186, 1);
+    --btn: rgba(21, 30, 43, 1);
+    --btnShadow: 0px 0px 2px 0px rgba(0, 0, 0, 1) , 0px 1px 0px 0px rgba(255, 255, 255, 0.2) inset, 0px -1px 0px 0px rgba(0, 0, 0, 0.2) inset;
+    --btnHoverShadow: 0px 0px 1px 2px rgba(185, 185, 186, 0.4) inset, 0px 1px 0px 0px rgba(255, 255, 255, 0.2) inset, 0px -1px 0px 0px rgba(0, 0, 0, 0.2) inset;
+    --lightText: rgba(236, 236, 236, 1);
+    --panelShadow: 0px 0px 3px 0px rgba(0, 0, 0, 0.5) , 0px 4px 6px 3px rgba(0, 0, 0, 0.3);
+    --panelHeaderShadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.4) , 0px 1px 0px 0px rgba(255, 255, 255, 0.2) inset;
+    --topBar: rgba(21, 30, 43, 1);
+    --topBarText: rgba(159, 159, 161, 1);
+    --topBarShadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.4) , 0px 2px 7px 0px rgba(0, 0, 0, 0.3);
+    --underlay: rgba(9, 14, 20, 0.6);
+    --background: rgba(15, 22, 30, 1);
+    --faint: rgba(185, 185, 186, 0.5);
+    --selectedPost: rgba(23, 34, 46, 1);
+    --link: rgba(226, 177, 136, 1);
+    --text: rgba(185, 185, 186, 1);
+    --border: rgba(26, 37, 53, 1);
+    --poll: rgba(99, 84, 72, 1);
+}
+@media (prefers-color-scheme: light) {
+    :root {
+        --icon-filter: invert(67%) sepia(7%) saturate(525%) hue-rotate(173deg) brightness(90%) contrast(92%);;
+        --wallpaper: rgba(248, 250, 252, 1);
+        --alertNeutral: rgba(48, 64, 85, 0.5);
+        --alertNeutralText: rgba(0, 0, 0, 1);
+        --avatarShadow: 0px 1px 8px 0px rgba(0, 0, 0, 0.7);
+        --loadPostsSelected: rgba(224, 233, 240, 1);
+        --loadPostsSelectedText: rgba(48, 64, 85, 1);
+        --profileBg: rgba(128, 137, 146, 1);
+        --profileTint: rgba(242, 246, 249, 0.5);
+        --btnText: rgba(48, 64, 85, 1);
+        --btn: rgba(214, 223, 237, 1);
+        --btnShadow: 0px 0px 2px 0px rgba(0, 0, 0, 0.2) , 0px 1px 0px 0px rgba(255, 255, 255, 0.5) inset, 0px -1px 0px 0px rgba(0, 0, 0, 0.2) inset;
+        --btnHoverShadow: 0px 0px 2px 0px rgba(0, 0, 0, 0.2) , 0px 0px 1px 2px rgba(255, 195, 159, 1) inset, 0px -1px 0px 0px rgba(0, 0, 0, 0.2) inset;
+        --lightText: rgba(11, 14, 19, 1);
+        --panelShadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.5) , 0px 3px 6px 1px rgba(0, 0, 0, 0.2);
+        --panelHeaderShadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.5) inset, 0px 1px 3px 0px rgba(0, 0, 0, 0.3);
+        --topBar: rgba(214, 223, 237, 1);
+        --topBarText: rgba(48, 64, 85, 1);
+        --topBarShadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.6);
+        --underlay: rgba(93, 96, 134, 0.4);
+        --background: rgba(242, 246, 249, 1);
+        --faint: rgba(48, 64, 85, 0.5);
+        --selectedPost: rgba(224, 233, 240, 1);
+        --link: rgba(245, 91, 27, 1);
+        --text: rgba(48, 64, 85, 1);
+        --border: rgba(216, 230, 249, 1);
+        --poll: rgba(243, 184, 160, 1);
+    }
+}
+
+html {
+    height: 100%;
+    overflow-y: auto;
+}
+
 body {
-    background-color: #282c37;
+    overflow: auto;
+    margin: 0;
+    height: 100%;
     font-family: sans-serif;
-    color: white;
+    color: var(--text);
 }
 
-main {
+.background-image {
-    margin: 50px auto;
+    position: fixed;
-    max-width: 960px;
+    height: 100%;
-    padding: 40px;
+    top: 3.5em;
-    background-color: #313543;
+    z-index: -1000;
-    border-radius: 4px;
+    left: 0;
-}
+    right: -20px;
-
+    background-size: cover;
-header {
+    background-repeat: no-repeat;
-    margin: 50px auto;
+    background-color: var(--wallpaper);
-    max-width: 960px;
+    background-image: var(--background-image);
-    padding: 40px;
+    background-position: 50%;
-    background-color: #313543;
-    border-radius: 4px;
-}
-
-.activity {
-    border-radius: 4px;
-    padding: 1em;
-    padding-bottom: 2em;
-    margin-bottom: 1em;
-}
-
-.avatar {
-    cursor: pointer;
-}
-
-.avatar img {
-    float: left;
-    border-radius: 4px;
-    margin-right: 4px;
-}
-
-.activity-content img, video, audio {
-    padding: 1em;
-    max-width: 800px;
-    max-height: 800px;
-}
-
-#selected {
-    background-color: #1b2735;
-}
-
-.counts dt, .counts dd {
-    float: left;
-    margin-left: 1em;
 }
 
 a {
-    color: white;
+    text-decoration: none;
+    color: var(--link);
+}
+
+nav {
+    position: sticky;
+    top: 0;
+    width: 100%;
+    height: 3.5em;
+    background-color: var(--topBar);
+    box-shadow: var(--topBarShadow);
+    z-index: 2000;
+}
+
+.inner-nav {
+    padding: 0 1.2em;
+    margin: auto;
+    max-width: 1110px;
+}
+
+.inner-nav a {
+    line-height: 3.5em;
+    color: var(--topBarText);
+}
+
+.inner-nav img {
+    height: 28px;
+    vertical-align: middle;
+    padding-right: 5px
+}
+
+body > .container {
+    display: grid;
+    grid-template-columns: minmax(25em, 45em) 25em;
+    grid-template-areas: "content sidebar";
+    height: calc(100vh - 3.5em);
+    justify-content: center;
+}
+
+.underlay {
+    grid-column-start: 1;
+    grid-column-end: span 2;
+    grid-row-start: 1;
+    grid-row-end: 1;
+    background-color: var(--underlay);
+    z-index: -1000;
+}
+
+.column {
+    padding: 1em;
+    margin: -0.5em;
+}
+
+.panel {
+    background-color: var(--background);
+    border-radius: 3px;
+    box-shadow: var(--panelShadow);
+}
+
+.panel-heading {
+    background-color: var(--topBar);
+    font-size: 1.3em;
+    padding: 0.6em;
+    border-radius: 3px 3px 0 0;
+    box-shadow: var(--panelHeaderShadow);
+}
+
+.about-content {
+    padding: 0.6em;
+}
+
+.main {
+    grid-area: content;
+    position: relative;
+}
+
+.sidebar {
+    grid-area: sidebar;
+    padding-left: 0.5em;
+}
+
+.status-container,
+.repeat-header,
+.user-card {
+    display: flex;
+    padding: 0.75em;
+}
+
+.left-side {
+    margin-right: 0.75em;
+}
+
+.right-side {
+    flex: 1;
+    min-width: 0;
+}
+
+.repeat-header {
+    padding: 0.4em 0.75em;
+    margin-bottom: -0.75em;
+}
+
+.repeat-header .right-side {
+    color: var(--faint);
+}
+.repeat-header .u-photo {
+    height: 20px;
+    width: 20px;
+    margin-left: 28px;
+}
+
+.status-heading {
+    margin-bottom: 0.5em;
+    line-height: 1.3;
+}
+
+.status-heading a {
+    display: inline-block;
+    word-break: break-all;
+}
+
+.heading-left {
+    display: flex;
+    flex: 1;
+    overflow: hidden;
+}
+
+.heading-right {
+    display: flex;
+    align-items: center;
+}
+
+.heading-name-row .account-name {
+    min-width: 1.6em;
+    margin-right: 0.4em;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    flex: 1 1 0;
+}
+
+.heading-name-row .username,
+.repeat-header .username {
+    white-space: nowrap;
+    overflow: hidden;
+    max-width: 85%;
+    font-weight: bold;
+    flex-shrink: 1;
+    margin: 0;
+    margin-right: 0.4em;
+    text-overflow: ellipsis;
+}
+
+.heading-name-row {
+    display: flex;
+    justify-content: space-between;
+}
+
+.heading-edited-row,
+.heading-reply-row {
+    font-size: 0.85em;
+    margin-top: 0.2em;
+}
+
+.reply-to-link {
+    color: var(--faint);
+}
+.reply-to-link:hover {
+    text-decoration: underline;
+}
+
+#selected {
+    background-color: var(--selectedPost);
+}
+
+.timeago {
+    color: var(--faint);
+}
+
+#selected .timeago {
+    color: var(--text);
+}
+
+.timeago :hover {
+    text-decoration: underline;
 }
 
 .h-card {
@@ -69,116 +288,340 @@ header a:hover, .h-card a:hover {
     text-decoration: underline;
 }
 
-.display-name {
+.attachments {
-    padding-top: 4px;
+    margin-top: 0.5em;
+    flex-direction: row;
+    display: flex;
+    flex-wrap: nowrap;
+    align-content: stretch;
+    max-height: 24em;
+}
+
+.attachment {
+    border: 1px solid var(--border);
+    border-radius: 3px;
+    display: flex;
+    flex-grow: 1;
+    justify-content: center;
+    position: relative;
+    min-width: 0;
+}
+
+.attachment > * {
+    width: 100%;
+    object-fit: contain;
+}
+
+.attachment:not(:last-child) {
+    margin-right: 0.5em;
+}
+
+.nsfw-banner {
+    position: absolute;
+    height: 100%;
+    display: flex;
+    align-items: center;
+}
+.nsfw-banner div {
+    width: 100%;
+    text-align: center;
+}
+
+.nsfw-banner:not(:hover) {
+    background-color: var(--background);
+}
+.nsfw-banner:hover div {
+    display: none;
+}
+
+.poll-option {
+    position: relative;
+    display: flex;
+    margin: 0.75em 0.5em;
+    padding: 0.1em 0.25em;
+    word-break: break-word;
+    z-index: 1;
+}
+.poll-option .percentage {
+    width: 3.5em;
+    flex-shrink: 0;
+}
+.poll-option .fill {
+    height: 100%;
+    position: absolute;
+    background-color: var(--poll);
+    border-radius: 3px;
+    top: 0;
+    left: 0;
+    z-index: -1;
+}
+
+.status-actions {
+    position: relative;
+    width: 100%;
+    display: flex;
+    margin-top: 0.75em;
+}
+.status-actions > * {
+    max-width: 4em;
+    flex: 1;
+    display: flex;
+}
+
+.status-summary {
     display: block;
+    font-style: italic;
+    padding-bottom: 0.5em;
+    margin-bottom: 0.5em;
+    border-style: solid;
+    border-width: 0 0 1px 0;
+    border-color: var(--border, #222);
+}
+
+summary {
+    text-align: center;
+    color: var(--link);
+    cursor: pointer;
+}
+
+.status-body {
+    word-wrap: break-word;
+    word-break: break-word;
+    line-height: 1.4;
+}
+
+.user-info {
+    padding: 0.5em 26px;
+}
+
+.user-info .container {
+    padding: 18px 0 6px 0;
+    display: flex;
+    align-items: flex-start;
+    max-height: 56px;
+}
+
+.user-info a {
+    color: var(--lightText);
+}
+
+.user-info .avatar img {
+    height: 56px;
+    width: 56px;
+}
+
+.avatar img {
+    border-radius: 3px;
+    box-shadow: var(--avatarShadow);
+}
+
+.user-summary {
+    display: block;
+    margin-left: 0.6em;
+    text-align: left;
     text-overflow: ellipsis;
+    white-space: nowrap;
+    flex: 1 1 0;
+    z-index: 1;
+    line-height: 2em;
+    color: var(--lightText);
+}
+
+.button-default {
+    user-select: none;
+    color: var(--btnText);
+    background-color: var(--btn);
+    border: none;
+    border-radius: 4px;
+    box-shadow: var(--btnShadow);
+    font-size: 1em;
+    min-height: 2em;
+}
+
+.button-default:hover {
+    box-shadow: var(--btnHoverShadow);
+    cursor: pointer;
+}
+
+.user-bio {
+    text-align: center;
+    display: block;
+    line-height: 1.3;
+    padding: 1em;
+    margin: 0;
+}
+
+.user-banner {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-image: linear-gradient(to bottom, var(--profileTint), var(--profileTint)),
+                      var(--user-banner);
+    background-size: cover;
+    background-color: var(--profileBg);
+    -webkit-mask: linear-gradient(to top, white, transparent) bottom no-repeat,
+                  linear-gradient(to top, white, white);
+    -webkit-mask-composite: xor;
+    -webkit-mask-size: 100% 60%;
+    z-index: -2;
+}
+
+.user-header {
+    position: relative;
+    z-index: 1;
+}
+
+.user-role {
+    color: var(--alertNeutralText);
+    background-color: var(--alertNeutral);
+    margin: 0 0.35em;
+    padding: 0 0.25em;
+    border-radius: 2px;
+}
+
+.user-profile-fields {
+    margin: 0 0.5em;
+}
+
+.user-profile-field {
+    display: flex;
+    margin: 0.25em;
+    border: 1px solid var(--border, #222);
+    border-radius: 3px;
+    line-height: 1.3;
+    text-overflow: ellipsis;
+    white-space: nowrap;
     overflow: hidden;
-    color: white;
 }
 
-/* keep emoji from being hilariously huge */
+.user-profile-field dt {
-.display-name img {
+    padding: 0.5em 1.5em;
-    max-height: 1em;
+    box-sizing: border-box;
-    max-width: 1em;
+    flex: 0 1 30%;
+    font-weight: 500;
+    color: var(--lightText);
+    border-right: 1px solid var(--border);
+    text-align: right;
 }
 
-.display-name .nickname {
+.user-profile-field dd {
-    padding-top: 4px;
+    padding: 0.5em 1.5em;
+    box-sizing: border-box;
+    flex: 1 1 30%;
+    margin: 0 0 0 0.25em;
+}
+
+.user-counts {
+    display: flex;
+    line-height: 1em;
+    padding: 0.5em 1.5em 0 1.5em;
+    text-align: center;
+    justify-content: space-between;
+    color: var(--lightText);
+    flex-wrap: wrap;
+}
+
+.user-count {
+    flex: 1 0 auto;
+    padding: 0.5em 0;
+    margin: 0 0.5em;
+}
+
+.user-count h5 {
+    font-size: 1em;
+    font-weight: bolder;
+    margin: 0 0 0.25em;
+}
+
+.tab-switcher {
+    display: flex;
+    padding-top: 5px;
+    overflow-x: auto;
+    overflow-y: hidden;
+    border-bottom: 1px solid var(--border);
+}
+
+.tab-switcher::before,
+.tab-switcher::after {
+    flex: 1 1 auto;
+    content: '';
+}
+
+.tab {
+    flex: 0 0 auto;
+    padding: 6px 1em;
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+}
+
+.tab.active {
+    background: transparent;
+}
+
+.profile .status-container {
+    border-bottom: 1px solid var(--border);
+}
+
+.bottom-line {
+    display: flex;
+}
+
+.load-posts {
+    display: block;
+    box-sizing: border-box;
+    height: 3.5em;
+    line-height: 3.5em;
+    padding: 0 1em;
+    width: 100%;
+    text-align: center;
+}
+
+.load-posts:hover {
+    background-color: var(--loadPostsSelected);
+    color: var(--loadPostsSelectedText);
+}
+
+
+.fa-icon {
+    height: 0.875em;
+    margin: 0 0.3em;
+    filter: var(--icon-filter);
+    align-self: center;
+}
+
+.status-actions .fa-icon {
+    height: 1.1em;
+}
+
+.reply-to-link .fa-icon {
+    transform: scale(-1, 1);
+}
+
+@media (max-width: 800px) {
+    body > .container {
         display: block;
     }
 
-.nickname:hover {
+    .column {
-    text-decoration: none;
+        padding: 0;
-}
-
-.pull-right {
-    float: right;
-}
-
-.collapse {
-    margin: 0;
-    width: auto;
-}
-
-h1 {
         margin: 0;
     }
 
-h2 {
+    .sidebar {
-    color: #9baec8;
+        display: none;
-    font-weight: normal;
+    }
-    font-size: 20px;
-    margin-bottom: 40px;
 }
 
-form {
+img:not(.u-photo, .fa-icon) {
-    width: 100%;
-}
-
-input {
-    box-sizing: border-box;
-    width: 100%;
-    padding: 10px;
-    margin-top: 20px;
-    background-color: rgba(0,0,0,.1);
-    color: white;
-    border: 0;
-    border-bottom: 2px solid #9baec8;
-    font-size: 14px;
-}
-
-input:focus {
-    border-bottom: 2px solid #4b8ed8;
-}
-
-input[type="checkbox"] {
-    width: auto;
-}
-
-button {
-    box-sizing: border-box;
-    width: 100%;
-    color: white;
-    background-color: #419bdd;
-    border-radius: 4px;
-    border: none;
-    padding: 10px;
-    margin-top: 30px;
-    text-transform: uppercase;
-    font-weight: 500;
-    font-size: 16px;
-}
-
-.alert-danger {
-    box-sizing: border-box;
-    width: 100%;
-    color: #D8000C;
-    background-color: #FFD2D2;
-    border-radius: 4px;
-    border: none;
-    padding: 10px;
-    margin-top: 20px;
-    font-weight: 500;
-    font-size: 16px;
-}
-
-.alert-info {
-    box-sizing: border-box;
-    width: 100%;
-    color: #00529B;
-    background-color: #BDE5F8;
-    border-radius: 4px;
-    border: none;
-    padding: 10px;
-    margin-top: 20px;
-    font-weight: 500;
-    font-size: 16px;
-}
-
-img.emoji {
     width: 32px;
     height: 32px;
     padding: 0;
     vertical-align: middle;
 }
+
+.username img:not(.u-photo) {
+    width: 16px;
+    height: 16px;
+}

priv/static/static-fe/svg/globe-solid.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M352 256c0 22.2-1.2 43.6-3.3 64H163.3c-2.2-20.4-3.3-41.8-3.3-64s1.2-43.6 3.3-64H348.7c2.2 20.4 3.3 41.8 3.3 64zm28.8-64H503.9c5.3 20.5 8.1 41.9 8.1 64s-2.8 43.5-8.1 64H380.8c2.1-20.6 3.2-42 3.2-64s-1.1-43.4-3.2-64zm112.6-32H376.7c-10-63.9-29.8-117.4-55.3-151.6c78.3 20.7 142 77.5 171.9 151.6zm-149.1 0H167.7c6.1-36.4 15.5-68.6 27-94.7c10.5-23.6 22.2-40.7 33.5-51.5C239.4 3.2 248.7 0 256 0s16.6 3.2 27.8 13.8c11.3 10.8 23 27.9 33.5 51.5c11.6 26 21 58.2 27 94.7zm-209 0H18.6C48.6 85.9 112.2 29.1 190.6 8.4C165.1 42.6 145.3 96.1 135.3 160zM8.1 192H131.2c-2.1 20.6-3.2 42-3.2 64s1.1 43.4 3.2 64H8.1C2.8 299.5 0 278.1 0 256s2.8-43.5 8.1-64zM194.7 446.6c-11.6-26-20.9-58.2-27-94.6H344.3c-6.1 36.4-15.5 68.6-27 94.6c-10.5 23.6-22.2 40.7-33.5 51.5C272.6 508.8 263.3 512 256 512s-16.6-3.2-27.8-13.8c-11.3-10.8-23-27.9-33.5-51.5zM135.3 352c10 63.9 29.8 117.4 55.3 151.6C112.2 482.9 48.6 426.1 18.6 352H135.3zm358.1 0c-30 74.1-93.6 130.9-171.9 151.6c25.5-34.2 45.2-87.7 55.3-151.6H493.4z"/></svg>

priv/static/static-fe/svg/lock-open-solid.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><!--! Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M352 144c0-44.2 35.8-80 80-80s80 35.8 80 80v48c0 17.7 14.3 32 32 32s32-14.3 32-32V144C576 64.5 511.5 0 432 0S288 64.5 288 144v48H64c-35.3 0-64 28.7-64 64V448c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V256c0-35.3-28.7-64-64-64H352V144z"/></svg>

priv/static/static-fe/svg/lock-solid.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M144 144v48H304V144c0-44.2-35.8-80-80-80s-80 35.8-80 80zM80 192V144C80 64.5 144.5 0 224 0s144 64.5 144 144v48h16c35.3 0 64 28.7 64 64V448c0 35.3-28.7 64-64 64H64c-35.3 0-64-28.7-64-64V256c0-35.3 28.7-64 64-64H80z"/></svg>

priv/static/static-fe/svg/reply-solid.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M205 34.8c11.5 5.1 19 16.6 19 29.2v64H336c97.2 0 176 78.8 176 176c0 113.3-81.5 163.9-100.2 174.1c-2.5 1.4-5.3 1.9-8.1 1.9c-10.9 0-19.7-8.9-19.7-19.7c0-7.5 4.3-14.4 9.8-19.5c9.4-8.8 22.2-26.4 22.2-56.7c0-53-43-96-96-96H224v64c0 12.6-7.4 24.1-19 29.2s-25 3-34.4-5.4l-160-144C3.9 225.7 0 217.1 0 208s3.9-17.7 10.6-23.8l160-144c9.4-8.5 22.9-10.6 34.4-5.4z"/></svg>

priv/static/static-fe/svg/retweet-solid.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><!--! Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M272 416c17.7 0 32-14.3 32-32s-14.3-32-32-32H160c-17.7 0-32-14.3-32-32V192h32c12.9 0 24.6-7.8 29.6-19.8s2.2-25.7-6.9-34.9l-64-64c-12.5-12.5-32.8-12.5-45.3 0l-64 64c-9.2 9.2-11.9 22.9-6.9 34.9s16.6 19.8 29.6 19.8l32 0 0 128c0 53 43 96 96 96H272zM304 96c-17.7 0-32 14.3-32 32s14.3 32 32 32l112 0c17.7 0 32 14.3 32 32l0 128H416c-12.9 0-24.6 7.8-29.6 19.8s-2.2 25.7 6.9 34.9l64 64c12.5 12.5 32.8 12.5 45.3 0l64-64c9.2-9.2 11.9-22.9 6.9-34.9s-16.6-19.8-29.6-19.8l-32 0V192c0-53-43-96-96-96L304 96z"/></svg>

priv/static/static-fe/svg/star-regular.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><!--! Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M287.9 0C297.1 0 305.5 5.25 309.5 13.52L378.1 154.8L531.4 177.5C540.4 178.8 547.8 185.1 550.7 193.7C553.5 202.4 551.2 211.9 544.8 218.2L433.6 328.4L459.9 483.9C461.4 492.9 457.7 502.1 450.2 507.4C442.8 512.7 432.1 513.4 424.9 509.1L287.9 435.9L150.1 509.1C142.9 513.4 133.1 512.7 125.6 507.4C118.2 502.1 114.5 492.9 115.1 483.9L142.2 328.4L31.11 218.2C24.65 211.9 22.36 202.4 25.2 193.7C28.03 185.1 35.5 178.8 44.49 177.5L197.7 154.8L266.3 13.52C270.4 5.249 278.7 0 287.9 0L287.9 0zM287.9 78.95L235.4 187.2C231.9 194.3 225.1 199.3 217.3 200.5L98.98 217.9L184.9 303C190.4 308.5 192.9 316.4 191.6 324.1L171.4 443.7L276.6 387.5C283.7 383.7 292.2 383.7 299.2 387.5L404.4 443.7L384.2 324.1C382.9 316.4 385.5 308.5 391 303L476.9 217.9L358.6 200.5C350.7 199.3 343.9 194.3 340.5 187.2L287.9 78.95z"/></svg>

test/pleroma/web/static_fe/static_fe_controller_test.exs

@@ -6,6 +6,8 @@ defmodule Pleroma.Web.StaticFE.StaticFEControllerTest do
   use Pleroma.Web.ConnCase
 
   alias Pleroma.Activity
+  alias Pleroma.User
+  alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.ActivityPub.Transmogrifier
   alias Pleroma.Web.ActivityPub.Utils
   alias Pleroma.Web.CommonAPI
@@ -42,8 +44,67 @@ test "profile does not include private messages", %{conn: conn, user: user} do
 
       html = html_response(conn, 200)
 
-      assert html =~ ">public<"
+      assert html =~ "\npublic\n"
-      refute html =~ ">private<"
+      refute html =~ "\nprivate\n"
+    end
+
+    test "main page does not include replies", %{conn: conn, user: user} do
+      {:ok, op} = CommonAPI.post(user, %{status: "beep"})
+      CommonAPI.post(user, %{status: "boop", in_reply_to_id: op})
+
+      conn = get(conn, "/users/#{user.nickname}")
+
+      html = html_response(conn, 200)
+
+      assert html =~ "\nbeep\n"
+      refute html =~ "\nboop\n"
+    end
+
+    test "media page only includes posts with attachments", %{conn: conn, user: user} do
+      file = %Plug.Upload{
+        content_type: "image/jpeg",
+        path: Path.absname("test/fixtures/image.jpg"),
+        filename: "an_image.jpg"
+      }
+
+      {:ok, %{id: media_id}} = ActivityPub.upload(file, actor: user.ap_id)
+
+      CommonAPI.post(user, %{status: "virgin text post"})
+      CommonAPI.post(user, %{status: "chad post with attachment", media_ids: [media_id]})
+
+      conn = get(conn, "/users/#{user.nickname}/media")
+
+      html = html_response(conn, 200)
+
+      assert html =~ "\nchad post with attachment\n"
+      refute html =~ "\nvirgin text post\n"
+    end
+
+    test "show follower list", %{conn: conn, user: user} do
+      follower = insert(:user)
+      CommonAPI.follow(follower, user)
+
+      conn = get(conn, "/users/#{user.nickname}/followers")
+
+      html = html_response(conn, 200)
+
+      assert html =~ "user-card"
+    end
+
+    test "don't show followers if hidden", %{conn: conn, user: user} do
+      follower = insert(:user)
+      CommonAPI.follow(follower, user)
+
+      {:ok, user} =
+        user
+        |> User.update_changeset(%{hide_followers: true})
+        |> User.update_and_set_cache()
+
+      conn = get(conn, "/users/#{user.nickname}/followers")
+
+      html = html_response(conn, 200)
+
+      refute html =~ "user-card"
     end
 
     test "pagination", %{conn: conn, user: user} do
@@ -53,10 +114,10 @@ test "pagination", %{conn: conn, user: user} do
 
       html = html_response(conn, 200)
 
-      assert html =~ ">test30<"
+      assert html =~ "\ntest30\n"
-      assert html =~ ">test11<"
+      assert html =~ "\ntest11\n"
-      refute html =~ ">test10<"
+      refute html =~ "\ntest10\n"
-      refute html =~ ">test1<"
+      refute html =~ "\ntest1\n"
     end
 
     test "pagination, page 2", %{conn: conn, user: user} do
@@ -67,10 +128,10 @@ test "pagination, page 2", %{conn: conn, user: user} do
 
       html = html_response(conn, 200)
 
-      assert html =~ ">test1<"
+      assert html =~ "\ntest1\n"
-      assert html =~ ">test10<"
+      assert html =~ "\ntest10\n"
-      refute html =~ ">test20<"
+      refute html =~ "\ntest20\n"
-      refute html =~ ">test29<"
+      refute html =~ "\ntest29\n"
     end
 
     test "does not require authentication on non-federating instances", %{
@@ -104,7 +165,7 @@ test "single notice page", %{conn: conn, user: user} do
       conn = get(conn, "/notice/#{activity.id}")
 
       html = html_response(conn, 200)
-      assert html =~ "<header>"
+      assert html =~ "<div class=\"panel conversation\">"
       assert html =~ user.nickname
       assert html =~ "testing a thing!"
     end