diff options
| author | winter | 2025-01-23 19:45:02 +0000 |
|---|---|---|
| committer | winter | 2025-01-23 19:45:02 +0000 |
| commit | 18a66a2cab290a82f1099e538ae70e5e730d724d (patch) | |
| tree | a011cc2da831df11c7c4463e445532075166f781 | |
| parent | 47c16e605f1ad621537de3fea31682a5db00ff66 (diff) | |
actually don't show placeholders for blocked users's notes
| -rw-r--r-- | locale/en_GB.json | 1 | ||||
| -rw-r--r-- | templates/note_hidden.php | 3 | ||||
| -rw-r--r-- | templates/thread_page.php | 4 |
3 files changed, 1 insertions, 7 deletions
diff --git a/locale/en_GB.json b/locale/en_GB.json index ea53419..88e4abf 100644 --- a/locale/en_GB.json +++ b/locale/en_GB.json @@ -39,7 +39,6 @@ "note.privacy.scope.mutuals": "Mutuals only", "note.privacy.scope.followers": "Followers only", "note.privacy.scope.public": "Public", - "note.hidden": "Hidden note from a blocked user", "note.resharedBy": "Reshared by %s", "placeholder": "There's nothing here.", "placeholder.moreItems": "…and %d more", diff --git a/templates/note_hidden.php b/templates/note_hidden.php deleted file mode 100644 index baad0d6..0000000 --- a/templates/note_hidden.php +++ /dev/null @@ -1,3 +0,0 @@ -<article class="note hidden"> - <?php call_template('placeholder_text', ['message' => __('note.hidden')]); ?> -</article>
\ No newline at end of file diff --git a/templates/thread_page.php b/templates/thread_page.php index d16c6aa..119f879 100644 --- a/templates/thread_page.php +++ b/templates/thread_page.php @@ -10,9 +10,7 @@ call_template('skeleton', [ $notes = Note::findAllInThread($note->threadApex ?? $note); $user = UserAccount::findByCurrentSession(); foreach ($notes as $n) { - if ($user != null && $user->actor->blocks($n->author)) { - call_template('note_hidden'); - } else { + if (!($user != null && $user->actor->blocks($n->author))) { call_template('note', ['note' => $n, 'selected' => $n == $note]); } } |