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

changelog.d/quote-hide-oops.fix

@@ -0,0 +1 @@
+fix typo in code that prevented cards from showing at all

changelog.d/quote-hide.fix

@@ -0,0 +1 @@
+don't display quoted status twice

src/components/status_content/status_content.js

@@ -73,6 +73,10 @@ const StatusContent = {
   },
   computed: {
     ...controlledOrUncontrolledGetters(['showingTall', 'expandingSubject', 'showingLongSubject']),
+    statusCard () {
+      if (!this.status.card) return null
+      return this.status.card.url === this.status.quote_url ? null : this.status.card
+    },
     hideAttachments () {
       return (this.mergedConfig.hideAttachments && !this.inConversation) ||
         (this.mergedConfig.hideAttachmentsInConv && this.inConversation)

src/components/status_content/status_content.vue

@@ -43,7 +43,7 @@
       />
 
       <div
-        v-if="status.card && !noHeading && !compact"
+        v-if="statusCard && !noHeading && !compact"
         class="link-preview media-body"
       >
         <link-preview