wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add in_reply_to link and make HTML in source work correctly

Browse Source
This commit is contained in:
Evan Prodromou 2009-05-01 08:39:47 -07:00
parent 1a61a171cd
commit 5affe093ab
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/Comet/CometPlugin.php
View File

@ -158,6 +158,15 @@ class CometPlugin extends Plugin
$arr = $act->twitter_status_array($notice, true); $arr = $act->twitter_status_array($notice, true);
$arr['url'] = $notice->bestUrl(); $arr['url'] = $notice->bestUrl();
$arr['html'] = htmlspecialchars($notice->rendered); $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(); $profile = $notice->getProfile();
$arr['user']['profile_url'] = $profile->profileurl; $arr['user']['profile_url'] = $profile->profileurl;

19
plugins/Comet/updatetimeline.js
View File

@ -54,7 +54,8 @@ var updater = function()
function makeNoticeItem(data) function makeNoticeItem(data)
{ {
user = data['user']; 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']+"\">"+ ni = "<li class=\"hentry notice\" id=\"notice-"+data['id']+"\">"+
"<div class=\"entry-title\">"+ "<div class=\"entry-title\">"+
@ -77,9 +78,19 @@ var updater = function()
"</dl>"+ "</dl>"+
"<dl class=\"device\">"+ "<dl class=\"device\">"+
"<dt>From</dt> "+ "<dt>From</dt> "+
"<dd>"+data['source']+"</dd>"+ "<dd>"+source+"</dd>"+ // may have a link, I think
"</dl>"+ "</dl>";
"</div>"+
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\">"; "<div class=\"notice-options\">";
if (_userid != 0) { if (_userid != 0) {