Skip to content

Fix: change element for avatar to span #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
btrem wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: change element for avatar to span #74

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions lib/format.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ function format_line($channel, $date, $tz, $input, $mf=true) {
$localdate = clone $date;
$localdate->setTimeZone($tz);

$blank_avatar = '<div class="avatar" style="opacity: .20;"><img src="'.Config::$base.'/assets/user.svg" width="20" height="20"/></div>';
$blank_avatar = '<span class="avatar" style="opacity: .20;"><img src="'.Config::$base.'/assets/user.svg" width="20" height="20"/></span>';
$avatar = $blank_avatar;

if($user) {
if(property_exists($user->properties, 'photo')) {
$img = $user->properties->photo[0];
if(is_object($img) && property_exists($img, 'value'))
$img = $img->value;
$avatar = '<div class="avatar"><img src="' . htmlspecialchars(ImageProxy::url($img)) . '" width="20" height="20" class="' . ($mf ? 'u-photo' : '') . '"/></div>';
$avatar = '<span class="avatar"><img src="' . htmlspecialchars(ImageProxy::url($img)) . '" width="20" height="20" class="' . ($mf ? 'u-photo' : '') . '"/></span>';
}
$who = $avatar . '<span class="">'
. '<a href="' . @$user->properties->url[0] . '" class="author ' . ($mf ? 'p-nickname p-name u-url' : '') . '" target="_blank">' . $nick . '</a>'
Expand Down Expand Up @@ -55,7 +55,7 @@ function format_line($channel, $date, $tz, $input, $mf=true) {
if($timestamp->format('U') < strtotime('2014-01-01') && preg_match('/^https?:\/\/twitter.com\/([^ ]+) /', $line['content'], $match)) {
$line['type'] = 'twitter';
$line['content'] = str_replace(array($match[0].':: ',$match[0]), '', $line['content']);
$avatar = '<div class="avatar"><img src="' . htmlspecialchars(ImageProxy::url('https://twitter.com/' . $match[1] . '/profile_image')) . '" width="20"/></div>';
$avatar = '<span class="avatar"><img src="' . htmlspecialchars(ImageProxy::url('https://twitter.com/' . $match[1] . '/profile_image')) . '" width="20"/></span>';
$who = $avatar . '<a href="https://twitter.com/' . $match[1] . '" class="author ' . ($mf ? 'p-url' : '') . '" target="_blank">@<span class="p-name p-nickname">' . $match[1] . '</span></a>';
}

Expand All @@ -68,7 +68,7 @@ function format_line($channel, $date, $tz, $input, $mf=true) {
$id = b60to10(parse_url($permalink, PHP_URL_PATH));
$permalink = 'https://twitter.com/_/status/'.$id;
}
$avatar = '<div class="avatar"><img src="' . htmlspecialchars(ImageProxy::url('https://twitter.com/' . $match[1] . '/profile_image')) . '" width="20"/></div>';
$avatar = '<span class="avatar"><img src="' . htmlspecialchars(ImageProxy::url('https://twitter.com/' . $match[1] . '/profile_image')) . '" width="20"/></span>';
$who = $avatar . '<a href="https://twitter.com/' . $match[1] . '" class="author" target="_blank">@<span class="p-name p-nickname">' . $match[1] . '</span></a>';
}

Expand Down Expand Up @@ -206,7 +206,7 @@ function format_wiki_line($channel, $line, $match, $mf, $blank_avatar) {
$img = $user->properties->photo[0];
if(is_object($img) && property_exists($img, 'value'))
$img = $img->value;
$avatar = '<div class="avatar"><img src="' . htmlspecialchars($img) . '" width="20" height="20" class="' . ($mf ? 'u-photo' : '') . '"/></div>';
$avatar = '<span class="avatar"><img src="' . htmlspecialchars($img) . '" width="20" height="20" class="' . ($mf ? 'u-photo' : '') . '"/></span>';
} else {
$avatar = $blank_avatar;
}
Expand Down