Merge lp:~tiagosh/history-service/manually_add_self_contact_to_participants into lp:history-service

[Tiago Salem Herrmann]

Manually add self id to participants list if needed.

Manually add self id to participants list if needed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:198
http://jenkins.qa.ubuntu.com/job/history-service-ci/201/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/39/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/40/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/39/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/201/rebuild

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

73 + QStringList participantsFromChannel(const Tp::TextChannelPtr &textChannel);

Can you make it either const or static? I think static would be better for this case

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:199
http://jenkins.qa.ubuntu.com/job/history-service-ci/202/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/40/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/41/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/40/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/202/rebuild

review: Needs Fixing (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

> 73 + QStringList participantsFromChannel(const Tp::TextChannelPtr
> &textChannel);
>
> Can you make it either const or static? I think static would be better for
> this case

Done

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:200
http://jenkins.qa.ubuntu.com/job/history-service-ci/204/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/43/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/42

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/204/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

=== modified file 'daemon/historydaemon.cpp'
--- daemon/historydaemon.cpp	2015-07-16 22:16:44 +0000
+++ daemon/historydaemon.cpp	2015-07-16 22:16:44 +0000
@@ -76,6 +76,20 @@
     return self;
 }
 
+QStringList HistoryDaemon::participantsFromChannel(const Tp::TextChannelPtr &textChannel)
+{
+    QStringList participants;
+    Q_FOREACH(const Tp::ContactPtr contact, textChannel->groupContacts(false)) {
+        participants << contact->id();
+    }
+
+    if (participants.isEmpty() && textChannel->targetHandleType() == Tp::HandleTypeContact &&
+           textChannel->targetContact() == textChannel->connection()->selfContact()) {
+        participants << textChannel->targetContact()->id();
+    }
+    return participants;
+}
+
 QVariantMap HistoryDaemon::threadForParticipants(const QString &accountId,
                                                  History::EventType type,
                                                  const QStringList &participants,
@@ -398,10 +412,7 @@
     if (message.isDeliveryReport() && message.deliveryDetails().hasOriginalToken()) {
         // at this point we assume the delivery report is for a message that was already
         // sent and properly saved at our database, so we can safely get it here to update
-        QStringList participants;
-        Q_FOREACH(const Tp::ContactPtr contact, textChannel->groupContacts(false)) {
-            participants << contact->id();
-        }
+        QStringList participants = participantsFromChannel(textChannel);
 
         QVariantMap thread = threadForParticipants(textChannel->property(History::FieldAccountId).toString(),
                                                                          History::EventTypeText,
@@ -455,10 +466,7 @@
         return;
     }
 
-    QStringList participants;
-    Q_FOREACH(const Tp::ContactPtr contact, textChannel->groupContacts(false)) {
-        participants << contact->id();
-    }
+    QStringList participants = participantsFromChannel(textChannel);
 
     QVariantMap thread = threadForParticipants(textChannel->property(History::FieldAccountId).toString(),
                                                                      History::EventTypeText,
@@ -543,7 +551,7 @@
 void HistoryDaemon::onMessageSent(const Tp::TextChannelPtr textChannel, const Tp::Message &message, const QString &messageToken)
 {
     qDebug() << __PRETTY_FUNCTION__;
-    QStringList participants;
+    QStringList participants = participantsFromChannel(textChannel);
     QList<QVariantMap> attachments;
     History::MessageType type = History::MessageTypeText;
     int count = 1;
@@ -556,10 +564,6 @@
         eventId = messageToken;
     }
  
-    Q_FOREACH(const Tp::ContactPtr contact, textChannel->groupContacts(false)) {
-        participants << contact->id();
-    }
-
     QVariantMap thread = threadForParticipants(textChannel->property(History::FieldAccountId).toString(),
                                               History::EventTypeText,
                                               participants,

=== modified file 'daemon/historydaemon.h'
--- daemon/historydaemon.h	2013-11-29 16:14:49 +0000
+++ daemon/historydaemon.h	2015-07-16 22:16:44 +0000
@@ -37,6 +37,7 @@
 
     static HistoryDaemon *instance();
 
+    static QStringList participantsFromChannel(const Tp::TextChannelPtr &textChannel);
     QVariantMap threadForParticipants(const QString &accountId,
                                       History::EventType type,
                                       const QStringList &participants,