Merge branch 'more-fixes' into shigusegubu-themes3

src/components/conversation-page/conversation-page.vue

@@ -1,8 +1,7 @@
 <template>
-  <conversation
-    :collapsable="false"
-    is-page="true"
+  <Conversation
     :status-id="statusId"
+    is-page
   />
 </template>
 

src/components/conversation/conversation.js

@@ -55,15 +55,46 @@ const sortAndFilterConversation = (conversation, statusoid) => {
 }
 
 const conversation = {
-  props: [
-    'statusId',
-    'collapsable',
-    'isPage',
-    'pinnedStatusIdsObject',
-    'inProfile',
-    'profileUserId',
-    'virtualHidden',
-  ],
+  props: {
+    statusId: {
+      // Main thing
+      type: String,
+      required: true,
+    },
+    collapsable: {
+      // Whether conversation can be collapsed
+      // i.e. when it's not a page
+      type: Boolean,
+      default: false,
+    },
+    isPage: {
+      // Whether conversation is rendered as a standalone page
+      // as opposed to embedded into a timeline
+      type: Boolean,
+      default: false,
+    },
+    pinnedStatusIdsObject: {
+      // Used for user profile, map of pinned statuses
+      type: Object,
+      default: null,
+    },
+    inProfile: {
+      // Whether conversation is rendered in a user profile
+      // used for overriding muted status
+      type: Boolean,
+      default: false,
+    },
+    profileUserId: {
+      // used with inProfile, user id of the profile
+      type: String,
+      default: null,
+    },
+    virtualHidden: {
+      // Whether conversation is suspended. Controls rendering of statuses
+      type: Boolean,
+      default: false,
+    },
+  },
   data() {
     return {
       highlight: null,

src/components/search/search.vue

@@ -58,7 +58,6 @@
         <Status
           v-for="status in visibleStatuses"
           :key="status.id"
-          :collapsable="false"
           :expandable="false"
           :compact="false"
           class="search-result"

src/components/timeline/timeline.vue

@@ -71,27 +71,27 @@
         class="timeline"
         role="feed"
       >
-        <conversation
+        <Conversation
           v-for="statusId in filteredPinnedStatusIds"
           :key="statusId + '-pinned'"
           role="listitem"
           class="status-fadein"
           :status-id="statusId"
-          :collapsable="true"
           :pinned-status-ids-object="pinnedStatusIdsObject"
           :in-profile="inProfile"
           :profile-user-id="userId"
+          collapsable
         />
-        <conversation
+        <Conversation
           v-for="status in filteredVisibleStatuses"
           :key="status.id"
           role="listitem"
           class="status-fadein"
           :status-id="status.id"
-          :collapsable="true"
           :in-profile="inProfile"
           :profile-user-id="userId"
           :virtual-hidden="virtualScrollingEnabled && !statusesToDisplay.includes(status.id)"
+          collapsable
         />
       </div>
     </div>