mirrors
/
semaphore
mirror of https://github.com/NickColley/semaphore.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: fix duplicate accounts in replies in Pleroma (#1592) 

fixes #1591
This commit is contained in:
Nolan Lawson 2019-10-16 18:09:19 -07:00 committed by GitHub
parent 107ad3727b
commit c13b2df6c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/routes/_actions/compose.js
View File

@ -5,14 +5,17 @@ import { addStatusOrNotification } from './addStatusOrNotification'
import { database } from '../_database/database' import { database } from '../_database/database'
import { emit } from '../_utils/eventBus' import { emit } from '../_utils/eventBus'
import { putMediaMetadata } from '../_api/media' import { putMediaMetadata } from '../_api/media'
import uniqBy from 'lodash-es/uniqBy'
export async function insertHandleForReply (statusId) { export async function insertHandleForReply (statusId) {
const { currentInstance } = store.get() const { currentInstance } = store.get()
const status = await database.getStatus(currentInstance, statusId) const status = await database.getStatus(currentInstance, statusId)
const { currentVerifyCredentials } = store.get() const { currentVerifyCredentials } = store.get()
const originalStatus = status.reblog || status const originalStatus = status.reblog || status
const accounts = [originalStatus.account].concat(originalStatus.mentions || []) let accounts = [originalStatus.account].concat(originalStatus.mentions || [])
.filter(account => account.id !== currentVerifyCredentials.id) .filter(account => account.id !== currentVerifyCredentials.id)
// Pleroma includes account in mentions as well, so make uniq https://github.com/nolanlawson/pinafore/issues/1591
accounts = uniqBy(accounts, _ => _.id)
if (!store.getComposeData(statusId, 'text') && accounts.length) { if (!store.getComposeData(statusId, 'text') && accounts.length) {
store.setComposeData(statusId, { store.setComposeData(statusId, {
text: accounts.map(account => `@${account.acct} `).join('') text: accounts.map(account => `@${account.acct} `).join('')