From 1fc0a8b33267e1c46d663b66e4176d17fbd5c0f3 Mon Sep 17 00:00:00 2001 From: Tusooa Zhu Date: Mon, 1 Aug 2022 11:08:09 -0400 Subject: [PATCH] Fix announcements lint --- src/components/announcement/announcement.js | 14 +++++++------- src/services/api/api.service.js | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/announcement/announcement.js b/src/components/announcement/announcement.js index 993e3655..1cfd3d58 100644 --- a/src/components/announcement/announcement.js +++ b/src/components/announcement/announcement.js @@ -42,7 +42,7 @@ const Announcement = { return this.formatTimeOrDate(time, localeService.internalToBrowserLocale(this.$i18n.locale)) }, startsAt () { - const time = this.announcement['starts_at'] + const time = this.announcement.starts_at if (!time) { return } @@ -50,7 +50,7 @@ const Announcement = { return this.formatTimeOrDate(time, localeService.internalToBrowserLocale(this.$i18n.locale)) }, endsAt () { - const time = this.announcement['ends_at'] + const time = this.announcement.ends_at if (!time) { return } @@ -72,13 +72,13 @@ const Announcement = { }, formatTimeOrDate (time, locale) { const d = new Date(time) - return this.announcement['all_day'] ? d.toLocaleDateString(locale) : d.toLocaleString(locale) + return this.announcement.all_day ? d.toLocaleDateString(locale) : d.toLocaleString(locale) }, enterEditMode () { - this.editedAnnouncement.content = this.announcement.pleroma['raw_content'] - this.editedAnnouncement.startsAt = this.announcement['starts_at'] - this.editedAnnouncement.endsAt = this.announcement['ends_at'] - this.editedAnnouncement.allDay = this.announcement['all_day'] + this.editedAnnouncement.content = this.announcement.pleroma.raw_content + this.editedAnnouncement.startsAt = this.announcement.starts_at + this.editedAnnouncement.endsAt = this.announcement.ends_at + this.editedAnnouncement.allDay = this.announcement.all_day this.editing = true }, submitEdit () { diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index 0d4c674a..df652ae1 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -1387,15 +1387,15 @@ const announcementToPayload = ({ content, startsAt, endsAt, allDay }) => { const payload = { content } if (typeof startsAt !== 'undefined') { - payload['starts_at'] = startsAt ? new Date(startsAt).toISOString() : null + payload.starts_at = startsAt ? new Date(startsAt).toISOString() : null } if (typeof endsAt !== 'undefined') { - payload['ends_at'] = endsAt ? new Date(endsAt).toISOString() : null + payload.ends_at = endsAt ? new Date(endsAt).toISOString() : null } if (typeof allDay !== 'undefined') { - payload['all_day'] = allDay + payload.all_day = allDay } return payload