merge develop, fix conflicts, fix logged out bug

src/boot/after_store.js

@@ -168,6 +168,8 @@ const afterStoreSetup = ({ store, i18n }) => {
       store.dispatch('setInstanceOption', { name: 'chatAvailable', value: features.includes('chat') })
       store.dispatch('setInstanceOption', { name: 'gopherAvailable', value: features.includes('gopher') })
 
+      store.dispatch('setInstanceOption', { name: 'restrictedNicknames', value: metadata.restrictedNicknames })
+
       const suggestions = metadata.suggestions
       store.dispatch('setInstanceOption', { name: 'suggestionsEnabled', value: suggestions.enabled })
       store.dispatch('setInstanceOption', { name: 'suggestionsWeb', value: suggestions.web })

src/boot/routes.js

@@ -24,52 +24,28 @@ export default (store) => {
       redirect: _to => {
         return (store.state.users.currentUser
                 ? store.state.instance.redirectRootLogin
-                : store.state.instance.redirectRootNoLogin) || '/~/main/all'
+                : store.state.instance.redirectRootNoLogin) || '/main/all'
       }
     },
-    { name: 'public-external-timeline', path: '/~/main/all', component: PublicAndExternalTimeline },
+    { name: 'public-external-timeline', path: '/main/all', component: PublicAndExternalTimeline },
-    { name: 'public-timeline', path: '/~/main/public', component: PublicTimeline },
+    { name: 'public-timeline', path: '/main/public', component: PublicTimeline },
-    { name: 'friends', path: '/~/main/friends', component: FriendsTimeline },
+    { name: 'friends', path: '/main/friends', component: FriendsTimeline },
-    // Beginning of temporary redirects
+    { name: 'tag-timeline', path: '/tag/:tag', component: TagTimeline },
-    { path: '/main/:route',
+    { name: 'conversation', path: '/notice/:id', component: ConversationPage, meta: { dontScroll: true } },
-      redirect: to => {
+    { name: 'external-user-profile', path: '/users/:id', component: UserProfile },
-        const { params } = to
+    { name: 'mentions', path: '/users/:username/mentions', component: Mentions },
-        const route = params.route ? params.route : 'all'
+    { name: 'dms', path: '/users/:username/dms', component: DMs },
-
+    { name: 'settings', path: '/settings', component: Settings },
-        return { path: `/~/main/${route}` }
+    { name: 'registration', path: '/registration', component: Registration },
-      }
+    { name: 'registration', path: '/registration/:token', component: Registration },
-    },
+    { name: 'friend-requests', path: '/friend-requests', component: FollowRequests },
-    { path: '/tag/:tag',
+    { name: 'user-settings', path: '/user-settings', component: UserSettings },
-      redirect: to => {
-        const { params } = to
-
-        return { path: `/~/tag/${params.tag}` }
-      }
-    },
-    { path: '/notice/:id',
-      redirect: to => {
-        const { params } = to
-
-        return { path: `/~/notice/${params.id}` }
-      }
-    },
-    // End of temporary redirects
-    { name: 'tag-timeline', path: '/~/tag/:tag', component: TagTimeline },
-    { name: 'conversation', path: '/~/notice/:id', component: ConversationPage, meta: { dontScroll: true } },
-    { name: 'user-profile', path: '/:name', component: UserProfile },
-    { name: 'external-user-profile', path: '/~/users/:id', component: UserProfile },
-    { name: 'mentions', path: '/:username/mentions', component: Mentions },
-    { name: 'dms', path: '/:username/dms', component: DMs },
-    { name: 'settings', path: '/~/settings', component: Settings },
-    { name: 'registration', path: '/~/registration', component: Registration },
-    { name: 'registration', path: '/~/registration/:token', component: Registration },
-    { name: 'friend-requests', path: '/~/friend-requests', component: FollowRequests },
-    { name: 'user-settings', path: '/~/user-settings', component: UserSettings },
-    { name: 'oauth-callback', path: '/~/oauth-callback', component: OAuthCallback, props: (route) => ({ code: route.query.code }) },
-    { name: 'user-search', path: '/~/user-search', component: UserSearch, props: (route) => ({ query: route.query.query }) },
     { name: 'notifications', path: '/:username/notifications', component: Notifications },
     { name: 'new-status', path: '/:username/new-status', component: UserPanel },
-    { name: 'login', path: '/~/login', component: LoginForm },
+    { name: 'login', path: '/login', component: LoginForm },
-    { name: 'chat', path: '/~/chat', component: ChatPanel, props: () => ({ floating: false }) }
+    { name: 'chat', path: '/chat', component: ChatPanel, props: () => ({ floating: false }) },
+    { name: 'oauth-callback', path: '/oauth-callback', component: OAuthCallback, props: (route) => ({ code: route.query.code }) },
+    { name: 'user-search', path: '/user-search', component: UserSearch, props: (route) => ({ query: route.query.query }) },
+    { name: 'user-profile', path: '/(users/)?:name', component: UserProfile }
   ]
 }

src/components/chat_panel/chat_panel.js

@@ -23,7 +23,7 @@ const chatPanel = {
       this.collapsed = !this.collapsed
     },
     userProfileLink (user) {
-      return generateProfileLink(user.id, user.username)
+      return generateProfileLink(user.id, user.username, this.$store.state.instance.restrictedNicknames)
     }
   }
 }

src/components/login_form/login_form.js

@@ -32,7 +32,7 @@ const LoginForm = {
           .then((result) => {
             this.$store.commit('setToken', result.access_token)
             this.$store.dispatch('loginUser', result.access_token)
-            this.$router.push('/~/main/friends')
+            this.$router.push({name: 'friends'})
           })
       })
     }

src/components/notification/notification.js

@@ -20,7 +20,7 @@ const Notification = {
       this.userExpanded = !this.userExpanded
     },
     userProfileLink (user) {
-      return generateProfileLink(user.id, user.screen_name)
+      return generateProfileLink(user.id, user.screen_name, this.$store.state.instance.restrictedNicknames)
     }
   },
   computed: {

src/components/oauth_callback/oauth_callback.js

@@ -11,7 +11,7 @@ const oac = {
       }).then((result) => {
         this.$store.commit('setToken', result.access_token)
         this.$store.dispatch('loginUser', result.access_token)
-        this.$router.push('/~/main/friends')
+        this.$router.push({name: 'friends'})
       })
     }
   }

src/components/registration/registration.js

@@ -28,7 +28,7 @@ const registration = {
   },
   created () {
     if ((!this.registrationOpen && !this.token) || this.signedIn) {
-      this.$router.push('/~/main/all')
+      this.$router.push({name: 'root'})
     }
 
     this.setCaptcha()
@@ -58,7 +58,7 @@ const registration = {
       if (!this.$v.$invalid) {
         try {
           await this.signUp(this.user)
-          this.$router.push('/~/main/friends')
+          this.$router.push({name: 'friends'})
         } catch (error) {
           console.warn('Registration failed: ' + error)
         }

src/components/side_drawer/side_drawer.vue

@@ -8,7 +8,7 @@
       @touchmove="touchMove"
     >
       <div class="side-drawer-heading" @click="toggleDrawer">
-        <user-card-content :user="currentUser" :switcher="false" :hideBio="true">
+        <user-card-content :user="currentUser" :switcher="false" :hideBio="true" v-if="currentUser">
         </user-card-content>
       </div>
       <ul>

src/components/status/status.js

@@ -290,7 +290,7 @@ const Status = {
       this.showPreview = false
     },
     userProfileLink (id, name) {
-      return generateProfileLink(id, name)
+      return generateProfileLink(id, name, this.$store.state.instance.restrictedNicknames)
     }
   },
   watch: {

src/components/user_card/user_card.js

@@ -33,7 +33,7 @@ const UserCard = {
       this.$store.dispatch('removeFollowRequest', this.user)
     },
     userProfileLink (user) {
-      return generateProfileLink(user.id, user.screen_name)
+      return generateProfileLink(user.id, user.screen_name, this.$store.state.instance.restrictedNicknames)
     }
   }
 }

src/components/user_card_content/user_card_content.js

@@ -180,7 +180,7 @@ export default {
       }
     },
     userProfileLink (user) {
-      return generateProfileLink(user.id, user.screen_name)
+      return generateProfileLink(user.id, user.screen_name, this.$store.state.instance.restrictedNicknames)
     }
   }
 }

src/components/user_settings/user_settings.js

@@ -257,7 +257,7 @@ const UserSettings = {
         .then((res) => {
           if (res.status === 'success') {
             this.$store.dispatch('logout')
-            this.$router.push('/~/main/all')
+            this.$router.push({name: 'root'})
           } else {
             this.deleteAccountError = res.error
           }

src/components/who_to_follow_panel/who_to_follow_panel.js

@@ -62,7 +62,7 @@ const WhoToFollowPanel = {
   },
   methods: {
     userProfileLink (id, name) {
-      return generateProfileLink(id, name)
+      return generateProfileLink(id, name, this.$store.state.instance.restrictedNicknames)
     }
   },
   watch: {

src/modules/instance.js

@@ -12,8 +12,8 @@ const defaultState = {
   logo: '/static/logo.png',
   logoMask: true,
   logoMargin: '.2em',
-  redirectRootNoLogin: '/~/main/all',
+  redirectRootNoLogin: '/main/all',
-  redirectRootLogin: '/~/main/friends',
+  redirectRootLogin: '/main/friends',
   showInstanceSpecificPanel: false,
   scopeOptionsEnabled: true,
   formattingOptionsEnabled: false,
@@ -33,6 +33,7 @@ const defaultState = {
   pleromaBackend: true,
   emoji: [],
   customEmoji: [],
+  restrictedNicknames: [],
 
   // Feature-set, apparently, not everything here is reported...
   mediaProxyAvailable: false,

src/services/new_api/oauth.js

@@ -5,7 +5,7 @@ const getOrCreateApp = ({oauth, instance}) => {
   const form = new window.FormData()
 
   form.append('client_name', `PleromaFE_${Math.random()}`)
-  form.append('redirect_uris', `${window.location.origin}/~/oauth-callback`)
+  form.append('redirect_uris', `${window.location.origin}/oauth-callback`)
   form.append('scopes', 'read write follow')
 
   return window.fetch(url, {
@@ -64,7 +64,7 @@ const getToken = ({app, instance, code}) => {
   form.append('client_secret', app.client_secret)
   form.append('grant_type', 'authorization_code')
   form.append('code', code)
-  form.append('redirect_uri', `${window.location.origin}/~/oauth-callback`)
+  form.append('redirect_uri', `${window.location.origin}/oauth-callback`)
 
   return window.fetch(url, {
     method: 'POST',

src/services/user_profile_link_generator/user_profile_link_generator.js

@@ -1,7 +1,10 @@
-const generateProfileLink = (id, screenName) => {
+import { includes } from 'lodash'
+
+const generateProfileLink = (id, screenName, restrictedNicknames) => {
+  const complicated = (isExternal(screenName) || includes(restrictedNicknames, screenName))
   return {
-    name: (isExternal(screenName) ? 'external-user-profile' : 'user-profile'),
+    name: (complicated ? 'external-user-profile' : 'user-profile'),
-    params: (isExternal(screenName) ? { id } : { name: screenName })
+    params: (complicated ? { id } : { name: screenName })
   }
 }
 

static/config.json

@@ -4,8 +4,8 @@
   "logo": "/static/logo.png",
   "logoMask": true,
   "logoMargin": ".1em",
-  "redirectRootNoLogin": "/~/main/all",
+  "redirectRootNoLogin": "/main/all",
-  "redirectRootLogin": "/~/main/friends",
+  "redirectRootLogin": "/main/friends",
   "chatDisabled": false,
   "showInstanceSpecificPanel": false,
   "scopeOptionsEnabled": false,

test/unit/specs/boot/routes.spec.js

@@ -12,7 +12,7 @@ describe('routes', () => {
   })
 
   it('root path', () => {
-    router.push('/~/main/all')
+    router.push('/main/all')
 
     const matchedComponents = router.getMatchedComponents()
 
@@ -26,4 +26,12 @@ describe('routes', () => {
 
     expect(matchedComponents[0].components.hasOwnProperty('UserCardContent')).to.eql(true)
   })
+
+  it('user\'s profile at /users', () => {
+    router.push('/users/fake-user-name')
+
+    const matchedComponents = router.getMatchedComponents()
+
+    expect(matchedComponents[0].components.hasOwnProperty('UserCardContent')).to.eql(true)
+  })
 })

test/unit/specs/services/user_profile_link_generator/user_profile_link_generator.spec.js

@@ -12,4 +12,10 @@ describe('generateProfileLink', () => {
       name: 'external-user-profile', params: { id: 1 }
     })
   })
+
+  it('returns obj for restricted user', () => {
+    expect(generateProfileLink(1, 'lain', ['lain'])).to.eql({
+      name: 'external-user-profile', params: { id: 1 }
+    })
+  })
 })