Changeset ff72b8b in Renga

Timestamp:

Jun 19, 2019, 8:51:32 PM (5 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

04c164a

Parents:

f7960fb

Message:

Handle "pending presence" state.

Location:

jabber

Files:

• JabberSpeak.cpp (modified) (2 diffs)
• UserID.cpp (modified) (5 diffs)
• UserID.h (modified) (3 diffs)

jabber/JabberSpeak.cpp

@@ -1239 +1239 @@
 JabberSpeak::handleItemUpdated(const gloox::JID& jid)
 {
-        printf("%s(%s)\n", __PRETTY_FUNCTION__, jid.full().c_str());
+        gloox::RosterItem* item = fClient->rosterManager()->getRosterItem(jid);
+        UserID* roster_user = JRoster::Instance()->FindUser(JRoster::HANDLE, jid.full());
+        if (roster_user) {
+                roster_user->SetSubscriptionStatus(item->subscription());
+                printf("%s(%s)\n", __PRETTY_FUNCTION__, jid.full().c_str());
+                printf("   name %s\n", item->name().c_str());
+                printf("   onln %d\n", item->online());
+        } else {
+                printf("%s(%s) user not found\n", __PRETTY_FUNCTION__, jid.full().c_str());
+        }
 }
 
@@ -1376 +1385 @@
 
 void
-JabberSpeak::handleSelfPresence(const gloox::RosterItem&, const string&, gloox::Presence::PresenceType, const string&)
-{
-        printf("%s\n", __PRETTY_FUNCTION__);
+JabberSpeak::handleSelfPresence(const gloox::RosterItem&, const string& resource, gloox::Presence::PresenceType, const string& msg)
+{
+        // TODO this gets called for giving us our current presence and message,
+        // and also for all other resources, so we can know that the same user
+        // is also online elsewhere
+        printf("%s(%s, %s)\n", __PRETTY_FUNCTION__, resource.c_str(), msg.c_str());
 }
 

jabber/UserID.cpp

@@ -25 +25 @@
         // bare defaults
         SetOnlineStatus(UserID::UNKNOWN);
-        SetAsk("");
         SetExactOnlineStatus("chat");
         SetSubscriptionStatus(gloox::S10nNone);
@@ -34 +33 @@
         SetFriendlyName(copied_userid.FriendlyName());
 
-        SetAsk(copied_userid.Ask());
         SetSubscriptionStatus(copied_userid.SubscriptionStatus());
         SetOnlineStatus(copied_userid.OnlineStatus());
@@ -48 +46 @@
         SetFriendlyName(rhs.FriendlyName());
 
-        SetAsk(rhs.Ask());
         SetSubscriptionStatus(rhs.SubscriptionStatus());
 
@@ -66 +63 @@
 }
 
-const std::string UserID::Ask() const {
-        return _ask;
-}
-
 UserID::online_status UserID::OnlineStatus() const {
-        if (_status == UNKNOWN && Ask() == "subscribe") {
+        if (_status == UNKNOWN && (SubscriptionStatus() == gloox::S10nNoneOut || SubscriptionStatus() == gloox::S10nNoneOutIn || SubscriptionStatus() == gloox::S10nFromOut)) {
                 return UNACCEPTED;
         } else {
@@ -232 +225 @@
 }
 
-void UserID::SetAsk(std::string status) {
-        _ask = status;
-}
-
 void UserID::SetOnlineStatus(online_status status) {
         // special value

jabber/UserID.h

@@ -28 +28 @@
         const std::string    FriendlyName() const;
 
-        const std::string    Ask() const;
               online_status  OnlineStatus() const;
         const std::string    ExactOnlineStatus() const;
@@ -55 +54 @@
         void                 SetFriendlyName(std::string friendly_name);
 
-        void                 SetAsk(std::string status);
         void                 SetOnlineStatus(online_status status);
         void                 SetExactOnlineStatus(std::string exact_status);
@@ -69 +67 @@
         std::string          _service;
 
-        std::string          _ask;
         online_status        _status;
         std::string          _exact_status;