Block GooglePlus

commercialhaskell · Jan 3, 2019 · 6ac34e7 · 6ac34e7
1 parent 5b84bd5
commit 6ac34e7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
@@ -36,7 +36,8 @@ screenNameFormlet uid = renderTable $ ScreenName
     <*> areq (selectFieldList servopts) "Service" Nothing
     <*> areq textField "Screen name" Nothing
   where
-    servopts = map (T.pack . show &&& id) [minBound..maxBound]
+    servopts = map (T.pack . show &&& id)
+             $ filter (/= GooglePlus) [minBound..maxBound]
 
 userForm :: Int -> User -> Form User
 userForm maxY u = renderTable $ User
@@ -102,7 +103,8 @@ getProfileR = do
         )
     packages <- runDB $ selectList [PackageUser ==. uid] [Asc PackageName]
     idents <- runDB $ selectList [IdentUser ==. uid] [Asc IdentIdent]
-    screenNames <- runDB $ selectList [ScreenNameUser ==. uid]
+    screenNames <- runDB $ selectList
+      [ScreenNameUser ==. uid, ScreenNameService !=. GooglePlus]
                     [Asc ScreenNameService, Asc ScreenNameName]
     ((_, screenNameForm), _) <- runFormGet $ screenNameFormlet uid
     defaultLayout $ do

diff --git a/src/Handler/User.hs b/src/Handler/User.hs
@@ -75,7 +75,8 @@ getUserR input = do
     packages <- runDB
               $ fmap (map $ T.unpack . packageName . entityVal)
               $ selectList [PackageUser ==. uid] [Asc PackageName]
-    screenNames <- runDB $ selectList [ScreenNameUser ==. uid]
+    screenNames <- runDB $ selectList
+                    [ScreenNameUser ==. uid, ScreenNameService !=. GooglePlus]
                     [Asc ScreenNameService, Asc ScreenNameName]
     let email = fromMaybe "fake@email.com" $ userEmail u
     y <- getYesod