jdormit/pterotype
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use correct actor field and don't fetch Fediverse avatar for users

Browse Source
This commit is contained in:
Jeremy Dormitzer 2018-11-09 22:45:17 -05:00
parent 1d68270faa
commit 9f8f0acf16
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
includes/client/comments.php
View File

@ -186,7 +186,9 @@ function traverse_reply_chain_helper( $object, $depth, $acc ) {
}
function get_avatar_filter( $avatar, $comment, $size, $default, $alt ) {
if ( ! is_object( $comment ) || ! isset( $comment->comment_ID ) ) {
if ( ! is_object( $comment )
|| ! isset( $comment->comment_ID )
|| $comment->user_id !== '0' ) {
return $avatar;
}
$comment_id = $comment->comment_ID;
@ -195,10 +197,10 @@ function get_avatar_filter( $avatar, $comment, $size, $default, $alt ) {
return $avatar;
}
$object = \pterotype\objects\get_object( $object_id );
if ( ! $object || is_wp_error( $object ) || ! array_key_exists( 'actor', $object ) ) {
if ( ! $object || is_wp_error( $object ) || ! array_key_exists( 'attributedTo', $object ) ) {
return $avatar;
}
$actor = \pterotype\util\dereference_object( $object['actor'] );
$actor = \pterotype\util\dereference_object( $object['attributedTo'] );
if ( ! $actor || is_wp_error( $actor ) || ! array_key_exists( 'icon', $actor ) ) {
return $avatar;
}