commit: dbad99cb4fac4750a881773c9add317a8a4d9664
parent: 3c2073bc8ec36e45e0b8236081ca0c2b40ef958a
Author: lambadalambda <gitgud@rogerbraun.net>
Date: Thu, 10 Aug 2017 12:34:02 -0400
Merge branch 'feature/follow-notifications' into 'develop'
Add follow notifications.
See merge request !92
Diffstat:
3 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
@@ -49,6 +49,10 @@
color: $green;
}
+ .icon-user-plus.lit {
+ color: $blue;
+ }
+
.icon-reply.lit {
color: $blue;
}
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
@@ -36,6 +36,15 @@
</h1>
<status :compact="true" :statusoid="notification.status"></status>
</div>
+ <div v-if="notification.type === 'follow'">
+ <h1>
+ <span :title="'@'+notification.action.user.screen_name">{{ notification.action.user.name }}</span>
+ <i class="fa icon-user-plus lit"></i>
+ </h1>
+ <div>
+ <router-link :to="{ name: 'user-profile', params: { id: notification.action.user.id } }">@{{ notification.action.user.screen_name }}</router-link> followed you
+ </div>
+ </div>
</div>
</div>
</div>
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
@@ -105,6 +105,10 @@ export const statusType = (status) => {
return 'deletion'
}
+ if (status.text.match(/started following/)) {
+ return 'follow'
+ }
+
return 'unknown'
}
@@ -253,6 +257,9 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
favoriteStatus(favorite)
}
},
+ 'follow': (status) => {
+ addNotification({ type: 'follow', status: status, action: status })
+ },
'deletion': (deletion) => {
const uri = deletion.uri
updateMaxId(deletion)