Index: activitystream_twitter.module
===================================================================
--- activitystream_twitter.module (revision 2799)
+++ activitystream_twitter.module (working copy)
@@ -24,7 +24,7 @@
foreach ($items as $tweet) {
$userid = $user->userid .':';
$tweet['title'] = preg_replace('/^'. $userid .' /', '', $tweet['title']);
- $tweet['body'] = activitystream_twitter_makelinks($tweet['body']);
+ $tweet['body'] = activitystream_twitter_makelinks($tweet['body'], $user->userid);
$newitems[] = $tweet;
}
return $newitems;
@@ -66,12 +66,12 @@
$node = node_load($activity->nid);
$date = theme('activitystream_date', $node->created);
$user = activitystream_user_load($node->uid);
- $title = activitystream_twitter_makelinks($node->title);
+ $title = activitystream_twitter_makelinks($node->title, $user->userid);
$name = theme('activitystream_username', $user);
return ''. theme('activitystream_twitter_icon') ." $name ". l('tweeted', $activity->link) ." \"". $title ."\" $date". l('#', 'node/'. $node->nid, array('class' => 'permalink')) .'';
}
-function activitystream_twitter_makelinks($text) {
+function activitystream_twitter_makelinks($text, $userid) {
// autolink URLS
$text = eregi_replace('(((f|ht){1}tp://)[-a-zA-Z0-9@:%_\+.~#?&//=]+)', '\\1', $text);
$text = eregi_replace('([[:space:]()[{}])(www.[-a-zA-Z0-9@:%_\+.~#?&//=]+)', '\\1\\2', $text);
@@ -79,6 +79,8 @@
$text = preg_replace('/@(\w*)/', '@\\1', $text);
// hashtags to hashtag.org
$text = preg_replace('/#(\w*)/', '#\\1', $text);
+ // link for user
+ $text = preg_replace('/^('. $userid .'):/', '$1:', $text);
return $text;
}