Merge remote-tracking branch 'upstream/develop' into neckbeard

docs/CONFIGURATION.md

@@ -73,6 +73,9 @@ These two settings should point to where FE should redirect visitor when they lo
 ### `scopeCopy`
 Copy post scope (visibility) when replying to a post. Instance-default.
 
+### `sidebarRight`
+Change alignment of sidebar and panels to the right. Defaults to `false`.
+
 ### `showFeaturesPanel`
 Show panel showcasing instance features/settings to logged-out visitors
 

src/App.js

@@ -101,7 +101,12 @@ export default {
     },
     showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel },
     isMobileLayout () { return this.$store.state.interface.mobileLayout },
-    privateMode () { return this.$store.state.instance.private }
+    privateMode () { return this.$store.state.instance.private },
+    sidebarAlign () {
+      return {
+        'order': this.$store.state.instance.sidebarRight ? 99 : 0
+      }
+    }
   },
   methods: {
     scrollToTop () {

src/App.vue

@@ -80,7 +80,10 @@
       id="content"
       class="container underlay"
     >
-      <div class="sidebar-flexer mobile-hidden">
+      <div
+        class="sidebar-flexer mobile-hidden"
+        :style="sidebarAlign"
+      >
         <div class="sidebar-bounds">
           <div class="sidebar-scroller">
             <div class="sidebar">

src/boot/after_store.js

@@ -108,7 +108,6 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
   copyInstanceOption('subjectLineBehavior')
   copyInstanceOption('postContentType')
   copyInstanceOption('alwaysShowSubjectInput')
-  copyInstanceOption('noAttachmentLinks')
   copyInstanceOption('showFeaturesPanel')
   copyInstanceOption('hideSitename')
 

src/components/follow_card/follow_card.vue

@@ -2,7 +2,7 @@
   <basic-user-card :user="user">
     <div class="follow-card-content-container">
       <span
-        v-if="!noFollowsYou && relationship.followed_by"
+        v-if="isMe || (!noFollowsYou && relationship.followed_by)"
         class="faint"
       >
         {{ isMe ? $t('user_card.its_you') : $t('user_card.follows_you') }}
@@ -15,7 +15,7 @@
           <RemoteFollow :user="user" />
         </div>
       </template>
-      <template v-else>
+      <template v-else-if="!isMe">
         <FollowButton
           :relationship="relationship"
           :label-following="$t('user_card.follow_unfollow')"

src/modules/instance.js

@@ -35,6 +35,7 @@ const defaultState = {
   scopeCopy: true,
   showFeaturesPanel: true,
   showInstanceSpecificPanel: false,
+  sidebarRight: false,
   subjectLineBehavior: 'email',
   theme: 'pleroma-dark',
 

static/config.json

@@ -1,33 +1,34 @@
 {
-  "theme": "wavemaster",
-  "background": "/media/4dbe80b15103267c727f0ff2c4ea90e911abde8966c5993a5f1c10ba431634be.jpg?name=neon_city.jpg",
-  "logo": "/media/6fad7849bb969fee086fd2fd8b0eabcbcf98763294680889357aa4b377e585f8.png?name=panda.png",
-  "logoMask": false,
-  "logoMargin": "0.1em",
-  "redirectRootNoLogin": "/main/all",
-  "redirectRootLogin": "/main/friends",
-  "showInstanceSpecificPanel": true,
-  "collapseMessageWithSubject": false,
-  "scopeOptionsEnabled": true,
-  "scopeCopy": false,
-  "formattingOptionsEnabled": true,
-  "subjectLineBehavior": "noop",
-  "postContentType": "text/plain",
   "alwaysShowSubjectInput": true,
-  "hidePostStats": false,
-  "hideUserStats": false,
-  "loginMethod": "password",
-  "webPushNotifications": false,
-  "noAttachmentLinks": false,
-  "nsfwCensorImage": "/media/9dd6174be333f098bbe2c925f3fbef835f55aa31eab36e02ef3f2c5ddb0256ef.png?name=nb-nsfw.png",
-  "showFeaturesPanel": true,
-  "minimalScopesMode": false,
-  "hideMutedPosts": true,
-  "greentext": true,
-  "useContainFit": true,
+  "background": "/media/4dbe80b15103267c727f0ff2c4ea90e911abde8966c5993a5f1c10ba431634be.jpg?name=neon_city.jpg",
+  "collapseMessageWithSubject": false,
   "disableChat": false,
+  "greentext": true,
   "hideFilteredStatuses": true,
   "hideMutedPosts": true,
+  "hidePostStats": false,
   "hideSitename": false,
+  "hideUserStats": false,
+  "loginMethod": "password",
+  "logo": "/media/6fad7849bb969fee086fd2fd8b0eabcbcf98763294680889357aa4b377e585f8.png?name=panda.png",
+  "logoMargin": "0.1em",
+  "logoMask": false,
+  "minimalScopesMode": false,
+  "nsfwCensorImage": "/media/9dd6174be333f098bbe2c925f3fbef835f55aa31eab36e02ef3f2c5ddb0256ef.png?name=nb-nsfw.png",
+  "postContentType": "text/plain",
+  "redirectRootLogin": "/main/friends",
+  "redirectRootNoLogin": "/main/all",
+  "scopeCopy": false,
+  "showFeaturesPanel": true,
+  "showInstanceSpecificPanel": true,
+  "sidebarRight": false,
+  "subjectLineBehavior": "noop",
+  "theme": "wavemaster",
+  "useContainFit": true,
+  "webPushNotifications": false,
+  "scopeOptionsEnabled": true,
+  "formattingOptionsEnabled": true,
+  "noAttachmentLinks": false,
   "bannerUrl": "https://video.autizmo.xyz/videos/watch/2cea9561-0f89-46c7-aab7-be186fac6d9c?autoplay=1"
 }
+