-<div class="activity" <%= if @selected do %> id="selected" <% end %>>
- <p class="pull-right">
- <%= link format_date(@published), to: @link, class: "activity-link" %>
- </p>
- <%= render("_user_card.html", %{user: @user}) %>
- <div class="activity-content">
- <%= if @title != "" do %>
+<div class="status-container" <%= if @selected do %> id="selected" <% end %>>
+ <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">
+ <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>
+ <%= if @visibility == "public" do %>
+ <img class="fa-icon" src="/static-fe/svg/globe-solid.svg">
+ <% else %>
+ <%= 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">
+ <%= if @reply_to_user do %>
+ <a href="<%= (@reply_to_user.uri || @reply_to_user.ap_id) %>" class="u-url mention">
+ @<%= @reply_to_user.nickname %>
+ </a>
+ <% end %>
+ </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>