Merge master into federation #48

Manually merged
nutomic merged 120 commits from merge-master into federation 2020-06-09 18:07:02 +00:00
1 changed files with 1 additions and 4 deletions
Showing only changes of commit 9155469e8a - Show all commits

View File

@ -163,10 +163,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
if (isImage(post.url)) {
if (post.url.includes('pictshare')) {
return pictshareImage(post.url, thumbnail);
} else if (
post.thumbnail_url &&
post.thumbnail_url.includes('pictshare')
) {
} else if (post.thumbnail_url) {
return pictshareImage(post.thumbnail_url, thumbnail);
} else {
return post.url;