merge: upstream

This commit is contained in:
Marie 2023-12-23 14:26:24 +01:00
commit b3b89567ee
15 changed files with 80 additions and 12 deletions

View file

@ -462,7 +462,7 @@ export class NoteCreateService implements OnApplicationShutdown {
}
// Check blocking
if (this.isQuote(data)) {
if (data.renote && !this.isQuote(data)) {
if (data.renote.userHost === null) {
if (data.renote.userId !== user.id) {
const blocked = await this.userBlockingService.checkBlocked(data.renote.userId, user.id);