From fe8ec1b6f9a918c3b24b562c5dae752bcfc134ad Mon Sep 17 00:00:00 2001
From: Pleroma <pleroma@hjkos.com>
Date: Mon, 1 Jan 2018 16:36:40 +0000
Subject: [PATCH] shigusegubu customs

---
 config/config.exs                             | 8 ++++----
 config/emoji.txt                              | 9 ++++++++-
 installation/pleroma.service                  | 2 ++
 lib/pleroma/web/endpoint.ex                   | 2 +-
 lib/pleroma/web/ostatus/ostatus_controller.ex | 2 +-
 lib/pleroma/web/router.ex                     | 2 +-
 6 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/config/config.exs b/config/config.exs
index cf6cbaa9d..fa616bcce 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -47,9 +47,9 @@ version =
 config :pleroma, :http, proxy_url: nil
 
 config :pleroma, :instance,
-  version: version,
-  name: "Pleroma",
-  email: "example@example.com",
+  version: "2.1",
+  name: "Shigusegubu",
+  email: "pleroma@hjkos.com",
   limit: 5000,
   upload_limit: 16_000_000,
   registrations_open: true,
@@ -82,7 +82,7 @@ config :pleroma, :media_proxy,
 
 # base_url: "https://cache.pleroma.social"
 
-config :pleroma, :chat, enabled: true
+config :pleroma, :chat, enabled: false
 
 config :ecto, json_library: Jason
 
diff --git a/config/emoji.txt b/config/emoji.txt
index 7afacb09f..3ea245a5b 100644
--- a/config/emoji.txt
+++ b/config/emoji.txt
@@ -28,4 +28,11 @@ f_33b00b, /emoji/f_33b00b.png
 f_33b22b, /emoji/f_33b22b.png
 f_33h, /emoji/f_33h.png
 f_33t, /emoji/f_33t.png
-
+shinitai-shi, /emoji/shinitai-shi.png
+shinitai-ni, /emoji/shinitai-ni.png
+shinitai-ta, /emoji/shinitai-ta.png
+shinitai-i, /emoji/shinitai-i.png
+shinitai_shi, /emoji/shinitai_shi.png
+shinitai_ni, /emoji/shinitai_ni.png
+shinitai_ta, /emoji/shinitai_ta.png
+shinitai_i, /emoji/shinitai_i.png
diff --git a/installation/pleroma.service b/installation/pleroma.service
index fd4180985..08c8eab32 100644
--- a/installation/pleroma.service
+++ b/installation/pleroma.service
@@ -6,10 +6,12 @@ After=network.target postgresql.service
 User=pleroma
 WorkingDirectory=/home/pleroma/pleroma
 Environment="HOME=/home/pleroma"
+Environment="MIX_ENV=prod"
 ExecStart=/usr/local/bin/mix phx.server
 ExecReload=/bin/kill $MAINPID
 KillMode=process
 Restart=on-failure
+StandardOutput=journal
 
 [Install]
 WantedBy=multi-user.target
diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex
index 1a012c1b4..f0748542b 100644
--- a/lib/pleroma/web/endpoint.ex
+++ b/lib/pleroma/web/endpoint.ex
@@ -16,7 +16,7 @@ defmodule Pleroma.Web.Endpoint do
   plug(
     Plug.Static,
     at: "/",
-    from: :pleroma,
+    from: "priv_sid/static",
     only: ~w(index.html static finmoji emoji packs sounds images instance sw.js favicon.png)
   )
 
diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index 2f72fdb16..ce18c320a 100644
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -134,7 +134,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
         "html" ->
           conn
           |> put_resp_content_type("text/html")
-          |> send_file(200, "priv/static/index.html")
+          |> send_file(200, "priv_sid/static/index.html")
 
         _ ->
           represent_activity(conn, activity, user)
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 34652cdde..a0e958e93 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -366,7 +366,7 @@ defmodule Fallback.RedirectController do
     if Mix.env() != :test do
       conn
       |> put_resp_content_type("text/html")
-      |> send_file(200, "priv/static/index.html")
+      |> send_file(200, "priv_sid/static/index.html")
     end
   end
 end