From b5d15eddcf6bb3a9dac4f4b3d4a063aa84a8c693 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 31 Aug 2020 11:50:26 +0300
Subject: [PATCH 1/2] hide poll when subject collapsed, but show poll icon

---
 src/components/status_content/status_content.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index fb469a2f..76fe3278 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -71,6 +71,10 @@
           v-if="attachmentTypes.includes('unknown')"
           class="icon-doc"
         />
+        <span
+          v-if="status.poll && status.poll.options"
+          class="icon-chart-bar"
+        />
         <span
           v-if="status.card"
           class="icon-link"
@@ -86,7 +90,7 @@
       </a>
     </div>
 
-    <div v-if="status.poll && status.poll.options">
+    <div v-if="status.poll && status.poll.options && !hideSubjectStatus">
       <poll :base-poll="status.poll" />
     </div>
 

From ca0ce902ea1f0c3d82da65de18ba53a3350d64c2 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 31 Aug 2020 11:54:27 +0300
Subject: [PATCH 2/2] add changelog entry

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43e53e60..675c4b5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 ## [Unreleased patch]
+### Changed
+- Polls will be hidden with status content if "Collapse posts with subjects" is enabled and the post is collapsed.
 
 ## [2.1.0] - 2020-08-28
 ### Added