From 259daab0957fec46385bd8873388b8942cff30ad Mon Sep 17 00:00:00 2001
From: muppeth <muppeth@disroot.org>
Date: Sun, 17 Dec 2023 02:43:21 +0100
Subject: [PATCH] akkoma - fixed logos and icons issue

---
 tasks/frontends.yml     | 20 ++++----------------
 templates/config.exs.j2 | 13 +++++--------
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/tasks/frontends.yml b/tasks/frontends.yml
index 4e426a7..e96217a 100644
--- a/tasks/frontends.yml
+++ b/tasks/frontends.yml
@@ -37,22 +37,10 @@
   become: yes
   become_user: '{{ pleroma_user }}'
   
-- name: '[Frontend] - Create extra static dir'
-  file:
-    path: '{{ pleroma_data_dir }}/static/static'
-    state: directory
-    owner: '{{ pleroma_user }}'
-    group: '{{ pleroma_group }}'
-    mode: 0775
-  tags:
-    - upgrade
-  become: yes
-  become_user: '{{ pleroma_user }}'
-
 - name: '[Frontend] - Add instance logo svg'
   copy:
     src: '{{ pleroma_extra_files_path }}/logo.svg'
-    dest: '{{ pleroma_data_dir }}/static/static/logo.svg'
+    dest: '{{ pleroma_data_dir }}/static/instance/logo.svg'
     owner: '{{ pleroma_user }}'
     group: '{{ pleroma_group }}'
     mode: 0775
@@ -64,7 +52,7 @@
 - name: '[Frontend] - Add instance logo png'
   copy:
     src: '{{ pleroma_extra_files_path }}/logo.png'
-    dest: '{{ pleroma_data_dir }}/static/static/logo.png'
+    dest: '{{ pleroma_data_dir }}/static/instance/logo.png'
     owner: '{{ pleroma_user }}'
     group: '{{ pleroma_group }}'
     mode: 0775
@@ -76,7 +64,7 @@
 - name: '[Frontend] - Add PWA logo'
   copy:
     src: '{{ pleroma_extra_files_path }}/logo-512.png'
-    dest: '{{ pleroma_data_dir }}/static/static/logo-512.png'
+    dest: '{{ pleroma_app_dir }}/static/logo-512.png'
     owner: '{{ pleroma_user }}'
     group: '{{ pleroma_group }}'
     mode: 0775
@@ -121,4 +109,4 @@
   tags:
     - upgrade
   become: 'yes'
-  become_user: "{{ pleroma_user }}"
\ No newline at end of file
+  become_user: "{{ pleroma_user }}"
diff --git a/templates/config.exs.j2 b/templates/config.exs.j2
index eae6eed..2a5e64b 100644
--- a/templates/config.exs.j2
+++ b/templates/config.exs.j2
@@ -180,16 +180,13 @@ config :pleroma, :frontend_configurations,
       "😮",
       "😢",
       "😩",
-      "👍",
-      "❤️",
-      "😆",
-      "😮",
-      "😢",
-      "😩"
+      "🤔",
+      "🎉",
+      "💩"
       ],
   accentColor: "{{ mangane_accentColor }}",
   colors: %{},
-  logo: "/static/logo.svg",
+  logo: "/instance/logo.svg",
 {% set current_year = now().year %} # Allows to set the current year in copyright!
   copyright: "🕶 {{ current_year|string }}. {{ mangane_copyright }}",  
   logoDarkMode: nil,
@@ -199,4 +196,4 @@ config :pleroma, :frontend_configurations,
   gdpr: false
   }
 {% endif %}
-{% endfor %}
\ No newline at end of file
+{% endfor %}