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

* upstream/develop:
  no more "broken favorite"
  Fixed some settings not using defaults from instance config. Made some parts of code more readable

src/components/notification/notification.vue

@@ -33,10 +33,7 @@
         </router-link>
       </div>
       <template v-else>
-        <status :activatePanel="activatePanel" v-if="notification.status"  class="faint" :compact="true" :statusoid="notification.status" :noHeading="true"></status>
-        <div class="broken-favorite" v-else>
-          {{$t('notifications.broken_favorite')}}
-        </div>
+        <status :activatePanel="activatePanel" class="faint" :compact="true" :statusoid="notification.status" :noHeading="true"></status>
       </template>
     </div>
   </div>

src/components/notifications/notifications.scss

@@ -36,16 +36,6 @@
   border-color: $fallback--border;
   border-color: var(--border, $fallback--border);
 
-  .broken-favorite {
-    border-radius: $fallback--tooltipRadius;
-    border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
-    color: $fallback--text;
-    color: var(--alertErrorText, $fallback--text);
-    background-color: $fallback--alertError;
-    background-color: var(--alertError, $fallback--alertError);
-    padding: 2px .5em
-  }
-
   .avatar-compact {
     width: 32px;
     height: 32px;

src/components/post_status_form/post_status_form.js

@@ -43,12 +43,16 @@ const PostStatusForm = {
     const preset = this.$route.query.message
     let statusText = preset || ''
 
+    const scopeCopy = typeof this.$store.state.config.scopeCopy === 'undefined'
+          ? this.$store.state.instance.scopeCopy
+          : this.$store.state.config.scopeCopy
+
     if (this.replyTo) {
       const currentUser = this.$store.state.users.currentUser
       statusText = buildMentionsString({ user: this.repliedUser, attentions: this.attentions }, currentUser)
     }
 
-    const scope = (this.copyMessageScope && this.$store.state.config.scopeCopy || this.copyMessageScope === 'direct')
+    const scope = (this.copyMessageScope && scopeCopy || this.copyMessageScope === 'direct')
           ? this.copyMessageScope
           : this.$store.state.users.currentUser.default_scope
 

src/components/settings/settings.js

@@ -15,14 +15,17 @@ const settings = {
       hideNsfwLocal: user.hideNsfw,
       hideISPLocal: user.hideISP,
       preloadImage: user.preloadImage,
+
       hidePostStatsLocal: typeof user.hidePostStats === 'undefined'
         ? instance.hidePostStats
         : user.hidePostStats,
       hidePostStatsDefault: this.$t('settings.values.' + instance.hidePostStats),
+
       hideUserStatsLocal: typeof user.hideUserStats === 'undefined'
         ? instance.hideUserStats
         : user.hideUserStats,
       hideUserStatsDefault: this.$t('settings.values.' + instance.hideUserStats),
+
       notificationVisibilityLocal: user.notificationVisibility,
       replyVisibilityLocal: user.replyVisibility,
       loopVideoLocal: user.loopVideo,
@@ -32,20 +35,27 @@ const settings = {
       streamingLocal: user.streaming,
       pauseOnUnfocusedLocal: user.pauseOnUnfocused,
       hoverPreviewLocal: user.hoverPreview,
+
       collapseMessageWithSubjectLocal: typeof user.collapseMessageWithSubject === 'undefined'
         ? instance.collapseMessageWithSubject
         : user.collapseMessageWithSubject,
       collapseMessageWithSubjectDefault: this.$t('settings.values.' + instance.collapseMessageWithSubject),
+
       subjectLineBehaviorLocal: typeof user.subjectLineBehavior === 'undefined'
         ? instance.subjectLineBehavior
         : user.subjectLineBehavior,
       subjectLineBehaviorDefault: instance.subjectLineBehavior,
+
       alwaysShowSubjectInputLocal: typeof user.alwaysShowSubjectInput === 'undefined'
         ? instance.alwaysShowSubjectInput
         : user.alwaysShowSubjectInput,
       alwaysShowSubjectInputDefault: instance.alwaysShowSubjectInput,
-      scopeCopyLocal: user.scopeCopy,
+
+      scopeCopyLocal: typeof user.scopeCopy === 'undefined'
+        ? instance.scopeCopy
+        : user.scopeCopy,
       scopeCopyDefault: this.$t('settings.values.' + instance.scopeCopy),
+
       stopGifs: user.stopGifs,
       webPushNotificationsLocal: user.webPushNotifications,
       loopSilentAvailable:

src/components/status/status.js

@@ -188,7 +188,9 @@ const Status = {
     },
     replySubject () {
       if (!this.status.summary) return ''
-      const behavior = this.$store.state.config.subjectLineBehavior
+      const behavior = typeof this.$store.state.config.subjectLineBehavior === 'undefined'
+            ? this.$store.state.instance.subjectLineBehavior
+            : this.$store.state.config.subjectLineBehavior
       const startsWithRe = this.status.summary.match(/^re[: ]/i)
       if (behavior !== 'noop' && startsWithRe || behavior === 'masto') {
         return this.status.summary