Channel frontend added
This commit is contained in:
Michael
parent
1ec8b62b58
commit
42e22ed91b
|
|
@ -61,6 +61,18 @@ class Channel extends \Friendica\BaseRepository
|
||||||
return $this->exists(['id' => $id, 'uid' => $uid]);
|
return $this->exists(['id' => $id, 'uid' => $uid]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Delete the given channel
|
||||||
|
*
|
||||||
|
* @param integer $id
|
||||||
|
* @param integer $uid
|
||||||
|
* @return boolean
|
||||||
|
*/
|
||||||
|
public function deleteById(int $id, int $uid): bool
|
||||||
|
{
|
||||||
|
return $this->db->delete('channel', ['id' => $id, 'uid' => $uid]);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fetch all user channels
|
* Fetch all user channels
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,170 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (C) 2010-2023, 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\Settings;
|
||||||
|
|
||||||
|
use Friendica\App;
|
||||||
|
use Friendica\Content\Conversation\Factory\Timeline;
|
||||||
|
use Friendica\Content\Conversation\Repository\Channel;
|
||||||
|
use Friendica\Core\L10n;
|
||||||
|
use Friendica\Core\Renderer;
|
||||||
|
use Friendica\Core\Session\Capability\IHandleUserSessions;
|
||||||
|
use Friendica\Module\BaseSettings;
|
||||||
|
use Friendica\Module\Response;
|
||||||
|
use Friendica\Network\HTTPException;
|
||||||
|
use Friendica\Util\Profiler;
|
||||||
|
use Psr\Log\LoggerInterface;
|
||||||
|
|
||||||
|
class Channels extends BaseSettings
|
||||||
|
{
|
||||||
|
/** @var Channel */
|
||||||
|
private $channel;
|
||||||
|
/** @var Timeline */
|
||||||
|
private $timeline;
|
||||||
|
|
||||||
|
public function __construct(Timeline $timeline, Channel $channel, App\Page $page, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
|
||||||
|
{
|
||||||
|
parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
|
||||||
|
|
||||||
|
$this->timeline = $timeline;
|
||||||
|
$this->channel = $channel;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function post(array $request = [])
|
||||||
|
{
|
||||||
|
$uid = $this->session->getLocalUserId();
|
||||||
|
if (!$uid) {
|
||||||
|
throw new HTTPException\ForbiddenException($this->t('Permission denied.'));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (empty($request['edit_channel']) && empty($request['add_channel'])) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
self::checkFormSecurityTokenRedirectOnError('/settings/channels', 'settings_channels');
|
||||||
|
|
||||||
|
if (!empty($request['add_channel'])) {
|
||||||
|
$channel = $this->timeline->createFromTableRow([
|
||||||
|
'label' => $request['new_label'],
|
||||||
|
'description' => $request['new_description'],
|
||||||
|
'access-key' => substr(mb_strtolower($request['new_access_key']), 0, 1),
|
||||||
|
'uid' => $uid,
|
||||||
|
'include-tags' => $this->cleanTags($request['new_include_tags']),
|
||||||
|
'exclude-tags' => $this->cleanTags($request['new_exclude_tags']),
|
||||||
|
'full-text-search' => null, // Currently not supported for performance reasons
|
||||||
|
'media-type' => ($request['new_image'] ? 1 : 0) | ($request['new_video'] ? 2 : 0) | ($request['new_audio'] ? 4 : 0),
|
||||||
|
]);
|
||||||
|
$saved = $this->channel->save($channel);
|
||||||
|
$this->logger->debug('New channel added', ['saved' => $saved]);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (array_keys($request['label']) as $id) {
|
||||||
|
if ($request['delete'][$id]) {
|
||||||
|
$success = $this->channel->deleteById($id, $uid);
|
||||||
|
$this->logger->debug('Channel deleted', ['id' => $id, 'success' => $success]);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$channel = $this->timeline->createFromTableRow([
|
||||||
|
'id' => $id,
|
||||||
|
'label' => $request['label'][$id],
|
||||||
|
'description' => $request['description'][$id],
|
||||||
|
'access-key' => substr(mb_strtolower($request['access_key'][$id]), 0, 1),
|
||||||
|
'uid' => $uid,
|
||||||
|
'include-tags' => $this->cleanTags($request['include_tags'][$id]),
|
||||||
|
'exclude-tags' => $this->cleanTags($request['exclude_tags'][$id]),
|
||||||
|
'full-text-search' => null, // Currently not supported for performance reasons
|
||||||
|
'media-type' => ($request['image'][$id] ? 1 : 0) | ($request['video'][$id] ? 2 : 0) | ($request['audio'][$id] ? 4 : 0),
|
||||||
|
]);
|
||||||
|
$saved = $this->channel->save($channel);
|
||||||
|
$this->logger->debug('Save channel', ['id' => $id, 'saved' => $saved]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->baseUrl->redirect('/settings/channels');
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function content(array $request = []): string
|
||||||
|
{
|
||||||
|
parent::content();
|
||||||
|
|
||||||
|
$uid = $this->session->getLocalUserId();
|
||||||
|
if (!$uid) {
|
||||||
|
throw new HTTPException\ForbiddenException($this->t('Permission denied.'));
|
||||||
|
}
|
||||||
|
|
||||||
|
$blocklistform = [];
|
||||||
|
foreach ($this->channel->selectByUid($uid) as $channel) {
|
||||||
|
$blocklistform[] = [
|
||||||
|
'label' => ["label[$channel->code]", $this->t('Label'), $channel->label, '', $this->t('Required')],
|
||||||
|
'description' => ["description[$channel->code]", $this->t("Description"), $channel->description],
|
||||||
|
'access_key' => ["access_key[$channel->code]", $this->t("Access Key"), $channel->accessKey],
|
||||||
|
'include_tags' => ["include_tags[$channel->code]", $this->t("Include Tags"), $channel->includeTags],
|
||||||
|
'exclude_tags' => ["exclude_tags[$channel->code]", $this->t("Exclude Tags"), $channel->excludeTags],
|
||||||
|
'image' => ["image[$channel->code]", $this->t("Images"), $channel->mediaType & 1],
|
||||||
|
'video' => ["video[$channel->code]", $this->t("Videos"), $channel->mediaType & 2],
|
||||||
|
'audio' => ["audio[$channel->code]", $this->t("Audio"), $channel->mediaType & 4],
|
||||||
|
'delete' => ["delete[$channel->code]", $this->t("Delete channel") . ' (' . $channel->label . ')', false, $this->t("Check to delete this entry from the channel list")]
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
$t = Renderer::getMarkupTemplate('settings/channels.tpl');
|
||||||
|
return Renderer::replaceMacros($t, [
|
||||||
|
'label' => ["new_label", $this->t('Label'), '', $this->t('Short name for the channel. It is displayed on the channels widget.'), $this->t('Required')],
|
||||||
|
'description' => ["new_description", $this->t("Description"), '', $this->t('This should describe the content of the channel in a few word.')],
|
||||||
|
'access_key' => ["new_access_key", $this->t("Access Key"), '', $this->t('When you want to access this channel via an access key, you can define it here. Pay attentioon to not use an already used one.')],
|
||||||
|
'include_tags' => ["new_include_tags", $this->t("Include Tags"), '', $this->t('Comma separated list of tags. A post will be used when it contains any of the listed tags.')],
|
||||||
|
'exclude_tags' => ["new_exclude_tags", $this->t("Exclude Tags"), '', $this->t('Comma separated list of tags. If a post contain any of these tags, then it will not be part of nthis channel.')],
|
||||||
|
'image' => ['new_image', $this->t("Images"), false, $this->t("Check to display images in the channel.")],
|
||||||
|
'video' => ["new_video", $this->t("Videos"), false, $this->t("Check to display videos in the channel.")],
|
||||||
|
'audio' => ["new_audio", $this->t("Audio"), false, $this->t("Check to display audio in the channel.")],
|
||||||
|
'$l10n' => [
|
||||||
|
'title' => $this->t('Channels'),
|
||||||
|
'intro' => $this->t('This page can be used to define your own channels.'),
|
||||||
|
'addtitle' => $this->t('Add new entry to the channel list'),
|
||||||
|
'addsubmit' => $this->t('Add'),
|
||||||
|
'savechanges' => $this->t('Save'),
|
||||||
|
'currenttitle' => $this->t('Current Entries in the channel list'),
|
||||||
|
'thurl' => $this->t('Blocked server domain pattern'),
|
||||||
|
'threason' => $this->t('Reason for the block'),
|
||||||
|
'delentry' => $this->t('Delete entry from the channel list'),
|
||||||
|
'confirm_delete' => $this->t('Delete entry from the channel list?'),
|
||||||
|
],
|
||||||
|
'$entries' => $blocklistform,
|
||||||
|
'$baseurl' => $this->baseUrl,
|
||||||
|
|
||||||
|
'$form_security_token' => self::getFormSecurityToken('settings_channels'),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function cleanTags(string $tag_list): string
|
||||||
|
{
|
||||||
|
$tags = [];
|
||||||
|
$tagitems = explode(',', mb_strtolower($tag_list));
|
||||||
|
foreach ($tagitems as $tag) {
|
||||||
|
$tag = trim($tag, '# ');
|
||||||
|
if (!empty($tag)) {
|
||||||
|
$tags[] = $tag;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return implode(',', $tags);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -651,6 +651,7 @@ return [
|
||||||
'/{open}' => [Module\Settings\Account::class, [R::GET, R::POST]],
|
'/{open}' => [Module\Settings\Account::class, [R::GET, R::POST]],
|
||||||
],
|
],
|
||||||
'/addons[/{addon}]' => [Module\Settings\Addons::class, [R::GET, R::POST]],
|
'/addons[/{addon}]' => [Module\Settings\Addons::class, [R::GET, R::POST]],
|
||||||
|
'/channels' => [Module\Settings\Channels::class, [R::GET, R::POST]],
|
||||||
'/connectors[/{connector}]' => [Module\Settings\Connectors::class, [R::GET, R::POST]],
|
'/connectors[/{connector}]' => [Module\Settings\Connectors::class, [R::GET, R::POST]],
|
||||||
'/delegation[/{action}/{user_id}]' => [Module\Settings\Delegation::class, [R::GET, R::POST]],
|
'/delegation[/{action}/{user_id}]' => [Module\Settings\Delegation::class, [R::GET, R::POST]],
|
||||||
'/display' => [Module\Settings\Display::class, [R::GET, R::POST]],
|
'/display' => [Module\Settings\Display::class, [R::GET, R::POST]],
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,41 @@
|
||||||
|
<div class="generic-page-wrapper">
|
||||||
|
<h1>{{$l10n.title}}</h1>
|
||||||
|
<p>{{$l10n.intro}}</p>
|
||||||
|
<h2>{{$l10n.addtitle}}</h2>
|
||||||
|
<form action="{{$baseurl}}/settings/channels" method="post">
|
||||||
|
<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
|
||||||
|
{{include file="field_input.tpl" field=$label}}
|
||||||
|
{{include file="field_input.tpl" field=$description}}
|
||||||
|
{{include file="field_input.tpl" field=$access_key}}
|
||||||
|
{{include file="field_input.tpl" field=$include_tags}}
|
||||||
|
{{include file="field_input.tpl" field=$exclude_tags}}
|
||||||
|
{{include file="field_checkbox.tpl" field=$image}}
|
||||||
|
{{include file="field_checkbox.tpl" field=$video}}
|
||||||
|
{{include file="field_checkbox.tpl" field=$audio}}
|
||||||
|
<div class="submit">
|
||||||
|
<button type="submit" class="btn btn-primary" name="add_channel" value="{{$l10n.addsubmit}}">{{$l10n.addsubmit}}</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
{{if $entries}}
|
||||||
|
<h2>{{$l10n.currenttitle}}</h2>
|
||||||
|
<form action="{{$baseurl}}/settings/channels" method="post">
|
||||||
|
<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
|
||||||
|
{{foreach $entries as $e}}
|
||||||
|
{{include file="field_input.tpl" field=$e.label}}
|
||||||
|
{{include file="field_input.tpl" field=$e.description}}
|
||||||
|
{{include file="field_input.tpl" field=$e.access_key}}
|
||||||
|
{{include file="field_input.tpl" field=$e.include_tags}}
|
||||||
|
{{include file="field_input.tpl" field=$e.exclude_tags}}
|
||||||
|
{{include file="field_checkbox.tpl" field=$e.image}}
|
||||||
|
{{include file="field_checkbox.tpl" field=$e.video}}
|
||||||
|
{{include file="field_checkbox.tpl" field=$e.audio}}
|
||||||
|
{{include file="field_checkbox.tpl" field=$e.delete}}
|
||||||
|
<hr>
|
||||||
|
{{/foreach}}
|
||||||
|
<div class="submit">
|
||||||
|
<button type="submit" class="btn btn-primary" name="edit_channel" value="{{$l10n.savechanges}}">{{$l10n.savechanges}}</button>
|
||||||
|
</div>
|
||||||
|
{{/if}}
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
Loading…
Reference in New Issue
Block a user