assets/css/clacks.scss

@@ -189,16 +189,6 @@ ul.notifications-list {
 		// we want 100% width to include the border
 		box-sizing: border-box;
 	}
-
-	.compose-status-options {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-
-		.spacer {
-			flex-grow: 1;
-		}
-	}
 }
 
 .search-form {

lib/clacks_web/controllers/frontend_controller.ex

@@ -274,13 +274,13 @@ defmodule ClacksWeb.FrontendController do
     })
   end
 
-  def post_status(conn, %{"content" => content, "content_type" => content_type} = params) do
+  def post_status(conn, %{"content" => content} = params) do
     current_user = conn.assigns[:user] |> Repo.preload(:actor)
 
     UserActionsHelper.post_status(
       current_user,
       content,
-      content_type,
+      "text/plain",
       Map.get(params, "in_reply_to")
     )
     |> case do

lib/clacks_web/templates/frontend/_post_form.html.eex

@@ -1,19 +0,0 @@
-<%= form_tag Routes.frontend_path(@conn, :post_status), method: :post, class: "compose-status" do %>
-  <%= if assigns[:in_reply_to] do %>
-    <input type="hidden" name="in_reply_to" value="<%= @in_reply_to %>">
-  <% end %>
-
-  <% placeholder = assigns[:placeholder] || "What's up?" %>
-  <% content = assigns[:content] || "" %>
-  <textarea id="content" name="content" rows="5" placeholder="<%= placeholder %>"><%= content %></textarea>
-
-  <div class="compose-status-options">
-    <select name="content_type">
-      <option value="text/plain">Plain</option>
-      <option value="text/markdown">Markdown</option>
-      <option value="text/html">HTML</option>
-    </select>
-    <div class="spacer"></div>
-    <%= submit "Post" %>
-  </div>
-<% end %>

lib/clacks_web/templates/frontend/home.html.eex

@@ -1,6 +1,9 @@
 <h1>Home</h1>
 
-<%= render "_post_form.html", conn: @conn %>
+<%= form_tag Routes.frontend_path(@conn, :post_status), method: :post, class: "compose-status" do %>
-<hr>
+  <textarea id="content" name="content" rows="5" placeholder="What's up?" required></textarea>
+  <%= submit "Post" %>
+  <hr>
+<% end %>
 
 <%= render "_timeline.html", conn: @conn, statuses_with_authors: @statuses_with_authors %>

lib/clacks_web/templates/frontend/status.html.eex

@@ -3,6 +3,10 @@
 <%= unless is_nil(@current_user) do %>
   <hr>
 
-  <%= render "_post_form.html", conn: @conn, in_reply_to: @status.data["object"]["id"], placeholder: "Reply", content: mentions_for_replying_to(@conn, @status) %>
+  <%= form_tag Routes.frontend_path(@conn, :post_status), method: :post, class: "compose-status" do %>
-  <hr>
+    <input type="hidden" name="in_reply_to" value="<%= @status.data["object"]["id"] %>">
+    <textarea id="content" name="content" rows="5" placeholder="Reply" required><%= mentions_for_replying_to(@conn, @status) %></textarea>
+    <%= submit "Post" %>
+    <hr>
+  <% end %>
 <% end %>

lib/clacks_web/views/frontend_view.ex

@@ -121,14 +121,9 @@ defmodule ClacksWeb.FrontendView do
         actor = Actor.get_cached_by_ap_id(ap_id)
         "@#{actor.nickname}"
       end)
+      |> Enum.join(" ")
 
-    case mentions do
+    "#{mentions} "
-      [] ->
-        ""
-
-      _ ->
-        Enum.join(mentions, " ") <> ""
-    end
   end
 
   defp mentions_for_replying_to(_), do: ""