diff --git a/build/emojis_plugin.js b/build/emojis_plugin.js index b21c10048..9872f5331 100644 --- a/build/emojis_plugin.js +++ b/build/emojis_plugin.js @@ -35,7 +35,7 @@ const getAllAccessibleAnnotations = async (projectRoot) => { }), ) ) - .filter(Boolean) + .filter((k) => k) .join(',\n') return ` diff --git a/build/update-emoji.js b/build/update-emoji.js index b2631ec6e..dd965cf66 100644 --- a/build/update-emoji.js +++ b/build/update-emoji.js @@ -3,7 +3,7 @@ import emojis from '@kazvmoe-infra/unicode-emoji-json/data-by-group.json' with { type: 'json', } -Object.keys(emojis).forEach((k) => { +Object.keys(emojis).map((k) => { emojis[k].forEach((e) => { delete e.unicode_version delete e.emoji_version diff --git a/sonar-project.properties b/sonar-project.properties index 5fae237b8..15030e3cc 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,5 +1,3 @@ sonar.projectKey=Pleroma-FE sonar.qualitygatesonar.host.url.wait=true sonar.host.url=https://sonarqube.pleroma.dev -sonar.sources=src,build,tools -sonar.tests=test diff --git a/src/api/admin.js b/src/api/admin.js index 8bbee8b4f..d4a9e8ff9 100644 --- a/src/api/admin.js +++ b/src/api/admin.js @@ -237,10 +237,10 @@ export const changeStatusScope = ({ credentials, }) => { const payload = {} - if (sensitive !== undefined) { + if (typeof sensitive !== 'undefined') { payload['sensitive'] = sensitive } - if (visibility !== undefined) { + if (typeof visibility !== 'undefined') { payload['visibility'] = visibility } @@ -260,15 +260,15 @@ export const announcementToPayload = ({ }) => { const payload = { content } - if (startsAt !== undefined) { + if (typeof startsAt !== 'undefined') { payload.starts_at = startsAt ? new Date(startsAt).toISOString() : null } - if (endsAt !== undefined) { + if (typeof endsAt !== 'undefined') { payload.ends_at = endsAt ? new Date(endsAt).toISOString() : null } - if (allDay !== undefined) { + if (typeof allDay !== 'undefined') { payload.all_day = allDay } diff --git a/src/api/chats.js b/src/api/chats.js index b212380de..5d766dec4 100644 --- a/src/api/chats.js +++ b/src/api/chats.js @@ -18,7 +18,7 @@ export const chats = ({ credentials }) => url: PLEROMA_CHATS_URL, credentials, }).then(({ data }) => ({ - data: data.map(parseChat).filter(Boolean), + data: data.map(parseChat).filter((c) => c), })) export const getOrCreateChat = ({ accountId, credentials }) => @@ -40,7 +40,7 @@ export const chatMessages = ({ method: 'GET', credentials, }).then(({ data }) => ({ - data: data.map(parseChatMessage).filter(Boolean), + data: data.map(parseChatMessage).filter((c) => c), })) } diff --git a/src/api/helpers.js b/src/api/helpers.js index 90956a4dc..cb2f2bdd5 100644 --- a/src/api/helpers.js +++ b/src/api/helpers.js @@ -37,7 +37,11 @@ export const paramsString = (params = {}) => { arrays.forEach(([k, array]) => { array.forEach((v) => { - if (typeof v === 'object' || typeof v === 'function' || v === undefined) + if ( + typeof v === 'object' || + typeof v === 'function' || + typeof v === 'undefined' + ) throw new TypeError('Array param cannot contain non-primitives!') }) }) diff --git a/src/components/announcement/announcement.js b/src/components/announcement/announcement.js index 6b45b2b90..ee427533f 100644 --- a/src/components/announcement/announcement.js +++ b/src/components/announcement/announcement.js @@ -29,8 +29,9 @@ const Announcement = { currentUser: (state) => state.users.currentUser, }), canEditAnnouncement() { - return this.currentUser?.privileges.has( - 'announcements_manage_announcements', + return ( + this.currentUser && + this.currentUser.privileges.has('announcements_manage_announcements') ) }, content() { diff --git a/src/components/announcements_page/announcements_page.js b/src/components/announcements_page/announcements_page.js index 802e90cf6..0f7933e5f 100644 --- a/src/components/announcements_page/announcements_page.js +++ b/src/components/announcements_page/announcements_page.js @@ -33,8 +33,9 @@ const AnnouncementsPage = { return useAnnouncementsStore().announcements }, canPostAnnouncement() { - return this.currentUser?.privileges.has( - 'announcements_manage_announcements', + return ( + this.currentUser && + this.currentUser.privileges.has('announcements_manage_announcements') ) }, }, diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js index 6556b07a0..f7d6ebf10 100644 --- a/src/components/attachment/attachment.js +++ b/src/components/attachment/attachment.js @@ -165,16 +165,16 @@ const Attachment = { useMediaViewerStore().setCurrentMedia(this.attachment) }, onEdit(event) { - this.edit?.(this.attachment, event) + this.edit && this.edit(this.attachment, event) }, onRemove() { - this.remove?.(this.attachment) + this.remove && this.remove(this.attachment) }, onShiftUp() { - this.shiftUp?.(this.attachment) + this.shiftUp && this.shiftUp(this.attachment) }, onShiftDn() { - this.shiftDn?.(this.attachment) + this.shiftDn && this.shiftDn(this.attachment) }, stopFlash() { this.$refs.flash.closePlayer() diff --git a/src/components/chat_message/chat_message.vue b/src/components/chat_message/chat_message.vue index 88ab2fc0a..394cce4b7 100644 --- a/src/components/chat_message/chat_message.vue +++ b/src/components/chat_message/chat_message.vue @@ -1,9 +1,9 @@ - + {{ $t('status.broken_reply') }} @@ -86,10 +83,7 @@ :user="author" /> -
+
@@ -104,6 +98,7 @@ @mouseenter="hovered = true" @mouseleave="hovered = false" > +
- +
@@ -240,10 +232,7 @@ v-else class="chat-message-date-separator" > - +
diff --git a/src/components/chat_message_list/chat_message_list.vue b/src/components/chat_message_list/chat_message_list.vue index 7833730e7..5cdbf6871 100644 --- a/src/components/chat_message_list/chat_message_list.vue +++ b/src/components/chat_message_list/chat_message_list.vue @@ -7,7 +7,7 @@ :previous-item="getPreviousItem(index)" :hovered-message-chain="chatItem.messageChainId === hoveredMessageChainId" :focused="chatItem.id === focusedId" - :replied-to="chatItem.id === repliedId" + :repliedTo="chatItem.id === repliedId" @hover="onMessageHover" @delete="onMessageDelete" @reply-requested="onReplyRequested" diff --git a/src/components/chat_view/chat_view.js b/src/components/chat_view/chat_view.js index 16b2ae1d7..f48b75c65 100644 --- a/src/components/chat_view/chat_view.js +++ b/src/components/chat_view/chat_view.js @@ -97,7 +97,7 @@ const Chat = { mounted() { window.addEventListener('resize', this.handleResize) window.addEventListener('scroll', this.handleScroll) - if (document.hidden !== undefined) { + if (typeof document.hidden !== 'undefined') { document.addEventListener( 'visibilitychange', this.handleVisibilityChange, @@ -112,7 +112,7 @@ const Chat = { unmounted() { window.removeEventListener('scroll', this.handleScroll) window.removeEventListener('resize', this.handleResize) - if (document.hidden !== undefined) + if (typeof document.hidden !== 'undefined') document.removeEventListener( 'visibilitychange', this.handleVisibilityChange, diff --git a/src/components/chat_view/chat_view.vue b/src/components/chat_view/chat_view.vue index 06862ab3c..e6bef0f84 100644 --- a/src/components/chat_view/chat_view.vue +++ b/src/components/chat_view/chat_view.vue @@ -24,7 +24,7 @@ v-if="messages[0]?.summary_raw_html" :html="messages[0].summary_raw_html" :emoji="messages[0].emojis" - /> + /> diff --git a/src/components/color_input/color_input.vue b/src/components/color_input/color_input.vue index 53396f532..d6667c28f 100644 --- a/src/components/color_input/color_input.vue +++ b/src/components/color_input/color_input.vue @@ -11,11 +11,11 @@ {{ label }}
{ } else { conversation = filter(conversation, (status) => status.type !== 'retweet') } - return conversation.filter(Boolean).sort(sortById) + return conversation.filter((_) => _).sort(sortById) } const conversation = { @@ -239,9 +239,9 @@ const conversation = { depth, }, walk(forest, forest[id], depth + 1, processed), - ].flat() + ].reduce((a, b) => a.concat(b), []) }) - .flat() + .reduce((a, b) => a.concat(b), []) const linearized = walk( threads.forest, @@ -305,10 +305,11 @@ const conversation = { topLevel() { const topLevel = this.conversation.reduce( (tl, cur) => - tl.filter((k) => - this.getReplies(cur.id) - .map((v) => v.id) - .includes(k.id), + tl.filter( + (k) => + this.getReplies(cur.id) + .map((v) => v.id) + .indexOf(k.id) === -1, ), this.conversation, ) @@ -374,7 +375,7 @@ const conversation = { return !!(this.expanded || this.isPage) }, hiddenStyle() { - const height = this.status?.virtualHeight || '120px' + const height = (this.status && this.status.virtualHeight) || '120px' return this.virtualHidden ? { height } : {} }, threadDisplayStatus() { diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 0833c4f89..170ab41d6 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -14,9 +14,9 @@ v-if="conversation[0]?.summary_raw_html" :html="conversation[0].summary_raw_html" :emoji="conversation[0].emojis" - /> + />