merge upstream

README.md

@@ -49,6 +49,7 @@ Upstream README is below.
 - add toggle for showing post edit notifications
 - add support for accepted follow request notifications
 - add option to prevent page from getting pushed when making a new post with streaming api enabled (similar to 3rd "for unreads" option)
+- add link on user card to open profiles in iceshrimp-fe
 - add a script to download ruffle for flash support (requires python3 and requests library)
   - download by entering `tools/` and running `python3 download_ruffle.py`
 

src/components/user_card/user_card.js

@@ -15,7 +15,8 @@ import {
   faRss,
   faSearchPlus,
   faExternalLinkAlt,
-  faEdit
+  faEdit,
+  faShrimp
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
@@ -23,7 +24,8 @@ library.add(
   faBell,
   faSearchPlus,
   faExternalLinkAlt,
-  faEdit
+  faEdit,
+  faShrimp
 )
 
 export default {
@@ -66,7 +68,6 @@ export default {
       return this.user.id !== this.$store.state.users.currentUser.id
     },
     subscribeUrl () {
-       
       const serverUrl = new URL(this.user.statusnet_profile_url)
       return `${serverUrl.protocol}//${serverUrl.host}/main/ostatus`
     },
@@ -201,6 +202,11 @@ export default {
     },
     biteUser () {
       return this.$store.dispatch('biteUser', this.user.id)
+    },
+    userOnOurInstance (user) {
+      let us = this.$store.state.users.currentUser
+      let inst = us.statusnet_profile_url.replace("@" + us.screen_name, "")
+      return inst + '@' + user.screen_name
     }
   }
 }

src/components/user_card/user_card.vue

@@ -147,6 +147,17 @@
                   icon="rss"
                 />
               </a>
+              <a
+                v-if="isOtherUser"
+                :href="userOnOurInstance(user)"
+                target="_blank"
+                class="button-unstyled external-link-button"
+              >
+                <FAIcon
+                  class="icon"
+                  icon="shrimp"
+                />
+              </a>
               <AccountActions
                 v-if="isOtherUser && loggedIn"
                 :user="user"