keith
/
friendica
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12105 from MrPetovan/task/4090-move-mod-share 

Move mod/share.php to src/Module
This commit is contained in:
Philipp 2022-11-04 19:48:17 +01:00 committed by GitHub
parent 119f9d9d27 198d38545d
commit f7d42764de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 86 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
mod/share.php
View File

@ -1,51 +0,0 @@
<?php
/**
* @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
use Friendica\App;
use Friendica\Content\Text\BBCode;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Model\Post;
function share_init(App $a) {
$post_id = ((DI::args()->getArgc() > 1) ? intval(DI::args()->getArgv()[1]) : 0);
if (!$post_id || !DI::userSession()->getLocalUserId()) {
System::exit();
}
$fields = ['private', 'body', 'uri'];
$item = Post::selectFirst($fields, ['id' => $post_id]);
if (!DBA::isResult($item) || $item['private'] == Item::PRIVATE) {
System::exit();
}
$shared = DI::contentItem()->getSharedPost($item, ['uri']);
if (!empty($shared) && empty($shared['comment'])) {
$content = '[share]' . $shared['post']['uri'] . '[/share]';
} else {
$content = '[share]' . $item['uri'] . '[/share]';
}
System::httpExit($content);
}

76
src/Module/Post/Share.php Normal file
View File

@ -0,0 +1,76 @@
<?php
/**
* @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
namespace Friendica\Module\Post;
use Friendica\App;
use Friendica\Content;
use Friendica\Core\L10n;
use Friendica\Core\Session\Capability\IHandleUserSessions;
use Friendica\Core\System;
use Friendica\Model\Item;
use Friendica\Model\Post;
use Friendica\Module\Response;
use Friendica\Util\Profiler;
use Psr\Log\LoggerInterface;
/**
* Generates a share BBCode block for the provided item.
*
* Only used in Ajax calls
*/
class Share extends \Friendica\BaseModule
{
/** @var IHandleUserSessions */
private $session;
/** @var Content\Item */
private $contentItem;
public function __construct(Content\Item $contentItem, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
{
parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
$this->session = $session;
$this->contentItem = $contentItem;
}
protected function rawContent(array $request = [])
{
$post_id = $this->parameters['post_id'];
if (!$post_id || !$this->session->getLocalUserId()) {
System::httpError(403);
}
$item = Post::selectFirst(['private', 'body', 'uri'], ['id' => $post_id]);
if (!$item || $item['private'] == Item::PRIVATE) {
System::httpError(404);
}
$shared = $this->contentItem->getSharedPost($item, ['uri']);
if ($shared && empty($shared['comment'])) {
$content = '[share]' . $shared['post']['uri'] . '[/share]';
} else {
$content = '[share]' . $item['uri'] . '[/share]';
}
System::httpExit($content);
}
}

1
static/routes.config.php
View File

@ -534,6 +534,7 @@ return [
'/ping' => [Module\Notifications\Ping::class, [R::GET]],
'/post' => [
'/{post_id}/share' => [Module\Post\Share::class, [R::GET ]],
'/{item_id}/tag/add' => [Module\Post\Tag\Add::class, [ R::POST]],
'/{item_id}/tag/remove[/{tag_name}]' => [Module\Post\Tag\Remove::class, [R::GET, R::POST]],
],

2
view/templates/jot-header.tpl
View File

@ -141,7 +141,7 @@ function enableOnUser(){
if ($('#jot-popup').length != 0) $('#jot-popup').show();
$('#like-rotator-' + id).show();
$.get('share/' + id, function(data) {
$.get('post/' + id + '/share', function(data) {
if (!editor) $("#profile-jot-text").val("");
initEditor(function(){
addeditortext(data);

2
view/theme/frio/templates/jot-header.tpl
View File

@ -210,7 +210,7 @@
}
function jotShare(id) {
$.get('share/' + id, function(data) {
$.get('post/' + id + '/share', function(data) {
// remove the former content of the text input
$("#profile-jot-text").val("");
initEditor(function(){

14
view/theme/smoothly/templates/jot-header.tpl
View File

@ -168,13 +168,13 @@ function enableOnUser(){
function jotShare(id) {
$('#like-rotator-' + id).show();
$.get('share/' + id, function(data) {
if (!editor) $("#profile-jot-text").val("");
initEditor(function(){
addeditortext(data);
$('#like-rotator-' + id).hide();
$(window).scrollTop(0);
});
$.get('post/' + id + '/share', function(data) {
if (!editor) $("#profile-jot-text").val("");
initEditor(function(){
addeditortext(data);
$('#like-rotator-' + id).hide();
$(window).scrollTop(0);
});
});
}