diff --git a/config/models b/config/models index 65d8f4a..cfd49b8 100644 --- a/config/models +++ b/config/models @@ -3,6 +3,7 @@ User password Text maxlen=79 fullName Text maxlen=500 email Text maxlen=190 + avatar Text maxlen=190 note Text sqltype=mediumtext UniqueUser username UniqueEmail email diff --git a/package.yaml b/package.yaml index c3fe816..ed8552f 100644 --- a/package.yaml +++ b/package.yaml @@ -51,7 +51,6 @@ dependencies: - conduit-combinators >= 1.1 && <1.2 - friendly-time >=0.4 && <0.5 - foreign-store >=0.2 && <0.3 -- libravatar >=0.4 && <0.5 - slug >=0.1 && <0.2 - split >=0.2 && <0.3 - yesod-auth-hashdb >=1.6.2 && <1.7 diff --git a/src/Widget/Card.hs b/src/Widget/Card.hs index 8c304ce..ed1ca88 100644 --- a/src/Widget/Card.hs +++ b/src/Widget/Card.hs @@ -7,11 +7,6 @@ import Import import Data.Maybe (fromJust) import qualified Data.Map as M import qualified Data.Text as T -import qualified Network.Libravatar as L - -libravatar :: (MonadIO m) => User -> m (Maybe Text) -libravatar = liftIO . flip L.avatarUrl opts . L.Email . userEmail - where opts = def { L.optSecure = True, L.optSize = L.Size 512, L.optTryGravatar = False } entityToTuple :: Entity t -> (Key t, t) entityToTuple (Entity key value) = (key, value) @@ -30,7 +25,6 @@ routeFromPgp PgpKey { pgpKeyFingerprint = f } = staticR ["pgp", T.takeEnd 8 f ++ hCard :: Entity User -> Widget hCard (Entity userId user) = do - maybeAvatar <- libravatar user mcurrentRoute <- getCurrentRoute userProfiles <- handlerToWidget . runDB $ do profiles <- map entityVal <$> selectList [ProfileUserId ==. userId] [] diff --git a/stack.yaml b/stack.yaml index a341af6..226e2e8 100644 --- a/stack.yaml +++ b/stack.yaml @@ -39,8 +39,7 @@ packages: - . # Dependency packages to be pulled from upstream that are not in the resolver # (e.g., acme-missiles-0.3) -extra-deps: -- libravatar-0.4.0.1 +extra-deps: [] # Override default flag values for local packages and extra-deps flags: {} diff --git a/static/img/dewdrop wink.png b/static/img/dewdrop wink.png new file mode 100644 index 0000000..6bee670 Binary files /dev/null and b/static/img/dewdrop wink.png differ diff --git a/templates/mf2/h-card.hamlet b/templates/mf2/h-card.hamlet index 9ae588c..78a1948 100644 --- a/templates/mf2/h-card.hamlet +++ b/templates/mf2/h-card.hamlet @@ -2,8 +2,7 @@ $maybe route <- mcurrentRoute