Support non-fa site icons by giving sites an actual name separate from their icon class

config/models

@@ -15,6 +15,7 @@ PgpKey
     UniqueFingerprint fingerprint
 
 Site
+    name Text sqltype=varchar(255)
     icon Text sqltype=varchar(255)
     template Text sqltype=varchar(255)
 

src/Widget/Card.hs

@@ -16,7 +16,7 @@ arrangeProfiles :: [Profile] -> M.Map (Key Site) (Site, Template) -> [((Site, Te
 arrangeProfiles profiles sites = sortBy icon $ zip profileSites profiles
     where findSite = fromJust . flip M.lookup sites . profileSiteId
           profileSites = findSite <$> profiles
-          icon = comparing $ siteIcon . fst . fst
+          icon = comparing $ siteName . fst . fst
 
 prettyPgp :: PgpKey -> Text
 prettyPgp = T.unwords . T.chunksOf 4 . pgpKeyFingerprint

src/Widget/Entry.hs

@@ -31,7 +31,7 @@ hEntry (Entity entryId entry) = do
         E.on $ profile ^. ProfileSiteId E.==. site ^. SiteId
         E.on $ syndication ^. SyndicationProfileId E.==. profile ^. ProfileId
         E.where_ $ syndication ^. SyndicationEntryId E.==. E.val entryId
-        E.orderBy [E.asc $ site ^. SiteIcon]
+        E.orderBy [E.asc $ site ^. SiteName]
         return (syndication ^. SyndicationUrl, site ^. SiteIcon, E.coalesceDefault [profile ^. ProfileDisplayName] (profile ^. ProfileUsername))
     maybeAuthor <- handlerToWidget . runDB . get . entryAuthorId $ entry
     $(widgetFile "mf2/h-entry")

templates/mf2/h-card.hamlet

@@ -21,7 +21,7 @@
       $forall ((site, template), profile) <- userProfiles
         <li>
           <a .u-url itemprop="sameAs" rel="me" href="#{substitute template profile}">
-            <i .fa.fa-#{siteIcon site}>
+            <i .#{siteIcon site}>
             $maybe name <- profileDisplayName profile
               #{name}
             $nothing

templates/mf2/h-entry.hamlet

@@ -19,5 +19,5 @@
       #{timeFriendly updated}
     $forall (E.Value url, E.Value icon, E.Value name) <- posses
       <a .u-syndication href=#{url}>
-        <i .fa.fa-#{icon}>
+        <i .#{icon}>
         #{name}