More information in discussion callbacks

mcoblenz · Dec 26, 2015 · b1d9b4b · b1d9b4b
1 parent 22dd291
commit b1d9b4b
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 8 deletions.
diff --git a/discussion.ur b/discussion.ur
@@ -52,7 +52,9 @@ functor Make(M : sig
 
                  val showOpenVsClosed : bool
                  val allowPrivate : bool
-                 val onNewMessage : {thread : time, Subject : string, Who : string, Text : string} -> transaction unit
+                 val onNewMessage : transaction (list string)
+                    -> {thread : time, Subject : string, Who : string, Text : string}
+                    -> transaction unit
              end) = struct
 
     open M
@@ -368,7 +370,17 @@ functor Make(M : sig
                 broadcast (fn ch => send ch (New {Thread = thread, When = tm, Who = u, Text = text}))
                           k row.Private row.Who;
 
-                onNewMessage {thread = thread, Subject = row.Text, Who = u, Text = text}
+                onNewMessage
+                    (List.mapQuery (SELECT DISTINCT message.Who
+                                    FROM message
+                                    WHERE {@@Sql.easy_where [#Message] [key ++ [thread = _]]
+                                      [[When = _, Who = _, Text = _]]
+                                      [[]] [[]] [[]] ! !
+                                      (kinj ++ {thread = _})
+                                      (@Folder.concat ! _ fl)
+                                      (k ++ {thread = thread})})
+                                   (fn {Message = {Who = w}} => w))
+                    {thread = thread, Subject = row.Text, Who = u, Text = text}
 
     fun saveMsg k thread msg text =
         acc <- access k;

diff --git a/discussion.urs b/discussion.urs
@@ -37,7 +37,10 @@ functor Make(M : sig
                  val allowPrivate : bool
                  (* May users create threads visible only to themselves and admins? *)
 
-                 val onNewMessage : {thread : time, Subject : string, Who : string, Text : string} -> transaction unit
+                 val onNewMessage : transaction (list string)
+                    (* Run to get list of all users who have posted in the thread. *)
+                    -> {thread : time, Subject : string, Who : string, Text : string}
+                    -> transaction unit
                  (* Callback for every new message posted in any thread *)
              end) : sig
     include Ui.S where type input = $M.key

diff --git a/globalDiscussion.ur b/globalDiscussion.ur
@@ -6,7 +6,9 @@ functor Make(M : sig
                  val access : transaction Discussion.access
                  val showOpenVsClosed : bool
                  val allowPrivate : bool
-                 val onNewMessage : {Thread : time, Subject : string, Who : string, Text : string} -> transaction unit
+                 val onNewMessage : transaction (list string)
+                    -> {Thread : time, Subject : string, Who : string, Text : string}
+                    -> transaction unit
              end) = struct
 
     open M

diff --git a/globalDiscussion.urs b/globalDiscussion.urs
@@ -8,7 +8,9 @@ functor Make(M : sig
                  val access : transaction Discussion.access
                  val showOpenVsClosed : bool
                  val allowPrivate : bool
-                 val onNewMessage : {Thread : time, Subject : string, Who : string, Text : string} -> transaction unit
+                 val onNewMessage : transaction (list string)
+                    -> {Thread : time, Subject : string, Who : string, Text : string}
+                    -> transaction unit
              end) : sig
     include Ui.S0
 

diff --git a/submission.ur b/submission.ur
@@ -60,7 +60,6 @@ functor Make(M : sig
     val keyInj' = @mp [sql_injectable_prim] [sql_injectable] @@sql_prim keyFl keyInj
 
     table listeners : (key ++ [ukey = option string, Channel = channel {Filename : option string, When : time, ukey : string}])
-      {{one_constraint [#Key] (@Sql.easy_foreign ! ! ! ! ! ! keyFl tab)}}
 
     fun upload k h vs =
         cl <- AjaxUpload.claim h;

diff --git a/tableDiscussion.ur b/tableDiscussion.ur
@@ -24,7 +24,9 @@ functor Make(M : sig
                  val access : $key -> transaction Discussion.access
                  val showOpenVsClosed : bool
                  val allowPrivate : bool
-                 val onNewMessage : {thread : time, Subject : string, Who : string, Text : string} -> transaction unit
+                 val onNewMessage : transaction (list string)
+                    -> {thread : time, Subject : string, Who : string, Text : string}
+                    -> transaction unit
              end) = struct
 
     open M

diff --git a/tableDiscussion.urs b/tableDiscussion.urs
@@ -26,7 +26,9 @@ functor Make(M : sig
                  val access : $key -> transaction Discussion.access
                  val showOpenVsClosed : bool
                  val allowPrivate : bool
-                 val onNewMessage : {thread : time, Subject : string, Who : string, Text : string} -> transaction unit
+                 val onNewMessage : transaction (list string)
+                    -> {thread : time, Subject : string, Who : string, Text : string}
+                    -> transaction unit
              end) : sig
     include Ui.S where type input = $M.key