summaryrefslogtreecommitdiff
path: root/plugins/Comet
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Comet')
-rw-r--r--plugins/Comet/CometPlugin.php9
-rw-r--r--plugins/Comet/updatetimeline.js19
2 files changed, 24 insertions, 4 deletions
diff --git a/plugins/Comet/CometPlugin.php b/plugins/Comet/CometPlugin.php
index 48ac9dcad..0f2fcd701 100644
--- a/plugins/Comet/CometPlugin.php
+++ b/plugins/Comet/CometPlugin.php
@@ -158,6 +158,15 @@ class CometPlugin extends Plugin
$arr = $act->twitter_status_array($notice, true);
$arr['url'] = $notice->bestUrl();
$arr['html'] = htmlspecialchars($notice->rendered);
+ $arr['source'] = htmlspecialchars($arr['source']);
+
+ if (!empty($notice->reply_to)) {
+ $reply_to = Notice::staticGet('id', $notice->reply_to);
+ if (!empty($reply_to)) {
+ $arr['in_reply_to_status_url'] = $reply_to->bestUrl();
+ }
+ $reply_to = null;
+ }
$profile = $notice->getProfile();
$arr['user']['profile_url'] = $profile->profileurl;
diff --git a/plugins/Comet/updatetimeline.js b/plugins/Comet/updatetimeline.js
index e89b3bddf..170949e9b 100644
--- a/plugins/Comet/updatetimeline.js
+++ b/plugins/Comet/updatetimeline.js
@@ -54,7 +54,8 @@ var updater = function()
function makeNoticeItem(data)
{
user = data['user'];
- html = data['html'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>');
+ html = data['html'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"');
+ source = data['source'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"');
ni = "<li class=\"hentry notice\" id=\"notice-"+data['id']+"\">"+
"<div class=\"entry-title\">"+
@@ -77,9 +78,19 @@ var updater = function()
"</dl>"+
"<dl class=\"device\">"+
"<dt>From</dt> "+
- "<dd>"+data['source']+"</dd>"+
- "</dl>"+
- "</div>"+
+ "<dd>"+source+"</dd>"+ // may have a link, I think
+ "</dl>";
+
+ if (data['in_reply_to_status_id']) {
+ ni = ni+" <dl class=\"response\">"+
+ "<dt>To</dt>"+
+ "<dd>"+
+ "<a href=\""+data['in_reply_to_status_url']+"\" rel=\"in-reply-to\">in reply to</a>"+
+ "</dd>"+
+ "</dl>";
+ }
+
+ ni = ni+"</div>"+
"<div class=\"notice-options\">";
if (_userid != 0) {