norm/pleroma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications

Browse source
This commit is contained in:
dave 2019-03-31 11:03:43 -04:00
parent 783cc00dd0 0117f6af9f
commit 8efcfc69e8
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/modules/statuses.js
View file

@ -363,6 +363,15 @@ export const mutations = {
}, },
setRetweeted (state, { status, value }) { setRetweeted (state, { status, value }) {
const newStatus = state.allStatusesObject[status.id] const newStatus = state.allStatusesObject[status.id]
if (newStatus.repeated !== value) {
if (value) {
newStatus.repeat_num++
} else {
newStatus.repeat_num--
}
}
newStatus.repeated = value newStatus.repeated = value
}, },
setDeleted (state, { status }) { setDeleted (state, { status }) {

2
src/services/user_profile_link_generator/user_profile_link_generator.js
View file

@ -1,7 +1,7 @@
import { includes } from 'lodash' import { includes } from 'lodash'
const generateProfileLink = (id, screenName, restrictedNicknames) => { const generateProfileLink = (id, screenName, restrictedNicknames) => {
const complicated = (isExternal(screenName) || includes(restrictedNicknames, screenName)) const complicated = !screenName || (isExternal(screenName) || includes(restrictedNicknames, screenName))
return { return {
name: (complicated ? 'external-user-profile' : 'user-profile'), name: (complicated ? 'external-user-profile' : 'user-profile'),
params: (complicated ? { id } : { name: screenName }) params: (complicated ? { id } : { name: screenName })