mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-12-02 17:33:09 +02:00
fix(client): make note visibility inheritance behave correctly when default is set to followers-only (#9238)
* Fix post visibility * Also in the case of specified * fix Co-authored-by: tamaina <tamaina@hotmail.co.jp>
This commit is contained in:
parent
66513b9893
commit
2037c83541
1 changed files with 16 additions and 7 deletions
|
@ -262,13 +262,22 @@ if (props.channel) {
|
||||||
|
|
||||||
// 公開以外へのリプライ時は元の公開範囲を引き継ぐ
|
// 公開以外へのリプライ時は元の公開範囲を引き継ぐ
|
||||||
if (props.reply && ['home', 'followers', 'specified'].includes(props.reply.visibility)) {
|
if (props.reply && ['home', 'followers', 'specified'].includes(props.reply.visibility)) {
|
||||||
|
if (props.reply.visibility === 'home' && visibility === 'followers') {
|
||||||
|
visibility = 'followers';
|
||||||
|
} else if (['home', 'followers'].includes(props.reply.visibility) && visibility === 'specified') {
|
||||||
|
visibility = 'specified';
|
||||||
|
} else {
|
||||||
visibility = props.reply.visibility;
|
visibility = props.reply.visibility;
|
||||||
if (props.reply.visibility === 'specified') {
|
}
|
||||||
|
|
||||||
|
if (visibility === 'specified') {
|
||||||
|
if (props.reply.visibleUserIds) {
|
||||||
os.api('users/show', {
|
os.api('users/show', {
|
||||||
userIds: props.reply.visibleUserIds.filter(uid => uid !== $i.id && uid !== props.reply.userId),
|
userIds: props.reply.visibleUserIds.filter(uid => uid !== $i.id && uid !== props.reply.userId),
|
||||||
}).then(users => {
|
}).then(users => {
|
||||||
users.forEach(pushVisibleUser);
|
users.forEach(pushVisibleUser);
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
|
||||||
if (props.reply.userId !== $i.id) {
|
if (props.reply.userId !== $i.id) {
|
||||||
os.api('users/show', { userId: props.reply.userId }).then(user => {
|
os.api('users/show', { userId: props.reply.userId }).then(user => {
|
||||||
|
|
Loading…
Reference in a new issue