add poll status to widget

Signed-off-by: dartcafe <github@dartcafe.de>

Author: dartcafe

lib/Provider/ReferenceProvider.php

@@ -61,6 +61,10 @@ public function extractPollId(string $referenceText): int {
 	public function resolveReference(string $referenceText): ?IReference {
 		if ($this->matchReference($referenceText)) {
 			$pollId = $this->extractPollId($referenceText);
+			$expired = false;
+			$expiry = 0;
+			$participated = false;
+
 
 			if ($pollId) {
 				try {
@@ -70,6 +74,9 @@ public function resolveReference(string $referenceText): ?IReference {
 					$ownerId = $poll->getUser()->getId();
 					$ownerDisplayName = $poll->getUser()->getDisplayName();
 					$url = $poll->getVoteUrl();
+					$expired = $poll->getExpired();
+					$expiry = $poll->getExpire();
+					$participated = $poll->getCurrentUserVotes() ? true : false;
 
 				} catch (NotFoundException $e) {
 					$pollId = 0;
@@ -105,6 +112,9 @@ public function resolveReference(string $referenceText): ?IReference {
 						'ownerDisplayName' => $ownerDisplayName,
 						'ownerId' => $ownerId,
 						'url' => $url,
+						'expired' => $expired,
+						'expiry' => $expiry,
+						'participated' => $participated,
 					],
 				]);
 				return $reference;

src/components/PollList/PollItem.vue

@@ -6,7 +6,7 @@
 <script setup lang="ts">
 import { RouterLink } from 'vue-router'
 import { computed } from 'vue'
-import moment from '@nextcloud/moment'
+import { DateTime } from 'luxon'
 import { t } from '@nextcloud/l10n'
 import {
 	usePollStore,
@@ -41,12 +41,13 @@ const closeToClosing = computed(
 	() =>
 		!poll.status.isExpired
 		&& poll.configuration.expire
-		&& moment.unix(poll.configuration.expire).diff() < 86400000,
+		&& DateTime.fromMillis(poll.configuration.expire * 1000).diffNow('hours')
+			.hours < 36,
 )
 
 const timeExpirationRelative = computed(() => {
 	if (poll.configuration.expire) {
-		return moment.unix(poll.configuration.expire).fromNow()
+		return DateTime.fromMillis(poll.configuration.expire * 1000).toRelative()
 	}
 	return t('polls', 'never')
 })
@@ -67,14 +68,16 @@ const expiryClass = computed(() => {
 	return StatusResults.Success
 })
 
-const timeCreatedRelative = computed(() =>
-	moment.unix(poll.status.created).fromNow(),
+const timeCreatedRelative = computed(
+	() => DateTime.fromMillis(poll.status.created * 1000).toRelative() as string,
 )
 
 const descriptionLine = computed(() => {
 	if (poll.status.isArchived) {
-		return t('polls', 'Archived {relativeTIme}', {
-			relativeTIme: moment.unix(poll.status.archivedDate).fromNow(),
+		return t('polls', 'Archived {relativeTime}', {
+			relativeTime: DateTime.fromMillis(
+				poll.status.archivedDate * 1000,
+			).toRelative() as string,
 		})
 	}
 	return t('polls', 'Started {relativeTime} from {ownerName}', {

src/views/Reference.vue

@@ -6,6 +6,11 @@
 <script setup lang="ts">
 import NcUserBubble from '@nextcloud/vue/components/NcUserBubble'
 import { PollsAppIcon } from '../components/AppIcons'
+import ExpirationIcon from 'vue-material-design-icons/CalendarEnd.vue'
+import BadgeSmallDiv from '../components/Base/modules/BadgeSmallDiv.vue'
+import { t } from '@nextcloud/l10n'
+import { DateTime } from 'luxon'
+import { StatusResults } from '../Types'
 
 type RichObject = {
 	id: number
@@ -16,32 +21,71 @@ type RichObject = {
 		ownerDisplayName: string
 		ownerId: string
 		url: string
+		participated: boolean
+		expiry: number
+		expired: boolean
 	}
 }
 
 interface Props {
 	richObject?: RichObject
 }
-const { richObject = null } = defineProps<Props>()
+
+const { richObject } = defineProps<Props>()
+// const expiryClass2 = (() => {
+// 	if (!richObject?.poll?.expiry) {
+// 		return ''
+// 	}
+// 	if (DateTime.fromMillis(richObject.poll.expiry * 1000).diffNow('hours').hours < 36) {
+// 		return StatusResults.Warning
+// 	}
+// 	return StatusResults.Success
+// })
+const expiryClass = richObject?.poll?.expiry
+	? DateTime.fromMillis(richObject.poll.expiry * 1000).diffNow('hours').hours < 36
+		? StatusResults.Warning
+		: StatusResults.Success
+	: ''
 </script>
 
 <template>
 	<div v-if="richObject" class="polls_widget">
 		<div class="widget_header">
 			<PollsAppIcon :size="20" class="title-icon" />
-			<span class="title">
+			<a class="title" :href="richObject.poll.url" target="_blank">
 				{{ richObject.poll.title }}
-			</span>
+			</a>
+			<BadgeSmallDiv v-if="richObject.poll.participated" class="success">
+				{{ t('polls', 'participated') }}
+			</BadgeSmallDiv>
+			<BadgeSmallDiv v-else-if="richObject.poll.expired" class="error">
+				{{ t('polls', 'closed') }}
+			</BadgeSmallDiv>
+			<BadgeSmallDiv
+				v-else-if="richObject.poll.expiry > 0"
+				:class="expiryClass">
+				<template #icon>
+					<ExpirationIcon :size="16" />
+				</template>
+				{{ DateTime.fromMillis(richObject.poll.expiry * 1000).toRelative() }}
+			</BadgeSmallDiv>
 		</div>
 		<div class="description">
 			<span class="clamped">
 				{{ richObject.poll.description }}
 			</span>
 		</div>
-		<div class="owner">
+		<div class="widget_footer">
+			<span>{{ t('polls', 'By:') }}</span>
 			<NcUserBubble
 				:user="richObject.poll.ownerId"
 				:display-name="richObject.poll.ownerDisplayName" />
+			<span
+				v-if="richObject.poll.expiry > 0 && !richObject.poll.expired"
+				class="expiration">
+				{{ t('polls', 'Ends in') }}
+				{{ DateTime.fromMillis(richObject.poll.expiry * 1000).toRelative() }}
+			</span>
 		</div>
 	</div>
 </template>
@@ -50,17 +94,25 @@ const { richObject = null } = defineProps<Props>()
 .polls_widget {
 	padding: 0.6rem;
 }
-.widget_header {
+.widget_header,
+.widget_footer {
 	display: flex;
+	column-gap: 0.3rem;
 }
 
+.badge-small {
+	flex: 0;
+}
 .polls_app_icon {
 	flex: 0 0 1.4rem;
 }
 .title {
 	flex: 1;
 	font-weight: bold;
 	padding-left: 0.6rem;
+	text-wrap: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 .description {
 	margin-left: 1.4rem;