Fix account button not update for cache miss

yue · Dec 28, 2018 · 96e1717 · 96e1717
1 parent df3f5f4
commit 96e1717
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/lib/controller/image-store.js b/lib/controller/image-store.js
@@ -71,7 +71,7 @@ class ImageStore {
         // Remove file if accessed 7 days ago.
         const p = path.join(this.dir, f)
         const stats = fs.statSync(p)
-        if (now - stats.atimeMs > 1000)
+        if (now - stats.atimeMs > 1000 * 3600 * 24 * 7)
           fs.unlinkSync(p)
       }
     } catch (e) {

diff --git a/lib/service/slack/slack-account.js b/lib/service/slack/slack-account.js
@@ -8,8 +8,6 @@ const SlackDirectMessage = require('./slack-direct-messsage')
 const SlackReaction = require('./slack-reaction')
 const SlackUser = require('./slack-user')
 
-const imageStore = require('../../controller/image-store')
-
 function compareChannel(a, b) {
   const nameA = a.name.toUpperCase()
   const nameB = b.name.toUpperCase()
@@ -109,7 +107,7 @@ class SlackAccount extends Account {
   async ready(data) {
     // Update current team information.
     const {team} = await this.rtm.webClient.team.info()
-    this.icon = await imageStore.fetchImage(team.icon.image_132)
+    this.icon = team.icon.image_132
     this.url = `https://${team.domain}.slack.com`
     this.onUpdateInfo.dispatch(this)
     // Fetch users.

diff --git a/lib/view/account-button.js b/lib/view/account-button.js
@@ -1,5 +1,7 @@
 const gui = require('gui')
 
+const imageStore = require('../controller/image-store')
+
 const FOCUS_BAR_COLOR = process.platform === 'darwin' ? '#FFF' : '#938E92'
 
 function RoundedCornerPath(painter, r, radius) {
@@ -52,9 +54,9 @@ class AccountButton {
     this.subscription.onUpdateReadState.detach()
   }
 
-  updateInfo() {
+  async updateInfo() {
     if (this.account.icon)
-      this.image = gui.Image.createFromPath(this.account.icon)
+      this.image = gui.Image.createFromPath(await imageStore.fetchImage(this.account.icon))
     this.view.schedulePaint()
   }