X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsubthread.php;h=f689eca9d87e61cde8aad0663008984dfc5e26a8;hb=7072e213444a8a23da83b16cfeba37c807a54674;hp=9fa1a410d37130eff5ad646e84f840c0c1011ba5;hpb=c9cce8492e5b2607b2a092474d1de4d188b7a2c9;p=friendica.git
diff --git a/mod/subthread.php b/mod/subthread.php
index 9fa1a410d3..f689eca9d8 100644
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -2,24 +2,27 @@
/**
* @file mod/subthread.php
*/
+
use Friendica\App;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
+use Friendica\Core\Session;
use Friendica\Core\System;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Item;
+use Friendica\Protocol\Activity;
use Friendica\Util\Security;
use Friendica\Util\Strings;
use Friendica\Util\XML;
function subthread_content(App $a) {
- if (!local_user() && !remote_user()) {
+ if (!Session::isAuthenticated()) {
return;
}
- $activity = ACTIVITY_FOLLOW;
+ $activity = Activity::FOLLOW;
$item_id = (($a->argc > 1) ? Strings::escapeTags(trim($a->argv[1])) : 0);
@@ -85,9 +88,9 @@ function subthread_content(App $a) {
$uri = Item::newURI($owner_uid);
- $post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status'));
- $objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
- $link = XML::escape('' . "\n");
+ $post_type = (($item['resource-id']) ? DI::l10n()->t('photo') : DI::l10n()->t('status'));
+ $objtype = (($item['resource-id']) ? Activity\ObjectType::IMAGE : Activity\ObjectType::NOTE );
+ $link = XML::escape('' . "\n");
$body = $item['body'];
$obj = <<< EOT
@@ -101,7 +104,7 @@ function subthread_content(App $a) {
$body
EOT;
- $bodyverb = L10n::t('%1$s is following %2$s\'s %3$s');
+ $bodyverb = DI::l10n()->t('%1$s is following %2$s\'s %3$s');
if (!isset($bodyverb)) {
return;
@@ -128,7 +131,7 @@ EOT;
$ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
$alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
- $plink = '[url=' . System::baseUrl() . '/display/' . $item['guid'] . ']' . $post_type . '[/url]';
+ $plink = '[url=' . DI::baseUrl() . '/display/' . $item['guid'] . ']' . $post_type . '[/url]';
$arr['body'] = sprintf( $bodyverb, $ulink, $alink, $plink );
$arr['verb'] = $activity;