about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-12-19 20:23:16 +0100
committerThibG <thib@sitedethib.com>2018-12-20 18:39:05 +0100
commit6073195a7d65261bc4092b771a37b53ee1cb09b3 (patch)
treefc1547ebf5ecad6ac6332feba37fbaa3e1781424
parentfb63941c471d2c1af3fb615c7ae11e39b4c2504d (diff)
[Glitch] Display customized mascot in web UI
Port relevant parts of 9d4541c612b506889675c4c19ced5cd17ad3710f to glitch-soc
-rw-r--r--app/javascript/flavours/glitch/features/drawer/index.js4
-rw-r--r--app/javascript/flavours/glitch/util/initial_state.js1
2 files changed, 3 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/features/drawer/index.js b/app/javascript/flavours/glitch/features/drawer/index.js
index ffb18c5a0..c8121b8e5 100644
--- a/app/javascript/flavours/glitch/features/drawer/index.js
+++ b/app/javascript/flavours/glitch/features/drawer/index.js
@@ -23,7 +23,7 @@ import DrawerResults from './results';
 import DrawerSearch from './search';
 
 //  Utils.
-import { me } from 'flavours/glitch/util/initial_state';
+import { me, mascot } from 'flavours/glitch/util/initial_state';
 import { wrap } from 'flavours/glitch/util/redux_helpers';
 
 //  Messages.
@@ -127,7 +127,7 @@ class Drawer extends React.Component {
             <Composer />
             {multiColumn && (
               <div className='drawer__inner__mastodon'>
-                <button className='mastodon' onClick={onClickElefriend} />
+                {mascot ? <img alt='' draggable='false' src={mascot} /> : <button className='mastodon' onClick={onClickElefriend} />}
               </div>
             )}
           </div>}
diff --git a/app/javascript/flavours/glitch/util/initial_state.js b/app/javascript/flavours/glitch/util/initial_state.js
index d12c05c0d..a3c65563c 100644
--- a/app/javascript/flavours/glitch/util/initial_state.js
+++ b/app/javascript/flavours/glitch/util/initial_state.js
@@ -24,6 +24,7 @@ export const searchEnabled = getMeta('search_enabled');
 export const maxChars = (initialState && initialState.max_toot_chars) || 500;
 export const invitesEnabled = getMeta('invites_enabled');
 export const version = getMeta('version');
+export const mascot = getMeta('mascot');
 export const isStaff = getMeta('is_staff');
 
 export default initialState;