Add ability to view status history for edited statuses

This commit is contained in:
Sean King 2022-06-20 22:52:08 -06:00
parent 1b796691b0
commit fa5d35523d
No known key found for this signature in database
GPG Key ID: 510C52BACD6E7257
12 changed files with 186 additions and 13 deletions

View File

@ -13,6 +13,7 @@ import DesktopNav from './components/desktop_nav/desktop_nav.vue'
import UserReportingModal from './components/user_reporting_modal/user_reporting_modal.vue' import UserReportingModal from './components/user_reporting_modal/user_reporting_modal.vue'
import EditStatusModal from './components/edit_status_modal/edit_status_modal.vue' import EditStatusModal from './components/edit_status_modal/edit_status_modal.vue'
import PostStatusModal from './components/post_status_modal/post_status_modal.vue' import PostStatusModal from './components/post_status_modal/post_status_modal.vue'
import StatusHistoryModal from './components/status_history_modal/status_history_modal.vue'
import GlobalNoticeList from './components/global_notice_list/global_notice_list.vue' import GlobalNoticeList from './components/global_notice_list/global_notice_list.vue'
import { windowWidth, windowHeight } from './services/window_utils/window_utils' import { windowWidth, windowHeight } from './services/window_utils/window_utils'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
@ -37,6 +38,7 @@ export default {
UserReportingModal, UserReportingModal,
PostStatusModal, PostStatusModal,
EditStatusModal, EditStatusModal,
StatusHistoryModal,
GlobalNoticeList GlobalNoticeList
}, },
data: () => ({ data: () => ({

View File

@ -53,6 +53,7 @@
<UserReportingModal /> <UserReportingModal />
<PostStatusModal /> <PostStatusModal />
<EditStatusModal /> <EditStatusModal />
<StatusHistoryModal />
<SettingsModal /> <SettingsModal />
<div id="modal" /> <div id="modal" />
<GlobalNoticeList /> <GlobalNoticeList />

View File

@ -6,7 +6,8 @@ import {
faEyeSlash, faEyeSlash,
faThumbtack, faThumbtack,
faShareAlt, faShareAlt,
faExternalLinkAlt faExternalLinkAlt,
faHistory
} from '@fortawesome/free-solid-svg-icons' } from '@fortawesome/free-solid-svg-icons'
import { import {
faBookmark as faBookmarkReg, faBookmark as faBookmarkReg,
@ -21,7 +22,8 @@ library.add(
faThumbtack, faThumbtack,
faShareAlt, faShareAlt,
faExternalLinkAlt, faExternalLinkAlt,
faFlag faFlag,
faHistory
) )
const ExtraButtons = { const ExtraButtons = {
@ -84,6 +86,20 @@ const ExtraButtons = {
visibility: this.status.visibility, visibility: this.status.visibility,
statusContentType: data.content_type statusContentType: data.content_type
})) }))
},
showStatusHistory () {
let originalStatus = {}
Object.assign(originalStatus, this.status)
delete originalStatus.attachments
delete originalStatus.created_at
delete originalStatus.emojis
delete originalStatus.text
delete originalStatus.raw_html
delete originalStatus.nsfw
delete originalStatus.poll
delete originalStatus.summary
delete originalStatus.summary_raw_html
this.$store.dispatch('openStatusHistoryModal', originalStatus)
} }
}, },
computed: { computed: {
@ -104,6 +120,9 @@ const ExtraButtons = {
}, },
statusLink () { statusLink () {
return `${this.$store.state.instance.server}${this.$router.resolve({ name: 'conversation', params: { id: this.status.id } }).href}` return `${this.$store.state.instance.server}${this.$router.resolve({ name: 'conversation', params: { id: this.status.id } }).href}`
},
isEdited () {
return this.status.edited_at !== null
} }
} }
} }

View File

@ -84,6 +84,17 @@
icon="pen" icon="pen"
/><span>{{ $t("status.edit") }}</span> /><span>{{ $t("status.edit") }}</span>
</button> </button>
<button
v-if="isEdited"
class="button-default dropdown-item dropdown-item-icon"
@click.prevent="showStatusHistory"
@click="close"
>
<FAIcon
fixed-width
icon="history"
/><span>{{ $t("status.status_history") }}</span>
</button>
<button <button
v-if="canDelete" v-if="canDelete"
class="button-default dropdown-item dropdown-item-icon" class="button-default dropdown-item dropdown-item-icon"

View File

@ -0,0 +1,60 @@
import { get } from 'lodash'
import Modal from '../modal/modal.vue'
import Status from '../status/status.vue'
const StatusHistoryModal = {
components: {
Modal,
Status
},
data () {
return {
statuses: []
}
},
computed: {
modalActivated () {
return this.$store.state.statusHistory.modalActivated
},
params () {
return this.$store.state.statusHistory.params
},
statusId () {
return this.params.id
},
historyCount () {
return this.statuses.length
},
history () {
return this.statuses
}
},
watch: {
params (newVal, oldVal) {
const newStatusId = get(newVal, 'id') !== get(oldVal, 'id')
if (newStatusId) {
this.resetHistory()
}
if (newStatusId || get(newVal, 'edited_at') !== get(oldVal, 'edited_at')) {
this.fetchStatusHistory()
}
}
},
methods: {
resetHistory () {
this.statuses = []
},
fetchStatusHistory () {
this.$store.dispatch('fetchStatusHistory', this.params)
.then(data => {
this.statuses = data
})
},
closeModal () {
this.$store.dispatch('closeStatusHistoryModal')
}
}
}
export default StatusHistoryModal

View File

@ -0,0 +1,46 @@
<template>
<Modal
v-if="modalActivated"
class="status-history-modal-view"
@backdropClicked="closeModal"
>
<div class="status-history-modal-panel panel">
<div class="panel-heading">
{{ $t('status.status_history') }} ({{ historyCount }})
</div>
<div class="panel-body">
<div
v-if="historyCount > 0"
class="history-body"
>
<status
v-for="status in history"
:key="status.id"
:statusoid="status"
:isPreview="true"
class="conversation-status status-fadein panel-body"
/>
</div>
</div>
</div>
</Modal>
</template>
<script src="./status_history_modal.js"></script>
<style lang="scss">
.modal-view.status-history-modal-view {
align-items: flex-start;
}
.status-history-modal-panel {
flex-shrink: 0;
margin-top: 25%;
margin-bottom: 2em;
width: 100%;
max-width: 700px;
@media (orientation: landscape) {
margin-top: 8%;
}
}
</style>

View File

@ -795,7 +795,8 @@
"ancestor_follow_with_icon": "{icon} {text}", "ancestor_follow_with_icon": "{icon} {text}",
"show_all_conversation_with_icon": "{icon} {text}", "show_all_conversation_with_icon": "{icon} {text}",
"show_all_conversation": "Show full conversation ({numStatus} other status) | Show full conversation ({numStatus} other statuses)", "show_all_conversation": "Show full conversation ({numStatus} other status) | Show full conversation ({numStatus} other statuses)",
"show_only_conversation_under_this": "Only show replies to this status" "show_only_conversation_under_this": "Only show replies to this status",
"status_history": "Status history"
}, },
"user_card": { "user_card": {
"approve": "Approve", "approve": "Approve",

View File

@ -19,6 +19,7 @@ import reportsModule from './modules/reports.js'
import pollsModule from './modules/polls.js' import pollsModule from './modules/polls.js'
import postStatusModule from './modules/postStatus.js' import postStatusModule from './modules/postStatus.js'
import editStatusModule from './modules/editStatus.js' import editStatusModule from './modules/editStatus.js'
import statusHistoryModule from './modules/statusHistory.js'
import chatsModule from './modules/chats.js' import chatsModule from './modules/chats.js'
@ -84,6 +85,7 @@ const persistedStateOptions = {
polls: pollsModule, polls: pollsModule,
postStatus: postStatusModule, postStatus: postStatusModule,
editStatus: editStatusModule, editStatus: editStatusModule,
statusHistory: statusHistoryModule,
chats: chatsModule chats: chatsModule
}, },
plugins, plugins,

View File

@ -0,0 +1,25 @@
const statusHistory = {
state: {
params: {},
modalActivated: false
},
mutations: {
openStatusHistoryModal (state, params) {
state.params = params
state.modalActivated = true
},
closeStatusHistoryModal (state) {
state.modalActivated = false
}
},
actions: {
openStatusHistoryModal ({ commit }, params) {
commit('openStatusHistoryModal', params)
},
closeStatusHistoryModal ({ commit }) {
commit('closeStatusHistoryModal')
}
}
}
export default statusHistory

View File

@ -606,6 +606,9 @@ const statuses = {
fetchStatusSource ({ rootState, dispatch }, status) { fetchStatusSource ({ rootState, dispatch }, status) {
return apiService.fetchStatusSource({ id: status.id, credentials: rootState.users.currentUser.credentials }) return apiService.fetchStatusSource({ id: status.id, credentials: rootState.users.currentUser.credentials })
}, },
fetchStatusHistory ({ rootState, dispatch }, status) {
return apiService.fetchStatusHistory({ status })
},
deleteStatus ({ rootState, commit }, status) { deleteStatus ({ rootState, commit }, status) {
commit('setDeleted', { status }) commit('setDeleted', { status })
apiService.deleteStatus({ id: status.id, credentials: rootState.users.currentUser.credentials }) apiService.deleteStatus({ id: status.id, credentials: rootState.users.currentUser.credentials })

View File

@ -425,17 +425,16 @@ const fetchStatusSource = ({ id, credentials }) => {
.then((data) => parseSource(data)) .then((data) => parseSource(data))
} }
const fetchStatusHistory = ({ id, credentials }) => { const fetchStatusHistory = ({ status, credentials }) => {
let url = MASTODON_STATUS_HISTORY_URL(id) let url = MASTODON_STATUS_HISTORY_URL(status.id)
return fetch(url, { headers: authHeaders(credentials) }) return promisedRequest({ url, credentials })
.then((data) => { .then((data) => {
if (data.ok) { data.reverse()
return data return data.map((item) => {
} item.originalStatus = status
throw new Error('Error fetching history', data) return parseStatus(item)
})
}) })
.then((data) => data.json())
.then((data) => parseStatus(data))
} }
const tagUser = ({ tag, credentials, user }) => { const tagUser = ({ tag, credentials, user }) => {

View File

@ -275,7 +275,7 @@ export const parseStatus = (data) => {
output.tags = data.tags output.tags = data.tags
output.is_edited = data.edited_at !== null output.edited_at = data.edited_at
if (data.pleroma) { if (data.pleroma) {
const { pleroma } = data const { pleroma } = data
@ -378,6 +378,10 @@ export const parseStatus = (data) => {
output.favoritedBy = [] output.favoritedBy = []
output.rebloggedBy = [] output.rebloggedBy = []
if (data.hasOwnProperty('originalStatus')) {
Object.assign(output, data.originalStatus)
}
return output return output
} }