Merge pull request #3908 from hippware/3874-own-presence

Update own profile's presence status.
hippware · Jul 29, 2019 · 8770c61 · 8770c61
2 parents 5a553ff + e6a7267
commit 8770c61
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/third-party/wocky-client/src/store/Wocky.ts b/third-party/wocky-client/src/store/Wocky.ts
@@ -450,13 +450,10 @@ export const Wocky = types
         reaction(
           () => self.transport.presence,
           ({id, status}) => {
-            // no need to update own profile's status
-            if (id !== self.username) {
-              const profile = self.profiles.get(id)
-              profile.setStatus(status)
-              if (profile.isOwn && self.profile) {
-                self.profile!.setStatus(status)
-              }
+            const profile = self.profiles.get(id)
+            profile.setStatus(status)
+            if (profile.isOwn && self.profile) {
+              self.profile!.setStatus(status)
             }
           }
         ),

diff --git a/third-party/wocky-client/src/transport/Transport.ts b/third-party/wocky-client/src/transport/Transport.ts
@@ -952,6 +952,10 @@ export class Transport {
                   firstName
                   lastName
                   handle
+                  presence {
+                    status
+                    updatedAt
+                  }
                   media {
                     thumbnailUrl
                     trosUrl
@@ -1244,6 +1248,10 @@ export class Transport {
               firstName
               lastName
               handle
+              presence {
+                status
+                updatedAt
+              }
               media {
                 thumbnailUrl
                 trosUrl

diff --git a/third-party/wocky-client/src/transport/constants.ts b/third-party/wocky-client/src/transport/constants.ts
@@ -3,7 +3,10 @@ export const AREA_TOO_LARGE = 'AREA_TOO_LARGE'
 export const PROFILE_PROPS = `id firstName lastName handle
   media { thumbnailUrl fullUrl trosUrl }
   bots(first:0, relationship: OWNED) { totalCount }
-  presenceStatus
+  presence {
+    status
+    updatedAt
+  }
 `
 
 export const BOT_PROPS = `id icon title address addressData description radius shortname 

diff --git a/third-party/wocky-client/src/transport/utils.ts b/third-party/wocky-client/src/transport/utils.ts
@@ -300,11 +300,11 @@ export function convertImage(image) {
   return image && image.trosUrl ? {id: image.trosUrl, url: image.thumbnailUrl} : null
 }
 
-export function convertProfile({media, bots, presenceStatus, ...data}): IProfilePartial {
+export function convertProfile({media, bots, presence, ...data}): IProfilePartial {
   // console.log('convertProfile', bots, followers, followed, data)
   return {
     avatar: convertImage(media),
-    status: presenceStatus,
+    status: presence.status,
     botsSize: bots ? bots.totalCount : undefined,
     ...data,
   } as IProfilePartial