diff --git a/src/Module/About.php b/src/Module/About.php new file mode 100644 index 000000000..dd58450fb --- /dev/null +++ b/src/Module/About.php @@ -0,0 +1,35 @@ +. + * + */ + +namespace Friendica\Module; + +use Friendica\BaseModule; + +/** + * Redirect to the friendica page + */ +class About extends BaseModule +{ + protected function rawContent(array $request = []) + { + $this->baseUrl->redirect('friendica'); + } +} diff --git a/src/Module/Api/Twitter/Statuses/Update.php b/src/Module/Api/Twitter/Statuses/Update.php index d071675e8..5f01de59a 100644 --- a/src/Module/Api/Twitter/Statuses/Update.php +++ b/src/Module/Api/Twitter/Statuses/Update.php @@ -49,6 +49,8 @@ class Update extends BaseApi self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); + $owner = User::getOwnerDataById($uid); + $request = self::getRequest([ 'htmlstatus' => '', 'status' => '', @@ -59,10 +61,12 @@ class Update extends BaseApi 'media_ids' => '', 'source' => '', 'include_entities' => false, + 'contact_allow' => $owner['allow_cid'], + 'group_allow' => $owner['allow_gid'], + 'contact_deny' => $owner['deny_cid'], + 'group_deny' => $owner['deny_gid'], ], $request); - $owner = User::getOwnerDataById($uid); - if (!empty($request['htmlstatus'])) { $body = HTML::toBBCodeVideo($request['htmlstatus']); @@ -96,10 +100,11 @@ class Update extends BaseApi $item['coord'] = sprintf("%s %s", $request['lat'], $request['long']); } - $item['allow_cid'] = $owner['allow_cid'] ?? ''; - $item['allow_gid'] = $owner['allow_gid'] ?? ''; - $item['deny_cid'] = $owner['deny_cid'] ?? ''; - $item['deny_gid'] = $owner['deny_gid'] ?? ''; + $aclFormatter = DI::aclFormatter(); + $item['allow_cid'] = $aclFormatter->toString($request['contact_allow']); + $item['allow_gid'] = $aclFormatter->toString($request['group_allow']); + $item['deny_cid'] = $aclFormatter->toString($request['contact_deny']); + $item['deny_gid'] = $aclFormatter->toString($request['group_deny']); if (!empty($item['allow_cid'] . $item['allow_gid'] . $item['deny_cid'] . $item['deny_gid'])) { $item['private'] = Item::PRIVATE; diff --git a/static/routes.config.php b/static/routes.config.php index e3c87f150..70d230c2a 100644 --- a/static/routes.config.php +++ b/static/routes.config.php @@ -318,7 +318,7 @@ return [ '/proofs' => [Module\Api\Mastodon\Proofs::class, [R::GET ]], // Dummy, not supported ], - '/about[/more]' => [Module\Friendica::class, [R::GET]], + '/about[/more]' => [Module\About::class, [R::GET]], '/admin' => [ '[/]' => [Module\Admin\Summary::class, [R::GET]],