/**
* Partial notice markup rendering step: build links to !group references.
*
- * @param string $text partially rendered HTML
- * @param Notice $notice in whose context we're working
+ * @param string $text partially rendered HTML
+ * @param Profile $author the Profile that is composing the current notice
+ * @param Notice $parent the Notice this is sent in reply to, if any
* @return string partially rendered HTML
*/
-function common_render_content($text, Notice $notice)
+function common_render_content($text, Profile $author, Notice $parent=null)
{
$text = common_render_text($text);
- $text = common_linkify_mentions($text, $notice);
+ $text = common_linkify_mentions($text, $author, $parent);
return $text;
}
*
* Should generally not be called except from common_render_content().
*
- * @param string $text partially-rendered HTML
- * @param Notice $notice in-progress or complete Notice object for context
+ * @param string $text partially-rendered HTML
+ * @param Profile $author the Profile that is composing the current notice
+ * @param Notice $parent the Notice this is sent in reply to, if any
* @return string partially-rendered HTML
*/
-function common_linkify_mentions($text, Notice $notice)
+function common_linkify_mentions($text, Profile $author, Notice $parent=null)
{
- $mentions = common_find_mentions($text, $notice);
+ $mentions = common_find_mentions($text, $author, $parent);
// We need to go through in reverse order by position,
// so our positions stay valid despite our fudging with the
$linkText = common_linkify_mention($mention);
- $text = substr_replace($text, $linkText, $position, mb_strlen($mention['text']));
+ $text = substr_replace($text, $linkText, $position, $mention['length']);
}
return $text;
return $output;
}
+function common_get_attentions($text, Profile $sender, Notice $parent=null)
+{
+ $mentions = common_find_mentions($text, $sender, $parent);
+ $atts = array();
+ foreach ($mentions as $mention) {
+ foreach ($mention['mentioned'] as $mentioned) {
+ $atts[$mentioned->getUri()] = $mentioned->getObjectType();
+ }
+ }
+ if ($parent instanceof Notice) {
+ $parentAuthor = $parent->getProfile();
+ // afaik groups can't be authors
+ $atts[$parentAuthor->getUri()] = ActivityObject::PERSON;
+ }
+ return $atts;
+}
+
/**
* Find @-mentions in the given text, using the given notice object as context.
* References will be resolved with common_relative_profile() against the user
* Note the return data format is internal, to be used for building links and
* such. Should not be used directly; rather, call common_linkify_mentions().
*
- * @param string $text
- * @param Notice $notice notice in whose context we're building links
+ * @param string $text
+ * @param Profile $sender the Profile that is sending the current text
+ * @param Notice $parent the Notice this text is in reply to, if any
*
* @return array
*
* @access private
*/
-function common_find_mentions($text, Notice $notice)
+function common_find_mentions($text, Profile $sender, Notice $parent=null)
{
- // The getProfile call throws NoProfileException on failure
- $sender = $notice->getProfile();
-
$mentions = array();
if (Event::handle('StartFindMentions', array($sender, $text, &$mentions))) {
// Get the context of the original notice, if any
- $origAuthor = null;
- $origNotice = null;
$origMentions = array();
- // Is it a reply?
-
- try {
- $origNotice = $notice->getParent();
- $origAuthor = $origNotice->getProfile();
-
- $ids = $origNotice->getReplies();
+ // Does it have a parent notice for context?
+ if ($parent instanceof Notice) {
+ $ids = $parent->getReplies(); // replied-to _profile ids_
foreach ($ids as $id) {
try {
// continue foreach
}
}
- } catch (NoParentNoticeException $e) {
- // It wasn't a reply to anything, so we can't harvest nickname-relations.
- } catch (NoResultException $e) {
- // The parent notice was deleted.
}
$matches = common_find_mentions_raw($text);
// Start with conversation context, then go to
// sender context.
- if ($origAuthor instanceof Profile && $origAuthor->nickname == $nickname) {
- $mentioned = $origAuthor;
+ if ($parent instanceof Notice && $parent->getProfile()->getNickname() === $nickname) {
+ $mentioned = $parent->getProfile();
} else if (!empty($origMentions) &&
array_key_exists($nickname, $origMentions)) {
$mentioned = $origMentions[$nickname];
} else {
+ // sets to null if no match
$mentioned = common_relative_profile($sender, $nickname);
}
if ($mentioned instanceof Profile) {
$user = User::getKV('id', $mentioned->id);
- if ($user instanceof User) {
- $url = common_local_url('userbyid', array('id' => $user->id));
- } else {
- $url = $mentioned->profileurl;
+ try {
+ $url = $mentioned->getUrl();
+ } catch (InvalidUrlException $e) {
+ $url = common_local_url('userbyid', array('id' => $mentioned->getID()));
}
$mention = array('mentioned' => array($mentioned),
'type' => 'mention',
'text' => $match[0],
'position' => $match[1],
+ 'length' => mb_strlen($match[0]),
+ 'title' => $mentioned->getFullname(),
'url' => $url);
- if (!empty($mentioned->fullname)) {
- $mention['title'] = $mentioned->fullname;
- }
-
$mentions[] = $mention;
}
}
$text, $hmatches, PREG_OFFSET_CAPTURE);
foreach ($hmatches[1] as $hmatch) {
$tag = common_canonical_tag($hmatch[0]);
- $plist = Profile_list::getByTaggerAndTag($sender->id, $tag);
+ $plist = Profile_list::getByTaggerAndTag($sender->getID(), $tag);
if (!$plist instanceof Profile_list || $plist->private) {
continue;
}
'type' => 'list',
'text' => $hmatch[0],
'position' => $hmatch[1],
+ 'length' => mb_strlen($hmatch[0]),
'url' => $url);
}
'type' => 'group',
'text' => $hmatch[0],
'position' => $hmatch[1],
+ 'length' => mb_strlen($hmatch[0]),
'url' => $group->permalink(),
'title' => $group->getFancyName());
}
} else {
$canon = File_redirection::_canonUrl($url);
$longurl_data = File_redirection::where($canon, common_config('attachments', 'process_links'));
- $longurl = $longurl_data->url;
+
+ if(isset($longurl_data->redir_url)) {
+ $longurl = $longurl_data->redir_url;
+ } else {
+ // e.g. local files
+ $longurl = $longurl_data->url;
+ }
}
-
- $attrs = array('href' => $canon, 'title' => $longurl);
+
+ $attrs = array('href' => $longurl, 'title' => $longurl);
$is_attachment = false;
$attachment_id = null;
// Check to see whether this is a known "attachment" URL.
- $f = File::getKV('url', $longurl);
-
- if (!$f instanceof File) {
+ try {
+ $f = File::getByUrl($longurl);
+ } catch (NoResultException $e) {
if (common_config('attachments', 'process_links')) {
// XXX: this writes to the database. :<
try {
projects / quix0rs-gnu-social.git / blobdiff