inline unsafe date usage

Author: easafe

src/Client/Im/Chat.purs

@@ -36,6 +36,7 @@ import Effect.Class (liftEffect)
 import Effect.Now as EN
 import Effect.Uncurried (EffectFn1)
 import Effect.Uncurried as EU
+import Effect.Unsafe as EUN
 import Flame as F
 import Node.URL as NU
 import Shared.DateTime (DateTimeWrapper(..))
@@ -252,7 +253,8 @@ makeTurn user@{ id } contact@{ chatStarter, chatAge, history } =
 
       getDate = DN.unwrap <<< _.date
 
-      accountAge { joined: DateTimeWrapper dt } = DN.unwrap (DT.diff SDT.unsafeNow dt ∷ Days)
+      unsafeNow = EUN.unsafePerformEffect EN.nowDateTime
+      accountAge { joined: DateTimeWrapper dt } = DN.unwrap (DT.diff unsafeNow dt ∷ Days)
 
 applyMarkup ∷ Markup → ImModel → MoreMessages
 applyMarkup markup model@{ chatting } =

src/Client/Im/Main.purs

@@ -170,7 +170,7 @@ update st model =
             SpecialRequest NextSuggestion → CIS.nextSuggestion model
             SpecialRequest (BlockUser id) → CIS.blockUser webSocket id model
             DisplayMoreSuggestions suggestions → CIS.displayMoreSuggestions suggestions model
-            ToggleSuggestionsFromOnline -> CIS.toggleSuggestionsFromOnline model
+            ToggleSuggestionsFromOnline → CIS.toggleSuggestionsFromOnline model
             --user menu
             ToggleInitialScreen toggle → CIU.toggleInitialScreen toggle model
             Logout after → CIU.logout after model
@@ -209,16 +209,16 @@ toggleContextMenu ∷ ShowContextMenu → ImModel → NoMessages
 toggleContextMenu toggle model = F.noMessages model { toggleContextMenu = toggle }
 
 displayAvailability ∷ AvailabilityStatus → ImModel → NoMessages
-displayAvailability avl model@{ contacts, suggestions } = F.noMessages $ model
-      { contacts = map updateContact contacts
-      , suggestions = map updateUser suggestions
+displayAvailability avl model = F.noMessages $ model
+      { contacts = map updateContact model.contacts
+      , suggestions = map updateUser model.suggestions
       }
       where
-      availability = DH.fromArray $ map (\{ id, status } → Tuple id status) avl
-      updateContact contact@{ user: { id } } = case DH.lookup id availability of
+      availability = DH.fromArray $ map (\t → Tuple t.id t.status) avl
+      updateContact contact = case DH.lookup contact.user.id availability of
             Just status → contact { user { availability = status } }
             Nothing → contact
-      updateUser user@{ id } = case DH.lookup id availability of
+      updateUser user = case DH.lookup user.id availability of
             Just status → user { availability = status }
             Nothing → user
 

src/Client/Im/WebSocket/Events.purs

@@ -96,7 +96,6 @@ handleOpen webSocketStateRef _ = do
                   ET.clearTimeout id
                   FS.send imId <<< SpecialRequest <<< CheckMissedEvents <<< Just $ DateTimeWrapper state.lastPongDate
       newPrivilegesId ← ET.setInterval privilegeDelay (pollPrivileges state.webSocket)
-      pingAction true
       newPingId ← ET.setInterval pingDelay ping
       ER.modify_ (_ { pingId = Just newPingId, privilegesId = Just newPrivilegesId, reconnectId = Nothing }) webSocketStateRef
       FS.send imId $ ToggleConnected true
@@ -110,9 +109,7 @@ handleOpen webSocketStateRef _ = do
       pingDelay = 1000 * 30
       ping = do
             isFocused ← CCD.documentHasFocus
-            pingAction isFocused
-
-      pingAction = FS.send imId <<< SendPing
+            FS.send imId $ SendPing isFocused
 
 -- | Handle an incoming (json encoded) message from the server
 handleMessage ∷ Ref WebSocketState → Event → Effect Unit

src/Server/Im/Database.purs

@@ -17,8 +17,7 @@ import Data.Time.Duration (Days(..), Minutes(..))
 import Data.Tuple (Tuple(..))
 import Data.Tuple.Nested ((/\))
 import Droplet.Driver (Pool)
-import Effect.Class (liftEffect)
-import Effect.Console as EC
+import Debug
 import Server.Database as SD
 import Server.Database.Blocks (_blocked, _blocker, blocks)
 import Server.Database.Countries (countries)
@@ -84,14 +83,14 @@ presentUser loggedUserId = SD.single $ select userPresentationFields # from user
 suggest ∷ Int → Int → SuggestionsFrom → ServerEffect (Array FlatUser)
 suggest loggedUserId skip =
       case _ of
-            OnlineOnly -> SD.query $ suggestOnlineQuery loggedUserId skip onlineFilter
+            OnlineOnly → SD.query $ suggestOnlineQuery loggedUserId skip onlineFilter
             ThisWeek → SD.query $ suggestMainQuery loggedUserId skip thisWeekFilter
             LastTwoWeeks → SD.query $ suggestMainQuery loggedUserId skip lastTwoWeeksFilter
             LastMonth → SD.query $ suggestMainQuery loggedUserId skip lastMonthFilter
             All → SD.query $ suggestAllQuery loggedUserId skip baseFilter
 
       where
-      onlineFilter = baseFilter .&&. (l ... _date) .>=. (ST.unsafeAdjustFromNow $ Minutes (-1.0))
+      onlineFilter = baseFilter .&&. (l ... _date) .>=. (spy "min" (ST.unsafeAdjustFromNow $ Minutes (-1.0)))
       thisWeekFilter = baseFilter .&&. (l ... _date) .>=. (ST.unsafeAdjustFromNow $ Days (-7.0))
       lastTwoWeeksFilter = baseFilter .&&. (l ... _date) .>=. (ST.unsafeAdjustFromNow $ Days (-14.0))
       lastMonthFilter = baseFilter .&&. (l ... _date) .>=. (ST.unsafeAdjustFromNow $ Days (-30.0))
@@ -104,7 +103,7 @@ suggest loggedUserId skip =
 -- top level to avoid monomorphic filter
 suggestBaseQuery loggedUserId filter =
       select (userFields /\ _bin)
-            # from (leftJoin (leftJoin (join usersSource (suggestions # as s) # on (u ... _id .=. _suggested)) histories # on (_sender .=. u ... _id .&&. _recipient .=. (loggedUserId ∷ Int) .||. _sender .=. loggedUserId .&&. _recipient .=. u ... _id)) (last_seen # as l) # on (u ... _id .=. _who))
+            # from (join (leftJoin (join usersSource (suggestions # as s) # on (u ... _id .=. _suggested)) histories # on (_sender .=. u ... _id .&&. _recipient .=. (loggedUserId ∷ Int) .||. _sender .=. loggedUserId .&&. _recipient .=. u ... _id)) (last_seen # as l) # on (u ... _id .=. _who))
             # wher filter
 
 suggestMainQuery loggedUserId skip filter =

src/Server/Template.purs

@@ -43,10 +43,10 @@ externalDefaultParameters =
       , javascript: []
       , bundled: false
 
-      ,css:
+      , css:
               [ HE.link [ HA.rel "stylesheet", HA.type' "text/css", HA.href $ SP.bundlePath External Css ]
               ]
-      , content :
+      , content:
               [ HE.div (HA.class' "header")
                       [ HE.a [ HA.href $ routes.landing {}, HA.class' "logo" ] $
                               HE.img
@@ -56,7 +56,7 @@ externalDefaultParameters =
                                     ]
                       ]
               ]
-      , footer : [ externalFooter ]
+      , footer: [ externalFooter ]
       }
 
 template ∷ ∀ a. Parameters a → Effect (Html a)

src/Server/WebSocket/Events.purs

@@ -376,15 +376,15 @@ withConnections userAvailability handler =
 persistLastSeen ∷ WebSocketReaderLite → Effect Unit
 persistLastSeen context = do
       allUsersAvailability ← ER.read context.allUsersAvailabilityRef
-      now <- liftEffect EN.nowDateTime
+      now ← liftEffect EN.nowDateTime
       when (not $ DH.isEmpty allUsersAvailability) do
             let run = R.runBaseAff' <<< RE.catch (const (pure unit)) <<< RR.runReader context <<< SID.upsertLastSeen <<< SJS.writeJSON <<< DA.catMaybes $ DH.toArrayBy (lastSeens now) allUsersAvailability
             EA.launchAff_ $ EA.catchError run logError
       where
       lastSeens now id avl = case avl.availability of
-            Online → Just  { who: id, date: DT now }
+            Online → Just { who: id, date: DT now }
             LastSeen (DateTimeWrapper date) → Just { who: id, date: DT date }
-            _ -> Nothing
+            _ → Nothing
 
       logError = liftEffect <<< EC.logShow
 

src/Shared/DateTime.purs

@@ -130,9 +130,6 @@ unformatIsoDate value = do
             integered ← DI.fromString raw
             DE.toEnum integered
 
-unsafeNow ∷ DateTime
-unsafeNow = EU.unsafePerformEffect EN.nowDateTime
-
 --same day
 --    hh:mm
 --yesterday
@@ -167,6 +164,7 @@ agoWithTime dateTime =
 daysDiff ∷ DateTime → Int
 daysDiff dt = daysInYear now - daysInYear dateTime
       where
+      unsafeNow = EU.unsafePerformEffect EN.nowDateTime
       localTime = SU.fromJust <<< DT.adjust offset
       daysInYear dtp = DI.floor $ DN.unwrap (DT.diff dtp firstDay ∷ Days)
       firstDay = DateTime (DD.canonicalDate (DD.year $ DT.date now) (SU.toEnum 1) (SU.toEnum 1)) zeroTime
@@ -176,6 +174,8 @@ daysDiff dt = daysInYear now - daysInYear dateTime
 
 unsafeAdjustFromNow ∷ ∀ d. Duration d ⇒ d → DateTime
 unsafeAdjustFromNow duration = SU.fromJust $ DT.adjust duration unsafeNow
+      where
+      unsafeNow = EU.unsafePerformEffect EN.nowDateTime
 
 localDateTimeWith ∷ (Number → String) → DateTime → String
 localDateTimeWith formatter = formatter <<< DN.unwrap <<< DDI.unInstant <<< DDI.fromDateTime

src/Shared/Im/Types.purs

@@ -432,13 +432,13 @@ instance Bounded ReportReason where
 instance BoundedEnum SuggestionsFrom where
       cardinality = Cardinality 1
       fromEnum = case _ of
-            OnlineOnly -> 0
+            OnlineOnly → 0
             ThisWeek → 1
             LastTwoWeeks → 2
             LastMonth → 3
             All → 4
       toEnum = case _ of
-            0 -> Just OnlineOnly
+            0 → Just OnlineOnly
             1 → Just ThisWeek
             2 → Just LastTwoWeeks
             3 → Just LastMonth
@@ -481,13 +481,13 @@ instance BoundedEnum ReportReason where
 
 instance Enum SuggestionsFrom where
       succ = case _ of
-            OnlineOnly -> Just ThisWeek
+            OnlineOnly → Just ThisWeek
             ThisWeek → Just LastTwoWeeks
             LastTwoWeeks → Just LastMonth
             LastMonth → Just All
             All → Nothing
       pred = case _ of
-            OnlineOnly -> Nothing
+            OnlineOnly → Nothing
             ThisWeek → Just OnlineOnly
             LastTwoWeeks → Just ThisWeek
             LastMonth → Just LastTwoWeeks

src/Shared/User.purs

@@ -24,6 +24,8 @@ import Data.Time.Duration (Days(..))
 import Data.Time.Duration as DTD
 import Droplet.Language (class FromValue, class ToValue)
 import Droplet.Language as DL
+import Effect.Now as EN
+import Effect.Unsafe as EU
 import Foreign as F
 import Payload.Client.EncodeBody (class EncodeBody)
 import Payload.ContentType (class HasContentType, json)
@@ -280,4 +282,6 @@ temporaryAccountDuration ∷ Days
 temporaryAccountDuration = Days 3.5
 
 temporaryUserExpiration ∷ DateTimeWrapper → Days
-temporaryUserExpiration (DateTimeWrapper dt) = DDT.diff dt (SU.fromJust $ DDT.adjust (DTD.negateDuration temporaryAccountDuration) SDT.unsafeNow)
+temporaryUserExpiration (DateTimeWrapper dt) = DDT.diff dt (SU.fromJust $ DDT.adjust (DTD.negateDuration temporaryAccountDuration) unsafeNow)
+      where
+      unsafeNow = EU.unsafePerformEffect EN.nowDateTime