Merge branch 'develop' into 'patch-1'

# Conflicts:
#   src/i18n/messages.js

1 files changed, 12 insertions, 0 deletions

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 73f4a7aa..87ef90d8 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -104,6 +104,18 @@ const Status = {
     StillImage
   },
   methods: {
+    visibilityIcon (visibility) {
+      switch (visibility) {
+        case 'private':
+          return 'icon-lock'
+        case 'unlisted':
+          return 'icon-lock-open-alt'
+        case 'direct':
+          return 'icon-mail-alt'
+        default:
+          return 'icon-globe'
+      }
+    },
     linkClicked ({target}) {
       if (target.tagName === 'SPAN') {
         target = target.parentNode