eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

IM/XMPP Plugin classes use throwing getParent

Browse Source
This commit is contained in:
Mikael Nordfeldth
2013-10-05 12:30:52 +02:00
parent 29de09a63d
commit 8fdc999be4
2 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/implugin.php
View File

@@ -84,7 +84,7 @@ abstract class ImPlugin extends Plugin
*
* @return boolean success value
*/
function sendNotice($screenname, $notice)
function sendNotice($screenname, Notice $notice)
{
return $this->sendMessage($screenname, $this->formatNotice($notice));
}
@@ -370,19 +370,18 @@ abstract class ImPlugin extends Plugin
* @return string plain-text version of the notice, with user nickname prefixed
*/
function formatNotice($notice)
protected function formatNotice(Notice $notice)
{
$profile = $notice->getProfile();
$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;
try {
$orig_profile = $notice->getParent()->getProfile();
$nicknames = sprintf('%1$s => %2$s', $profile->nickname, $orig_profile->nickname);
} catch (Exception $e) {
$nicknames = $profile->nickname;
}
return sprintf('%1$s: %2$s [%3$u]', $nicknames, $notice->content, $notice->id);
}
//========================UTILITY FUNCTIONS USEFUL TO IMPLEMENTATIONS - RECEIVING ========================\