Merge pull request #664 from glouvigny/glouvigny/ui-notify-acked

feat: send acked event to client (+ sent indicator on conversation view)
berty · Nov 27, 2018 · 442b9fa · 442b9fa
2 parents 760e3e6 + 2f73d99
commit 442b9fa
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 14 deletions.
diff --git a/client/react-native/common/components/Screens/Chats/Detail.js b/client/react-native/common/components/Screens/Chats/Detail.js
@@ -2,7 +2,7 @@ import { Platform, View } from 'react-native'
 import React, { PureComponent } from 'react'
 
 import { Pagination, RelayContext } from '../../../relay'
-import { Text, Flex, Screen, Header } from '../../Library'
+import { Text, Flex, Screen, Header, Icon } from '../../Library'
 import { colors } from '../../../constants'
 import { fragments } from '../../../graphql'
 import { merge } from '../../../helpers'
@@ -53,6 +53,10 @@ const Message = fragments.Event(props => {
         }}
       >
         {new Date(props.data.createdAt).toTimeString()}
+        {' '}
+        {isMyself
+          ? <Icon name={props.data.ackedAt ? 'check-circle' : 'circle'} />
+          : null}
       </Text>
     </Flex.Rows>
   )

diff --git a/core/node/event_handlers.go b/core/node/event_handlers.go
@@ -183,16 +183,19 @@ func (n *Node) handleSenderAliasUpdate(ctx context.Context, input *p2p.Event) er
 }
 
 func (n *Node) handleAck(ctx context.Context, input *p2p.Event) error {
+	var ackedEvents []*p2p.Event
 	ackCount := 0
 	ackAttrs, err := input.GetAckAttrs()
 
 	if err != nil {
 		return errors.Wrap(err, "unable to unmarshal ack attrs")
 	}
 
-	if err = n.sql.
+	baseQuery := n.sql.
 		Model(&p2p.Event{}).
-		Where("id in (?)", ackAttrs.IDs).
+		Where("id in (?)", ackAttrs.IDs)
+
+	if err = baseQuery.
 		Count(&ackCount).
 		UpdateColumn("acked_at", time.Now().UTC()).
 		Error; err != nil {
@@ -203,10 +206,18 @@ func (n *Node) handleAck(ctx context.Context, input *p2p.Event) error {
 		return errors.Wrap(err, "no events to ack found")
 	}
 
+	if err = baseQuery.Find(&ackedEvents).Error; err != nil {
+		return errors.Wrap(err, "unable to fetch acked events")
+	}
+
 	if err := n.handleAckSenderAlias(ctx, ackAttrs); err != nil {
 		return errors.Wrap(err, "error while acking alias updates")
 	}
 
+	for _, ackedEvent := range ackedEvents {
+		n.clientEvents <- ackedEvent
+	}
+
 	return nil
 }
 

diff --git a/core/test/e2e_test.go b/core/test/e2e_test.go
@@ -285,7 +285,7 @@ func TestWithEnqueuer(t *testing.T) {
 				So(err, ShouldBeNil)
 				So(res, ShouldResemble, &node.Void{})
 
-				So(nodeChansLens(alice, bob, eve), ShouldResemble, []int{0, 0, 0, 0, 0, 0})
+				So(nodeChansLens(alice, bob, eve), ShouldResemble, []int{0, 1, 0, 0, 0, 0})
 				// FIXME: check that event is acked in db
 
 				everythingWentFine()
@@ -324,7 +324,7 @@ func TestWithEnqueuer(t *testing.T) {
 
 				time.Sleep(time.Second * 1)
 
-				So(nodeChansLens(alice, bob, eve), ShouldResemble, []int{0, 0, 2, 2, 0, 0})
+				So(nodeChansLens(alice, bob, eve), ShouldResemble, []int{0, 1, 2, 2, 0, 0})
 
 				everythingWentFine()
 			})
@@ -346,7 +346,7 @@ func TestWithEnqueuer(t *testing.T) {
 				So(err, ShouldBeNil)
 				So(res, ShouldResemble, &node.Void{})
 
-				So(nodeChansLens(alice, bob, eve), ShouldResemble, []int{2, 3, 1, 2, 0, 0})
+				So(nodeChansLens(alice, bob, eve), ShouldResemble, []int{2, 4, 1, 2, 0, 0})
 
 				everythingWentFine()
 			})
@@ -367,7 +367,7 @@ func TestWithEnqueuer(t *testing.T) {
 				So(event.Direction, ShouldEqual, p2p.Event_Incoming)
 				_, err = event.GetContactRequestAcceptedAttrs()
 				So(err, ShouldBeNil)
-				So(nodeChansLens(alice, bob, eve), ShouldResemble, []int{2, 0, 1, 2, 0, 0})
+				So(nodeChansLens(alice, bob, eve), ShouldResemble, []int{2, 1, 1, 2, 0, 0})
 
 				everythingWentFine()
 			})
@@ -390,7 +390,7 @@ func TestWithEnqueuer(t *testing.T) {
 				So(err, ShouldBeNil)
 				So(res, ShouldResemble, &node.Void{})
 
-				So(nodeChansLens(alice, bob, eve), ShouldResemble, []int{3, 2, 0, 2, 0, 0})
+				So(nodeChansLens(alice, bob, eve), ShouldResemble, []int{3, 3, 0, 2, 0, 0})
 
 				everythingWentFine()
 			})
@@ -411,7 +411,7 @@ func TestWithEnqueuer(t *testing.T) {
 				So(err, ShouldBeNil)
 				So(attrs.Me.DisplayName, ShouldEqual, "Bob")
 				So(attrs.Me.DisplayStatus, ShouldBeEmpty)
-				So(nodeChansLens(alice, bob, eve), ShouldResemble, []int{3, 0, 0, 2, 0, 0})
+				So(nodeChansLens(alice, bob, eve), ShouldResemble, []int{3, 1, 0, 2, 0, 0})
 
 				everythingWentFine()
 			})
@@ -436,7 +436,7 @@ func TestWithEnqueuer(t *testing.T) {
 				So(err, ShouldBeNil)
 				So(res, ShouldResemble, &node.Void{})
 
-				So(nodeChansLens(alice, bob, eve), ShouldResemble, []int{2, 0, 1, 4, 0, 0})
+				So(nodeChansLens(alice, bob, eve), ShouldResemble, []int{2, 1, 1, 4, 0, 0})
 
 				everythingWentFine()
 			})
@@ -459,7 +459,7 @@ func TestWithEnqueuer(t *testing.T) {
 				So(err, ShouldBeNil)
 				So(res, ShouldResemble, &node.Void{})
 
-				So(nodeChansLens(alice, bob, eve), ShouldResemble, []int{1, 0, 1, 4, 0, 0})
+				So(nodeChansLens(alice, bob, eve), ShouldResemble, []int{1, 1, 1, 5, 0, 0})
 
 				everythingWentFine()
 			})
@@ -482,7 +482,7 @@ func TestWithEnqueuer(t *testing.T) {
 				So(err, ShouldBeNil)
 				So(res, ShouldResemble, &node.Void{})
 
-				So(nodeChansLens(alice, bob, eve), ShouldResemble, []int{0, 0, 1, 4, 0, 0})
+				So(nodeChansLens(alice, bob, eve), ShouldResemble, []int{0, 1, 1, 6, 0, 0})
 
 				everythingWentFine()
 			})
@@ -504,7 +504,7 @@ func TestWithEnqueuer(t *testing.T) {
 				So(err, ShouldBeNil)
 				So(res, ShouldResemble, &node.Void{})
 
-				So(nodeChansLens(alice, bob, eve), ShouldResemble, []int{0, 0, 0, 4, 0, 0})
+				So(nodeChansLens(alice, bob, eve), ShouldResemble, []int{0, 2, 0, 6, 0, 0})
 
 				everythingWentFine()
 			})
@@ -528,7 +528,7 @@ func TestWithEnqueuer(t *testing.T) {
 				So(attrs.Me.Status, ShouldEqual, entity.Contact_Unknown)
 				So(attrs.Me.DisplayStatus, ShouldBeEmpty)
 				So(attrs.Me.Devices, ShouldBeNil)
-				So(nodeChansLens(alice, bob, eve), ShouldResemble, []int{0, 0, 0, 0, 0, 0})
+				So(nodeChansLens(alice, bob, eve), ShouldResemble, []int{0, 2, 0, 2, 0, 0})
 
 				everythingWentFine()
 			})