git.iko.soy/skrepka
on master help sign in
Tighten is172Private validation; skip safeCompare for expired sessions; enhance delivery animation
bcbb696iko
client/ViewChat.fs+47−15
compare with master
unifiedsplit
@@ -55,8 +55,36 @@ module ViewChat =
55 | None -> ()
55 | None -> ()
56 , Avalonia.Threading.DispatcherPriority.Background) |> ignore
56 , Avalonia.Threading.DispatcherPriority.Background) |> ignore
57
57
58− let private strokeTransition =
58+ let private ensureSolidifyStyle =
59+ lazy
60+ (let s =
61+ Avalonia.Styling.Style(fun sel ->
62+ sel.OfType<Avalonia.Controls.Shapes.Rectangle>().Class("solidifying"))
63+
64+ let anim = Avalonia.Animation.Animation()
59− DoubleTransition(Avalonia.Controls.Shapes.Shape.StrokeThicknessProperty, System.TimeSpan.FromMilliseconds 800.)
65+ anim.Duration <- System.TimeSpan.FromMilliseconds 600.
66+ anim.IterationCount <- Avalonia.Animation.IterationCount(1UL)
67+ anim.FillMode <- Avalonia.Animation.FillMode.Forward
68+
69+ for i in 0..10 do
70+ let t = float i / 10.
71+ let dash = 4. + 2. * t
72+ let gap = 2. - 2. * t
73+ let kf = Avalonia.Animation.KeyFrame()
74+ kf.Cue <- Avalonia.Animation.Cue(float32 t)
75+
76+ kf.Setters.Add(
77+ Avalonia.Styling.Setter(
78+ Avalonia.Controls.Shapes.Shape.StrokeDashArrayProperty,
79+ box (Avalonia.Collections.AvaloniaList<float>([| dash; gap |]))))
80+
81+ kf.Setters.Add(
82+ Avalonia.Styling.Setter(Avalonia.Controls.Shapes.Shape.StrokeDashOffsetProperty, box 0.))
83+
84+ anim.Children.Add(kf)
85+
86+ s.Animations.Add(anim)
87+ Avalonia.Application.Current.Styles.Add(s))
60
88
61 let private messageItem m =
89 let private messageItem m =
62 let align, cols, col =
90 let align, cols, col =
@@ -76,21 +104,25 @@ module ViewChat =
76
104
77 match m.Direction with
105 match m.Direction with
78 | Outgoing status ->
106 | Outgoing status ->
79− ensureMarchingAntsStyle.Force()
80 let isSent = status = DeliveryStatus.Sent
107 let isSent = status = DeliveryStatus.Sent
81
108
82− Rectangle()
109+ if isSent then
110+ ensureMarchingAntsStyle.Force()
111+
112+ Rectangle()
83− .stroke(Avalonia.Media.Colors.Black)
113+ .stroke(Avalonia.Media.Colors.Black)
84− .strokeThickness(4.)
114+ .strokeThickness(4.)
85− .strokeDashArray([ 4.; 2. ])
115+ .strokeDashArray([ 4.; 2. ])
86− .isHitTestVisible(false)
116+ .isHitTestVisible(false)
87− .classes("marching")
117+ .classes("marching")
88−
118+ else
89− Rectangle()
119+ ensureSolidifyStyle.Force()
90− .stroke(Avalonia.Media.Colors.Black)
120+
91− .strokeThickness(if isSent then 0. else 4.)
121+ Rectangle()
122+ .stroke(Avalonia.Media.Colors.Black)
123+ .strokeThickness(4.)
92− .isHitTestVisible(false)
124+ .isHitTestVisible(false)
93− .transition (strokeTransition)
125+ .classes("solidifying")
94 | Incoming ->
126 | Incoming ->
95 Rectangle()
127 Rectangle()
96 .stroke(Avalonia.Media.Colors.Black)
128 .stroke(Avalonia.Media.Colors.Black)
server.knot+2−1
@@ -340,6 +340,7 @@ is172Private = \sn ->
340 && let d1 = take 1 (drop 4 sn) in
340 && let d1 = take 1 (drop 4 sn) in
341 let d2 = take 1 (drop 5 sn) in
341 let d2 = take 1 (drop 5 sn) in
342 take 1 (drop 6 sn) == "."
342 take 1 (drop 6 sn) == "."
343+ && isDigitChar (take 1 (drop 7 sn))
343 && ((d1 == "1" && contains d2 "6789")
344 && ((d1 == "1" && contains d2 "6789")
344 || (d1 == "2" && isDigitChar d2)
345 || (d1 == "2" && isDigitChar d2)
345 || (d1 == "3" && contains d2 "01"))
346 || (d1 == "3" && contains d2 "01"))
@@ -395,7 +396,7 @@ isBadServerName = \sn ->
395
396
396authenticateSession : [Session] -> Text -> Timestamp -> AuthResult
397authenticateSession : [Session] -> Text -> Timestamp -> AuthResult
397authenticateSession = \sessions token t ->
398authenticateSession = \sessions token t ->
398− case headOf (do s <- sessions; where safeCompare s.token token && s.expiresAt > t; yield s) of
399+ case headOf (do s <- sessions; where s.expiresAt > t && safeCompare s.token token; yield s) of
399 Nothing {} -> Unauthorized {}
400 Nothing {} -> Unauthorized {}
400 Just {value: s} -> Authorized {pubkey: s.pubkey}
401 Just {value: s} -> Authorized {pubkey: s.pubkey}
401
402