From 7538369fa11d0715fe6709d42e9bc4656ab24326 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Sun, 20 Nov 2022 22:18:34 +0000
Subject: [PATCH] Copy conversation display style from instance

Fixes #210
---
 build/webpack.base.conf.js | 5 -----
 build/webpack.prod.conf.js | 5 +++++
 src/boot/after_store.js    | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
index e478d341..ad508867 100644
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -119,11 +119,6 @@ module.exports = {
     ]
   },
   plugins: [
-    new WorkboxPlugin.InjectManifest({
-      swSrc: path.join(__dirname, '..', 'src/sw.js'),
-      swDest: 'sw-pleroma.js',
-      maximumFileSizeToCacheInBytes: 15 * 1024 * 1024,
-    }),
     new VueLoaderPlugin()
   ]
 }
diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js
index 7c94ec3c..edc95857 100644
--- a/build/webpack.prod.conf.js
+++ b/build/webpack.prod.conf.js
@@ -32,6 +32,11 @@ var webpackConfig = merge(baseWebpackConfig, {
     chunkFilename: utils.assetsPath('js/[name].[chunkhash].js')
   },
   plugins: [
+    new WorkboxPlugin.InjectManifest({
+      swSrc: path.join(__dirname, '..', 'src/sw.js'),
+      swDest: 'sw-pleroma.js',
+      maximumFileSizeToCacheInBytes: 15 * 1024 * 1024,
+    }),
     // http://vuejs.github.io/vue-loader/workflow/production.html
     new webpack.DefinePlugin({
       'process.env': env,
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index e63b313b..4bafca1d 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -150,6 +150,7 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
   copyInstanceOption('showPanelNavShortcuts')
   copyInstanceOption('stopGifs')
   copyInstanceOption('logo')
+  copyInstanceOption('conversationDisplay')
 
   store.dispatch('setInstanceOption', {
     name: 'logoMask',