Merge pull request #45 from epochtalk/view-to-json

View to JSON

Author: unenglishable

config/config.exs

@@ -63,9 +63,7 @@ config :epochtalk_server, :redix,
 config :epochtalk_server, EpochtalkServerWeb.Endpoint,
   url: [host: "localhost"],
   render_errors: [
-    view: EpochtalkServerWeb.ErrorView,
-    format: "json",
-    accepts: ~w(json),
+    formats: [json: EpochtalkServerWeb.ErrorJSON],
     layout: false
   ],
   pubsub_server: EpochtalkServer.PubSub,

config/prod.exs

@@ -15,6 +15,8 @@ config :epochtalk_server, EpochtalkServerWeb.Endpoint,
 # Do not print debug messages in production
 config :logger, level: :info
 
+config :swoosh, api_client: Swoosh.ApiClient.Finch, finch_name: EpochtalkServer.Finch
+
 # ## SSL Support
 #
 # To get SSL working, you will need to add the `https` key

config/runtime.exs

@@ -28,7 +28,7 @@ if config_env() == :prod do
       For example: ecto://USER:PASS@HOST/DATABASE
       """
 
-  maybe_ipv6 = if System.get_env("ECTO_IPV6"), do: [:inet6], else: []
+  maybe_ipv6 = if System.get_env("ECTO_IPV6") in ~w(true 1), do: [:inet6], else: []
 
   config :epochtalk_server, EpochtalkServer.Repo,
     # ssl: true,

config/test.exs

@@ -24,7 +24,7 @@ config :epochtalk_server, EpochtalkServerWeb.Endpoint,
 config :epochtalk_server, EpochtalkServer.Mailer, adapter: Swoosh.Adapters.Test
 
 # Print only warnings and errors during test
-config :logger, level: :warn
+config :logger, level: :warning
 
 # Initialize plugs at runtime for faster test compilation
 config :phoenix, :plug_init_mode, :runtime

lib/epochtalk_server/application.ex

@@ -28,6 +28,8 @@ defmodule EpochtalkServer.Application do
       EpochtalkServerWeb.Telemetry,
       # Start the PubSub system
       {Phoenix.PubSub, name: EpochtalkServer.PubSub},
+      # Start Finch
+      {Finch, name: EpochtalkServer.Finch},
       # Start Presence for Phoenix channel tracking
       EpochtalkServerWeb.Presence,
       # Start the Endpoint (http/https)

lib/epochtalk_server_web.ex

@@ -17,27 +17,26 @@ defmodule EpochtalkServerWeb do
   and import those modules here.
   """
 
+  def static_paths, do: ~w(assets fonts images favicon.ico robots.txt)
+
   def controller do
     quote do
-      use Phoenix.Controller, namespace: EpochtalkServerWeb
+      use Phoenix.Controller,
+        formats: [:html, :json, :js],
+        layouts: [html: EpochtalkServerWeb.Layouts]
 
       import Plug.Conn
-      alias EpochtalkServerWeb.Router.Helpers, as: Routes
+
+      unquote(verified_routes())
     end
   end
 
-  def view do
+  def js do
     quote do
-      use Phoenix.View,
-        root: "lib/epochtalk_server_web/templates",
-        namespace: EpochtalkServerWeb
-
-      # Import convenience functions from controllers
-      import Phoenix.Controller,
-        only: [get_flash: 1, get_flash: 2, view_module: 1, view_template: 1]
+      import EpochtalkServerWeb, only: [embed_templates: 2]
 
-      # Include shared imports and aliases for views
-      unquote(view_helpers())
+      # Routes generation with the ~p sigil
+      unquote(verified_routes())
     end
   end
 
@@ -56,13 +55,12 @@ defmodule EpochtalkServerWeb do
     end
   end
 
-  defp view_helpers do
+  def verified_routes do
     quote do
-      # Import basic rendering functionality (render, render_layout, etc)
-      import Phoenix.View
-
-      import EpochtalkServerWeb.ErrorHelpers
-      alias EpochtalkServerWeb.Router.Helpers, as: Routes
+      use Phoenix.VerifiedRoutes,
+        endpoint: EpochtalkServerWeb.Endpoint,
+        router: EpochtalkServerWeb.Router,
+        statics: EpochtalkServerWeb.static_paths()
     end
   end
 
@@ -72,4 +70,16 @@ defmodule EpochtalkServerWeb do
   defmacro __using__(which) when is_atom(which) do
     apply(__MODULE__, which, [])
   end
+
+  defmacro embed_templates(pattern, opts) do
+    quote do
+      require Phoenix.Template
+
+      Phoenix.Template.compile_all(
+        &(&1 |> Path.basename() |> Path.rootname() |> Path.rootname()),
+        Path.expand(unquote(opts)[:root] || __DIR__, __DIR__),
+        unquote(pattern) <> unquote(opts)[:ext]
+      )
+    end
+  end
 end

lib/epochtalk_server_web/controllers/board_controller.ex

@@ -21,7 +21,7 @@ defmodule EpochtalkServerWeb.BoardController do
          board_mapping <- BoardMapping.all(stripped: stripped),
          board_moderators <- BoardModerator.all(),
          categories <- Category.all() do
-      render(conn, "by_category.json", %{
+      render(conn, :by_category, %{
         categories: categories,
         board_moderators: board_moderators,
         board_mapping: board_mapping,
@@ -42,7 +42,7 @@ defmodule EpochtalkServerWeb.BoardController do
          board_moderators <- BoardModerator.all(),
          {:board, [_board]} <-
            {:board, Enum.filter(board_mapping, fn bm -> bm.board_id == id end)} do
-      render(conn, "find.json", %{
+      render(conn, :find, %{
         board_moderators: board_moderators,
         board_mapping: board_mapping,
         board_id: id,
@@ -60,7 +60,7 @@ defmodule EpochtalkServerWeb.BoardController do
   def slug_to_id(conn, attrs) do
     with slug <- Validate.cast(attrs, "slug", :string, required: true),
          {:ok, id} <- Board.slug_to_id(slug) do
-      render(conn, "slug_to_id.json", data: %{id: id})
+      render(conn, :slug_to_id, id: id)
     else
       {:error, :board_does_not_exist} ->
         ErrorHelpers.render_json_error(conn, 400, "Error, cannot board does not exist")

lib/epochtalk_server_web/controllers/configuration_controller.ex

@@ -10,7 +10,8 @@ defmodule EpochtalkServerWeb.ConfigurationController do
   """
   def config(conn, _attrs) do
     conn
-    |> put_resp_header("content-type", "text/javascript")
-    |> render("config.js", config: Application.get_env(:epochtalk_server, :frontend_config))
+    |> Phoenix.Controller.put_format(:js)
+    |> put_resp_content_type("content-type", "text/javascript")
+    |> render(:config, config: Application.get_env(:epochtalk_server, :frontend_config))
   end
 end

lib/epochtalk_server_web/controllers/mention_controller.ex

@@ -22,7 +22,7 @@ defmodule EpochtalkServerWeb.MentionController do
          {:ok, mentions, data} <-
            Mention.page_by_user_id(user.id, page, per_page: limit, extended: extended),
          do:
-           render(conn, "page.json", %{
+           render(conn, :page, %{
              mentions: mentions,
              pagination_data: data,
              extended: extended

lib/epochtalk_server_web/controllers/moderation_log_controller.ex

@@ -17,7 +17,7 @@ defmodule EpochtalkServerWeb.ModerationLogController do
          page <- Validate.cast(attrs, "page", :integer, min: 1),
          limit <- Validate.cast(attrs, "limit", :integer, min: 1),
          {:ok, moderation_logs, data} <- ModerationLog.page(attrs, page, per_page: limit) do
-      render(conn, "page.json", moderation_logs: moderation_logs, pagination_data: data)
+      render(conn, :page, %{moderation_logs: moderation_logs, pagination_data: data})
     else
       {:auth, false} ->
         ErrorHelpers.render_json_error(conn, 400, "Not logged in, cannot page moderation log")