Fix: do not confuse avatars path with static path.

liqd · Oct 21, 2016 · 4b8a839 · 4b8a839
1 parent a1b4e99
commit 4b8a839
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/Config.hs b/src/Config.hs
@@ -153,7 +153,11 @@ data Config = Config
     , _listener             :: ListenerConfig
     , _monitoring           :: Maybe ListenerConfig
     , _htmlStatic           :: FilePath
-    , _avatarPath           :: FilePath  -- avatars are stored in this directory
+    , _avatarPath           :: FilePath  -- avatars are stored in this directory:
+                                         -- FIXME: i think this is not working.  run `git grep
+                                         -- \"/avatars\"`, and you will find a few places where
+                                         -- Config should be consulted, but a string literal is used
+                                         -- instead!
     , _cfgCsrfSecret        :: CsrfSecret
     , _logging              :: LogConfig
     , _persist              :: PersistConfig

diff --git a/src/Frontend/Page/Delegation.hs b/src/Frontend/Page/Delegation.hs
@@ -97,13 +97,12 @@ instance FormPage PageDelegateVote where
             DF.inputHidden "selected-delegate" v
             div_ [class_ "delegate-image-select"] $ do
                 ul_ . for_ options' $ \user -> do
-                    let url = "avatars/" <> uid <> ".png"
-                        uid = user ^. _Id . unAUID . showed
+                    let uid = user ^. _Id . unAUID . showed
                         unm = user ^. userLogin . unUserLogin
                     li_ [ class_ "icon-list-button col-3-12"
                           , id_ $ "page-delegate-vote-uid." <> cs uid
                           ] $ do
-                        img_ [ src_ . U.TopStatic $ fromString url
+                        img_ [ src_ . U.TopAvatar . fromString $ uid <> ".png"
                              , alt_ $ user ^. userLogin . unUserLogin
                              ]
                         span_ $ toHtml unm

diff --git a/src/Frontend/Path.hs b/src/Frontend/Path.hs
@@ -177,6 +177,7 @@ data Top (r :: AllowedMethod) =
   | TopTesting UriPath
   | TopSamples
   | TopStatic UriPath
+  | TopAvatar UriPath
   deriving Generic
 
 instance SOP.Generic (Top r)
@@ -189,6 +190,7 @@ top (TopMain p)    = relPath p
 top (TopTesting p) = nil </> "testing" <> p
 top TopSamples     = nil </> "samples"
 top (TopStatic p)  = nil </> "static" <> p
+top (TopAvatar p)  = nil </> "avatars" <> p
 
 
 -- ** Main