diff --git a/src/client/components/poll.vue b/src/client/components/poll.vue index 463ddab721..b5d430f93b 100644 --- a/src/client/components/poll.vue +++ b/src/client/components/poll.vue @@ -10,7 +10,7 @@ -
+
{{ $t('_poll.totalVotes', { n: total }) }}
ยท
{{ showResult ? $ts._poll.vote : $ts._poll.showResult }}
@@ -31,6 +31,11 @@ export default defineComponent({
note: {
type: Object,
required: true
+ },
+ readOnly: {
+ type: Boolean,
+ required: false,
+ default: false,
}
},
data() {
@@ -65,7 +70,7 @@ export default defineComponent({
}
},
created() {
- this.showResult = this.isVoted;
+ this.showResult = this.readOnly || this.isVoted;
if (this.note.poll.expiresAt) {
const update = () => {
@@ -83,7 +88,7 @@ export default defineComponent({
this.showResult = !this.showResult;
},
vote(id) {
- if (this.closed || !this.poll.multiple && this.poll.choices.some(c => c.isVoted)) return;
+ if (this.readOnly || this.closed || !this.poll.multiple && this.poll.choices.some(c => c.isVoted)) return;
os.api('notes/polls/vote', {
noteId: this.note.id,
choice: id
diff --git a/src/client/pages/welcome.timeline.vue b/src/client/pages/welcome.timeline.vue
index 12c8a4d4f4..bd07ac78db 100644
--- a/src/client/pages/welcome.timeline.vue
+++ b/src/client/pages/welcome.timeline.vue
@@ -1,10 +1,22 @@