Merge pull request #8740 from MrPetovan/task/frio-improve-share-display

[frio] Improve share blocks display

mod/item.php

@@ -29,6 +29,7 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Item as ItemHelper;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
@@ -395,7 +396,7 @@ function item_post(App $a) {
 				}
 			}
 
-			$success = handle_tag($body, $inform, local_user() ? local_user() : $profile_uid, $tag, $network);
+			$success = ItemHelper::replaceTag($body, $inform, local_user() ? local_user() : $profile_uid, $tag, $network);
 			if ($success['replaced']) {
 				$tagged[] = $tag;
 			}
@@ -867,123 +868,3 @@ function item_content(App $a)
 
 	return $o;
 }
-
-/**
- * This function removes the tag $tag from the text $body and replaces it with
- * the appropriate link.
- *
- * @param App     $a
- * @param string  $body     the text to replace the tag in
- * @param string  $inform   a comma-seperated string containing everybody to inform
- * @param integer $profile_uid
- * @param string  $tag      the tag to replace
- * @param string  $network  The network of the post
- *
- * @return array|bool ['replaced' => $replaced, 'contact' => $contact];
- * @throws ImagickException
- * @throws HTTPException\InternalServerErrorException
- */
-function handle_tag(&$body, &$inform, $profile_uid, $tag, $network = "")
-{
-	$replaced = false;
-
-	//is it a person tag?
-	if (Tag::isType($tag, Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION)) {
-		$tag_type = substr($tag, 0, 1);
-		//is it already replaced?
-		if (strpos($tag, '[url=')) {
-			// Checking for the alias that is used for OStatus
-			$pattern = "/[@!]\[url\=(.*?)\](.*?)\[\/url\]/ism";
-			if (preg_match($pattern, $tag, $matches)) {
-				$data = Contact::getDetailsByURL($matches[1]);
-
-				if ($data["alias"] != "") {
-					$newtag = '@[url=' . $data["alias"] . ']' . $data["nick"] . '[/url]';
-				}
-			}
-
-			return $replaced;
-		}
-
-		//get the person's name
-		$name = substr($tag, 1);
-
-		// Sometimes the tag detection doesn't seem to work right
-		// This is some workaround
-		$nameparts = explode(" ", $name);
-		$name = $nameparts[0];
-
-		// Try to detect the contact in various ways
-		if (strpos($name, 'http://')) {
-			// At first we have to ensure that the contact exists
-			Contact::getIdForURL($name);
-
-			// Now we should have something
-			$contact = Contact::getDetailsByURL($name);
-		} elseif (strpos($name, '@')) {
-			// This function automatically probes when no entry was found
-			$contact = Contact::getDetailsByAddr($name);
-		} else {
-			$contact = false;
-			$fields = ['id', 'url', 'nick', 'name', 'alias', 'network', 'forum', 'prv'];
-
-			if (strrpos($name, '+')) {
-				// Is it in format @nick+number?
-				$tagcid = intval(substr($name, strrpos($name, '+') + 1));
-				$contact = DBA::selectFirst('contact', $fields, ['id' => $tagcid, 'uid' => $profile_uid]);
-			}
-
-			// select someone by nick or attag in the current network
-			if (!DBA::isResult($contact) && ($network != "")) {
-				$condition = ["(`nick` = ? OR `attag` = ?) AND `network` = ? AND `uid` = ?",
-						$name, $name, $network, $profile_uid];
-				$contact = DBA::selectFirst('contact', $fields, $condition);
-			}
-
-			//select someone by name in the current network
-			if (!DBA::isResult($contact) && ($network != "")) {
-				$condition = ['name' => $name, 'network' => $network, 'uid' => $profile_uid];
-				$contact = DBA::selectFirst('contact', $fields, $condition);
-			}
-
-			// select someone by nick or attag in any network
-			if (!DBA::isResult($contact)) {
-				$condition = ["(`nick` = ? OR `attag` = ?) AND `uid` = ?", $name, $name, $profile_uid];
-				$contact = DBA::selectFirst('contact', $fields, $condition);
-			}
-
-			// select someone by name in any network
-			if (!DBA::isResult($contact)) {
-				$condition = ['name' => $name, 'uid' => $profile_uid];
-				$contact = DBA::selectFirst('contact', $fields, $condition);
-			}
-		}
-
-		// Check if $contact has been successfully loaded
-		if (DBA::isResult($contact)) {
-			if (strlen($inform) && (isset($contact["notify"]) || isset($contact["id"]))) {
-				$inform .= ',';
-			}
-
-			if (isset($contact["id"])) {
-				$inform .= 'cid:' . $contact["id"];
-			} elseif (isset($contact["notify"])) {
-				$inform  .= $contact["notify"];
-			}
-
-			$profile = $contact["url"];
-			$newname = ($contact["name"] ?? '') ?: $contact["nick"];
-		}
-
-		//if there is an url for this persons profile
-		if (isset($profile) && ($newname != "")) {
-			$replaced = true;
-			// create profile link
-			$profile = str_replace(',', '%2c', $profile);
-			$newtag = $tag_type.'[url=' . $profile . ']' . $newname . '[/url]';
-			$body = str_replace($tag_type . $name, $newtag, $body);
-		}
-	}
-
-	return ['replaced' => $replaced, 'contact' => $contact];
-}

src/Content/Item.php

@@ -21,7 +21,10 @@
 
 namespace Friendica\Content;
 
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Model\FileTag;
+use Friendica\Model\Tag;
 
 /**
  * A content helper class for displaying items
@@ -100,4 +103,123 @@ class Item
 
 		return [$categories, $folders];
 	}
+
+	/**
+	 * This function removes the tag $tag from the text $body and replaces it with
+	 * the appropriate link.
+	 *
+	 * @param string  $body        the text to replace the tag in
+	 * @param string  $inform      a comma-seperated string containing everybody to inform
+	 * @param integer $profile_uid the user id to replace the tag for (0 = anyone)
+	 * @param string  $tag         the tag to replace
+	 * @param string  $network     The network of the post
+	 *
+	 * @return array|bool ['replaced' => $replaced, 'contact' => $contact];
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 */
+	public static function replaceTag(&$body, &$inform, $profile_uid, $tag, $network = '')
+	{
+		$replaced = false;
+
+		//is it a person tag?
+		if (Tag::isType($tag, Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION)) {
+			$tag_type = substr($tag, 0, 1);
+			//is it already replaced?
+			if (strpos($tag, '[url=')) {
+				// Checking for the alias that is used for OStatus
+				$pattern = '/[@!]\[url\=(.*?)\](.*?)\[\/url\]/ism';
+				if (preg_match($pattern, $tag, $matches)) {
+					$data = Contact::getDetailsByURL($matches[1]);
+
+					if ($data['alias'] != '') {
+						$newtag = '@[url=' . $data['alias'] . ']' . $data['nick'] . '[/url]';
+					}
+				}
+
+				return $replaced;
+			}
+
+			//get the person's name
+			$name = substr($tag, 1);
+
+			// Sometimes the tag detection doesn't seem to work right
+			// This is some workaround
+			$nameparts = explode(' ', $name);
+			$name = $nameparts[0];
+
+			// Try to detect the contact in various ways
+			if (strpos($name, 'http://')) {
+				// At first we have to ensure that the contact exists
+				Contact::getIdForURL($name);
+
+				// Now we should have something
+				$contact = Contact::getDetailsByURL($name, $profile_uid);
+			} elseif (strpos($name, '@')) {
+				// This function automatically probes when no entry was found
+				$contact = Contact::getDetailsByAddr($name, $profile_uid);
+			} else {
+				$contact = false;
+				$fields = ['id', 'url', 'nick', 'name', 'alias', 'network', 'forum', 'prv'];
+
+				if (strrpos($name, '+')) {
+					// Is it in format @nick+number?
+					$tagcid = intval(substr($name, strrpos($name, '+') + 1));
+					$contact = DBA::selectFirst('contact', $fields, ['id' => $tagcid, 'uid' => $profile_uid]);
+				}
+
+				// select someone by nick or attag in the current network
+				if (!DBA::isResult($contact) && ($network != '')) {
+					$condition = ["(`nick` = ? OR `attag` = ?) AND `network` = ? AND `uid` = ?",
+						$name, $name, $network, $profile_uid];
+					$contact = DBA::selectFirst('contact', $fields, $condition);
+				}
+
+				//select someone by name in the current network
+				if (!DBA::isResult($contact) && ($network != '')) {
+					$condition = ['name' => $name, 'network' => $network, 'uid' => $profile_uid];
+					$contact = DBA::selectFirst('contact', $fields, $condition);
+				}
+
+				// select someone by nick or attag in any network
+				if (!DBA::isResult($contact)) {
+					$condition = ["(`nick` = ? OR `attag` = ?) AND `uid` = ?", $name, $name, $profile_uid];
+					$contact = DBA::selectFirst('contact', $fields, $condition);
+				}
+
+				// select someone by name in any network
+				if (!DBA::isResult($contact)) {
+					$condition = ['name' => $name, 'uid' => $profile_uid];
+					$contact = DBA::selectFirst('contact', $fields, $condition);
+				}
+			}
+
+			// Check if $contact has been successfully loaded
+			if (DBA::isResult($contact)) {
+				if (strlen($inform) && (isset($contact['notify']) || isset($contact['id']))) {
+					$inform .= ',';
+				}
+
+				if (isset($contact['id'])) {
+					$inform .= 'cid:' . $contact['id'];
+				} elseif (isset($contact['notify'])) {
+					$inform  .= $contact['notify'];
+				}
+
+				$profile = $contact['url'];
+				$newname = ($contact['name'] ?? '') ?: $contact['nick'];
+			}
+
+			//if there is an url for this persons profile
+			if (isset($profile) && ($newname != '')) {
+				$replaced = true;
+				// create profile link
+				$profile = str_replace(',', '%2c', $profile);
+				$newtag = $tag_type.'[url=' . $profile . ']' . $newname . '[/url]';
+				$body = str_replace($tag_type . $name, $newtag, $body);
+			}
+		}
+
+		return ['replaced' => $replaced, 'contact' => $contact];
+	}
 }

src/Content/Text/BBCode.php

@@ -24,6 +24,8 @@ namespace Friendica\Content\Text;
 use DOMDocument;
 use DOMXPath;
 use Exception;
+use Friendica\Content\ContactSelector;
+use Friendica\Content\Item;
 use Friendica\Content\OEmbed;
 use Friendica\Content\Smilies;
 use Friendica\Core\Hook;
@@ -35,6 +37,7 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Event;
 use Friendica\Model\Photo;
+use Friendica\Model\Tag;
 use Friendica\Network\Probe;
 use Friendica\Object\Image;
 use Friendica\Protocol\Activity;
@@ -1073,14 +1076,21 @@ class BBCode
 			default:
 				$text = ($is_quote_share? "\n" : '');
 
+				$authorId = Contact::getIdForURL($attributes['profile']);
+
+				$contact = Contact::getById($authorId, ['network']);
+
 				$tpl = Renderer::getMarkupTemplate('shared_content.tpl');
 				$text .= Renderer::replaceMacros($tpl, [
-					'$profile' => $attributes['profile'],
+					'$profile'      => $attributes['profile'],
-					'$avatar'  => $attributes['avatar'],
+					'$avatar'       => $attributes['avatar'],
-					'$author'  => $attributes['author'],
+					'$author'       => $attributes['author'],
-					'$link'    => $attributes['link'],
+					'$link'         => $attributes['link'],
-					'$posted'  => $attributes['posted'],
+					'$link_title'   => DI::l10n()->t('link to source'),
-					'$content' => trim($content)
+					'$posted'       => $attributes['posted'],
+					'$network_name' => ContactSelector::networkToName($contact['network'], $attributes['profile']),
+					'$network_icon' => ContactSelector::networkToIcon($contact['network'], $attributes['profile']),
+					'$content'      => self::setMentions(trim($content), 0, $contact['network']),
 				]);
 				break;
 		}
@@ -2165,4 +2175,52 @@ class BBCode
 
 		return Strings::performWithEscapedBlocks($text, '#\[(?:' . implode('|', $tagList) . ').*?\[/(?:' . implode('|', $tagList) . ')]#ism', $callback);
 	}
+
+	/**
+	 * Replaces mentions in the provided message body for the provided user and network if any
+	 *
+	 * @param $body
+	 * @param $profile_uid
+	 * @param $network
+	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 */
+	public static function setMentions($body, $profile_uid = 0, $network = '')
+	{
+		BBCode::performWithEscapedTags($body, ['noparse', 'pre', 'code'], function ($body) use ($profile_uid, $network) {
+			$tags = BBCode::getTags($body);
+
+			$tagged = [];
+			$inform = '';
+
+			foreach ($tags as $tag) {
+				$tag_type = substr($tag, 0, 1);
+
+				if ($tag_type == Tag::TAG_CHARACTER[Tag::HASHTAG]) {
+					continue;
+				}
+
+				/*
+				 * If we already tagged 'Robert Johnson', don't try and tag 'Robert'.
+				 * Robert Johnson should be first in the $tags array
+				 */
+				foreach ($tagged as $nextTag) {
+					if (stristr($nextTag, $tag . ' ')) {
+						continue 2;
+					}
+				}
+
+			$success = Item::replaceTag($body, $inform, $profile_uid, $tag, $network);
+
+				if ($success['replaced']) {
+					$tagged[] = $tag;
+				}
+			}
+
+			return $body;
+		});
+
+		return $body;
+	}
 }

src/Model/Contact.php

@@ -1168,7 +1168,7 @@ class Contact
 		if (!DBA::isResult($r)) {
 			$data = Probe::uri($addr);
 
-			$profile = self::getDetailsByURL($data['url'], $uid);
+			$profile = self::getDetailsByURL($data['url'], $uid, $data);
 		} else {
 			$profile = $r[0];
 		}

src/Network/Probe.php

@@ -441,7 +441,7 @@ class Probe
 			}
 		}
 
-		if (!empty(self::$baseurl)) {
+		if (empty($data['baseurl']) && !empty(self::$baseurl)) {
 			$data['baseurl'] = self::$baseurl;
 		}
 
@@ -736,13 +736,6 @@ class Probe
 
 		Logger::log($uri." is ".$result["network"], Logger::DEBUG);
 
-		if (empty($result["baseurl"]) && ($result["network"] != Protocol::PHANTOM)) {
-			$pos = strpos($result["url"], $host);
-			if ($pos) {
-				$result["baseurl"] = substr($result["url"], 0, $pos).$host;
-			}
-		}
-
 		return $result;
 	}
 

view/global.css

@@ -180,11 +180,6 @@ span.connector {
   margin-right: 9px;
 }
 
-.shared_header span {
-  display: table-cell;
-  float: none;
-}
-
 blockquote.shared_content {
   margin-left: 32px;
   color: #000;

view/theme/frio/css/style.css

@@ -1747,19 +1747,24 @@ aside .panel-body {
 }
 
 /* wall-item content elements */
-.shared-wrapper,
+.shared-wrapper {
+	position: relative;
+	margin-top: 10px;
+	margin-bottom: 0;
+}
 .vevent {
     padding: 10px;
     box-shadow: 0 0 0 1.5px rgba(0, 0, 0, .1) inset, 0 1px 1px rgba(0, 0, 0, .05);
 }
 @media screen and (max-width: 767px) {
-    .shared-wrapper,
     .vevent {
-    margin-left: 0px;
+		margin-left: 0px;
-    margin-right: 0px;
+		margin-right: 0px;
     }
+	.shared-wrapper {
+		margin: 5px -10px 0;
+	}
 }
-.shared-wrapper:hover,
 .vevent:hover {
     box-shadow: 0 0 0 1.5px rgba(0, 0, 0, .15) inset, 0 1px 1px rgba(0, 0, 0, .05);
 }
@@ -1915,7 +1920,7 @@ code > .hl-main {
 /*
 * Comments
 */
-.well {
+wall-item-comment-wrapper.well {
     border: none;
     box-shadow: none;
     /*background-color: #ededed;*/
@@ -1923,14 +1928,14 @@ code > .hl-main {
     background-image: none;
     margin-bottom: 1px;
 }
-.well-small {
+wall-item-comment-wrapper.well-small {
     padding: 10px;
     border-radius: 3px;
 }
-.well hr {
+wall-item-comment-wrapper.well hr {
     border-top: 1px solid #d9d9d9;
 }
-.wall-entry .well {
+.wall-entry wall-item-comment-wrapper.well {
     margin-bottom: 0;
 }
 .comment-container {

view/theme/frio/templates/search_item.tpl

@@ -92,11 +92,6 @@
 
 			{{* item content *}}
 			<div class="wall-item-content {{$item.type}}" id="wall-item-content-{{$item.id}}">
-				{{* insert some space if it's an top-level post *}}
-				{{if $item.thread_level==1}}
-				<div style="height:10px;">&nbsp;</div> <!-- use padding/margin instead-->
-				{{/if}}
-
 				{{if $item.title}}
 				<span class="wall-item-title" id="wall-item-title-{{$item.id}}"><h4 class="media-heading"><a href="{{$item.plink.href}}" class="{{$item.sparkle}}">{{$item.title}}</a></h4><br /></span>
 				{{/if}}

view/theme/frio/templates/shared_content.tpl

@@ -0,0 +1,24 @@
+<div class="shared-wrapper well well-sm">
+	<div class="shared_header">
+		{{if $avatar}}
+			<a href="{{$profile}}" target="_blank" rel="noopener noreferrer" class="shared-userinfo">
+				<img src="{{$avatar}}" height="32" width="32">
+			</a>
+		{{/if}}
+		<div><a href="{{$profile}}" target="_blank" rel="noopener noreferrer" class="shared-wall-item-name"><span class="shared-author">{{$author}}</span></a></div>
+		<div class="preferences">
+			{{if $network_icon}}
+				<span class="wall-item-network"><i class="fa fa-{{$network_icon}}" title="{{$network_name}}" aria-hidden="true"></i></span>
+			{{else}}
+				<span class="wall-item-network">{{$network_name}}</span>
+			{{/if}}
+			{{if $link}}
+				<a href="{{$link}}" class="plink u-url" aria-label="{{$link_title}}" title="{{$link_title}}">
+					<i class="fa fa-external-link"></i>
+				</a>
+			{{/if}}
+		</div>
+		<div class="shared-wall-item-ago"><small><span class="shared-time">{{$posted}}</span></small></div>
+	</div>
+	<blockquote class="shared_content">{{$content nofilter}}</blockquote>
+</div>