Changeset 13980 for trunk

Timestamp:

05/30/12 12:45:38 (12 years ago)

Author:

tbretz

Message:

Ensure that no message is processed twice; also add processing of massages if the chat window is open (do we want that? but what if somebody unintentionally opens it?) and show only the status not everybody who is subscribed.

File:

• trunk/FACT++/src/skypeclient.cc (modified) (8 diffs)

trunk/FACT++/src/skypeclient.cc

@@ -32 +32 @@
 
     bool fAllowRaw;
+
+    uint64_t fLastReadMessage;
 
     string Contact(const string &id) const
@@ -424 +426 @@
         if (vec[0]=="CHATMESSAGE")
         {
-            if (vec[2]=="STATUS" && vec[3]=="RECEIVED")
-            {
+            if (vec[2]=="STATUS" && (vec[3]=="RECEIVED"|| vec[3]=="READ"))
+            {
+                const uint64_t last = stoll(vec[1]);
+
+                // Check if message has already been processed: Sometimes
+                // some messages are received twice as READ/READ
+                if (last<=fLastReadMessage)
+                    return;
+                fLastReadMessage = last;
+
                 string rc;
 
@@ -436 +446 @@
                 const size_t p = rc.find(" BODY ");
                 if (p==string::npos)
+                {
+                    cout<< "BODY TAG NOT FOUND|" << rc << "|" << endl;
                     return;
-
-                rc = rc.substr(rc.find(" BODY ")+6);
+                }
+
+                rc = Tools::Trim(rc.substr(rc.find(" BODY ")+6));
 
                 if (rc=="start")
@@ -467 +480 @@
                 }
 
-                if (rc=="list")
+                if (rc=="status")
                 {
-                    ostringstream out;
-                    out << "*\n\nCurrently subscribed:\n";
-
-                    int cnt = 0;
                     for (auto it=fContacts.begin(); it!=fContacts.end(); it++)
                     {
-                        const string user = Contact(*it);
-                        if (user.empty())
-                            continue;
-
-                        out << "   *   " << user << '\n';
-                        cnt ++;
+                        if (*it==vec[1])
+                        {
+                            SendSkypeMessage(id, "You are subscribed.");
+                            return;
+                        }
                     }
-
-                    if (cnt==0)
-                        out << " <no subscriptions>";
-                    else
-                        out << cnt << " user(s) subscribed.";
-
-                    SendSkypeMessage(id, out.str());
+                    SendSkypeMessage(id, "You are not subscribed.");
                     return;
                 }
 
-                SendSkypeMessage(id, "*\n\nSyntax Error:\nPlease use either 'start' or 'stop'");
+                SendSkypeMessage(id, "SYNTAX ERROR\n\nAvailable commands:\nPlease use either 'start', 'stop' or 'status'");
 
             }
@@ -502 +504 @@
             if (vec[2]=="ACTIVITY_TIMESTAMP")
             {
+                //SendDBusMessage("CHAT CREATE "+Contact(vec[1]));
                 //Info(vec[2]);
+                // ALTER CHAT DISBAND
             }
             if (vec[2]=="MYROLE")
@@ -541 +545 @@
     }
 
+    int HandleDisconnect()
+    {
+        return kStateDisconnected;
+    }
+
     int HandleConnect()
     {
@@ -619 +628 @@
 public:
     SkypeClient(ostream &lout) : StateMachineDim(lout, "SKYPE"),
-        fLastConnect(Time()-boost::posix_time::minutes(5)), fLoop(0)
+        fLastConnect(Time()-boost::posix_time::minutes(5)), fLoop(0),
+        fLastReadMessage(0)
     {
         AddStateName(kStateDisconnected, "Disonnected", "");
@@ -638 +648 @@
         AddEvent("CONNECT", kStateDisconnected)
             (bind(&SkypeClient::HandleConnect, this))
+            ("");
+
+        AddEvent("DISCONNECT", kStateConnected)
+            (bind(&SkypeClient::HandleDisconnect, this))
             ("");