Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

#436: add dismiss button, disable is_seen part

Browse source
This commit is contained in:
dave 2019-03-13 14:08:03 -04:00
parent cd9a7dd488
commit 2f7d890ad2
5 changed files with 68 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
src/components/notification/notification.vue
View file

@ -1,57 +1,54 @@
<template> <template>
<div class="notification-item"> <status
<button @click.prevent="dismiss" class="btn-dismiss">{{$t("notifications.dismiss")}}</button> v-if="notification.type === 'mention'"
<status v-if="notification.type === 'mention'" :compact="true" :statusoid="notification.status"></status> :compact="true"
<div class="non-mention" :class="[userClass, { highlighted: userStyle }]" :style="[ userStyle ]"v-else> :statusoid="notification.status"
<a class='avatar-container' :href="notification.action.user.statusnet_profile_url" @click.stop.prevent.capture="toggleUserExpanded"> isNotification="true"
<UserAvatar :compact="true" :betterShadow="betterShadow" :src="notification.action.user.profile_image_url_original"/> @dismissNotification="dismiss"
</a> >
<div class='notification-right'> </status>
<UserCard :user="notification.action.user" :rounded="true" :bordered="true" v-if="userExpanded"/> <div class="non-mention" :class="[userClass, { highlighted: userStyle }]" :style="[ userStyle ]"v-else>
<span class="notification-details"> <a class='avatar-container' :href="notification.action.user.statusnet_profile_url" @click.stop.prevent.capture="toggleUserExpanded">
<div class="name-and-action"> <UserAvatar :compact="true" :betterShadow="betterShadow" :src="notification.action.user.profile_image_url_original"/>
<span class="username" v-if="!!notification.action.user.name_html" :title="'@'+notification.action.user.screen_name" v-html="notification.action.user.name_html"></span> </a>
<span class="username" v-else :title="'@'+notification.action.user.screen_name">{{ notification.action.user.name }}</span> <div class='notification-right'>
<span v-if="notification.type === 'like'"> <UserCard :user="notification.action.user" :rounded="true" :bordered="true" v-if="userExpanded"/>
<i class="fa icon-star lit"></i> <span class="notification-details">
<small>{{$t('notifications.favorited_you')}}</small> <div class="name-and-action">
</span> <span class="username" v-if="!!notification.action.user.name_html" :title="'@'+notification.action.user.screen_name" v-html="notification.action.user.name_html"></span>
<span v-if="notification.type === 'repeat'"> <span class="username" v-else :title="'@'+notification.action.user.screen_name">{{ notification.action.user.name }}</span>
<i class="fa icon-retweet lit" :title="$t('tool_tip.repeat')"></i> <span v-if="notification.type === 'like'">
<small>{{$t('notifications.repeated_you')}}</small> <i class="fa icon-star lit"></i>
</span> <small>{{$t('notifications.favorited_you')}}</small>
<span v-if="notification.type === 'follow'"> </span>
<i class="fa icon-user-plus lit"></i> <span v-if="notification.type === 'repeat'">
<small>{{$t('notifications.followed_you')}}</small> <i class="fa icon-retweet lit" :title="$t('tool_tip.repeat')"></i>
</span> <small>{{$t('notifications.repeated_you')}}</small>
</div> </span>
<div class="timeago"> <span v-if="notification.type === 'follow'">
<router-link v-if="notification.status" :to="{ name: 'conversation', params: { id: notification.status.id } }" class="faint-link"> <i class="fa icon-user-plus lit"></i>
<timeago :since="notification.action.created_at" :auto-update="240"></timeago> <small>{{$t('notifications.followed_you')}}</small>
</router-link> </span>
</div> </div>
</span> <div class="timeago">
<div class="follow-text" v-if="notification.type === 'follow'"> <router-link v-if="notification.status" :to="{ name: 'conversation', params: { id: notification.status.id } }" class="faint-link">
<router-link :to="userProfileLink(notification.action.user)"> <timeago :since="notification.action.created_at" :auto-update="240"></timeago>
@{{notification.action.user.screen_name}}
</router-link> </router-link>
</div> </div>
<template v-else> <span class="button-icon" @click.prevent="dismiss">
<status class="faint" :compact="true" :statusoid="notification.status" :noHeading="true"></status> <i class="button-icon icon-cancel delete-status"></i>
</template> </span>
</span>
<div class="follow-text" v-if="notification.type === 'follow'">
<router-link :to="userProfileLink(notification.action.user)">
@{{notification.action.user.screen_name}}
</router-link>
</div> </div>
<template v-else>
<status class="faint" :compact="true" :statusoid="notification.status" :noHeading="true"></status>
</template>
</div> </div>
</div> </div>
</template> </template>
<script src="./notification.js"></script> <script src="./notification.js"></script>
<style lang="scss">
@import '../../_variables.scss';
.notification-item {
display: flex;
flex: 1;
flex-direction: column;
}
</style>

6
src/components/status/status.js
View file

@ -25,7 +25,8 @@ const Status = {
'replies', 'replies',
'isPreview', 'isPreview',
'noHeading', 'noHeading',
'inlineExpanded' 'inlineExpanded',
'isNotification'
], ],
data () { data () {
return { return {
@ -365,6 +366,9 @@ const Status = {
setMedia () { setMedia () {
const attachments = this.attachmentSize === 'hide' ? this.status.attachments : this.galleryAttachments const attachments = this.attachmentSize === 'hide' ? this.status.attachments : this.galleryAttachments
return () => this.$store.dispatch('setMedia', attachments) return () => this.$store.dispatch('setMedia', attachments)
},
dismissNotification () {
this.$emit('dismissNotification')
} }
}, },
watch: { watch: {

3
src/components/status/status.vue
View file

@ -52,6 +52,9 @@
<a :href="status.external_url" target="_blank" v-if="!status.is_local && !isPreview" class="source_url" title="Source"> <a :href="status.external_url" target="_blank" v-if="!status.is_local && !isPreview" class="source_url" title="Source">
<i class="button-icon icon-link-ext-alt"></i> <i class="button-icon icon-link-ext-alt"></i>
</a> </a>
<span class="button-icon" v-if="isNotification" @click.prevent="dismissNotification">
<i class="button-icon icon-cancel delete-status"></i>
</span>
<template v-if="expandable && !isPreview"> <template v-if="expandable && !isPreview">
<a href="#" @click.prevent="toggleExpanded" title="Expand"> <a href="#" @click.prevent="toggleExpanded" title="Expand">
<i class="button-icon icon-plus-squared"></i> <i class="button-icon icon-plus-squared"></i>

6
src/services/entity_normalizer/entity_normalizer.service.js
View file

@ -65,8 +65,7 @@ export const parseUser = (data) => {
output.muted = pleroma.muted output.muted = pleroma.muted
} }
// Missing, trying to recover // TODO: handle is_local
output.is_local = !output.screen_name.includes('@')
} else { } else {
output.screen_name = data.screen_name output.screen_name = data.screen_name
@ -179,8 +178,7 @@ export const parseStatus = (data) => {
output.summary_html = data.spoiler_text output.summary_html = data.spoiler_text
output.external_url = data.url output.external_url = data.url
// FIXME missing!! // TODO: handle is_local
output.is_local = false
} else { } else {
output.favorited = data.favorited output.favorited = data.favorited
output.fave_num = data.fave_num output.fave_num = data.fave_num

22
src/services/notifications_fetcher/notifications_fetcher.service.js
View file

@ -16,17 +16,21 @@ const fetchAndUpdate = ({store, credentials, older = false}) => {
args['until'] = timelineData.minId args['until'] = timelineData.minId
} }
} else { } else {
// load unread notifications repeadedly to provide consistency between browser tabs if (timelineData.maxId !== Number.POSITIVE_INFINITY) {
const notifications = timelineData.data
const unread = notifications.filter(n => !n.seen).map(n => n.id)
if (!unread.length) {
args['since'] = timelineData.maxId args['since'] = timelineData.maxId
} else {
args['since'] = Math.min(...unread) - 1
if (timelineData.maxId !== Math.max(...unread)) {
args['until'] = Math.max(...unread, args['since'] + 20)
}
} }
// # disabled until is_seen is impelented on the BE
// load unread notifications repeadedly to provide consistency between browser tabs
// const notifications = timelineData.data
// const unread = notifications.filter(n => !n.seen).map(n => n.id)
// if (!unread.length) {
// args['since'] = timelineData.maxId
// } else {
// args['since'] = Math.min(...unread) - 1
// if (timelineData.maxId !== Math.max(...unread)) {
// args['until'] = Math.max(...unread, args['since'] + 20)
// }
// }
} }
args['timeline'] = 'notifications' args['timeline'] = 'notifications'