GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge-request 3 by pztrn, IM reply more intuitive

Browse Source
This commit is contained in:
Mikael Nordfeldth 2013-10-05 11:33:25 +02:00
commit e1b5798ba4
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/implugin.php
View File

@ -373,7 +373,16 @@ abstract class ImPlugin extends Plugin
function formatNotice($notice) function formatNotice($notice)
{ {
$profile = $notice->getProfile(); $profile = $notice->getProfile();
return $profile->nickname . ': ' . $notice->content . ' [' . $notice->id . ']'; $nicknames = $profile->nickname;
if (!empty($notice->reply_to)) {
$orig_notice = $notice->getParent();
$orig_profile = $orig_notice->getProfile();
$nicknames = $nicknames . " => " . $orig_profile->nickname;
}
common_log(LOG_INFO, "Notice: " . $notice->content, __FILE__);
$data = $nicknames . ': ' . $notice->content . ' [' . $notice->id . ']';
return $data;
} }
//========================UTILITY FUNCTIONS USEFUL TO IMPLEMENTATIONS - RECEIVING ========================\ //========================UTILITY FUNCTIONS USEFUL TO IMPLEMENTATIONS - RECEIVING ========================\

12
plugins/Xmpp/XmppPlugin.php
View File

@ -346,8 +346,18 @@ class XmppPlugin extends ImPlugin
$xs->elementStart('body', array('xmlns' => 'http://www.w3.org/1999/xhtml')); $xs->elementStart('body', array('xmlns' => 'http://www.w3.org/1999/xhtml'));
$xs->element('a', array('href' => $profile->profileurl), $xs->element('a', array('href' => $profile->profileurl),
$profile->nickname); $profile->nickname);
$xs->text(": "); if (!empty($notice->reply_to)) {
$orig_notice = Notice::getKV('id', $notice->reply_to);
$orig_profile = $orig_notice->getProfile();
$xs->text(" => ");
$xs->element('a', array('href' => $orig_profile->profileurl),
$orig_profile->nickname);
$xs->text(": ");
} else {
$xs->text(": ");
}
if (!empty($notice->rendered)) { if (!empty($notice->rendered)) {
$notice->rendered = str_replace("\t", "", $notice->rendered);
$xs->raw($notice->rendered); $xs->raw($notice->rendered);
} else { } else {
$xs->raw(common_render_content($notice->content, $notice)); $xs->raw(common_render_content($notice->content, $notice));