...

Author: fisx

libs/wire-api/src/Wire/API/Team/Feature.hs

@@ -35,6 +35,7 @@ module Wire.API.Team.Feature
     setStatus,
     setLockStatus,
     setConfig,
+    setWsTTL,
     WithStatusPatch,
     wspStatus,
     wspLockStatus,
@@ -214,6 +215,9 @@ setLockStatus ls (WithStatusBase s _ c ttl) = WithStatusBase s (Identity ls) c t
 setConfig :: cfg -> WithStatus cfg -> WithStatus cfg
 setConfig c (WithStatusBase s ls _ ttl) = WithStatusBase s ls (Identity c) ttl
 
+setWsTTL :: FeatureTTL -> WithStatus cfg -> WithStatus cfg
+setWsTTL ttl (WithStatusBase s ls c _) = WithStatusBase s ls c (Identity ttl)
+
 type WithStatus (cfg :: *) = WithStatusBase Identity cfg
 
 deriving instance (Eq cfg) => Eq (WithStatus cfg)

services/galley/src/Galley/Cassandra/TeamFeatures.hs

@@ -72,16 +72,17 @@ getTrivialConfigC ::
   m (Maybe (WithStatusNoLock cfg))
 getTrivialConfigC statusCol tid = do
   let q = query1 select (params LocalQuorum (Identity tid))
-  mFeatureStatus <- (>>= runIdentity) <$> retry x1 q
-  pure $ case mFeatureStatus of
-    Nothing -> Nothing
-    Just status -> Just . forgetLock $ setStatus status defFeatureStatus
+  row <- retry x1 q
+  pure $ row <&> \(status, ttl) -> forgetLock . setStatus status . setWsTTL ttl $ defFeatureStatus
   where
-    select :: PrepQuery R (Identity TeamId) (Identity (Maybe FeatureStatus))
+    select :: PrepQuery R (Identity TeamId) (FeatureStatus, FeatureTTL)
     select =
       fromString $
         "select "
           <> statusCol
+          <> ", ttl("
+          <> statusCol
+          <> ")"
           <> " from team_features where team_id = ?"
 
 setFeatureStatusC ::