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

Merge pull request #13681 from annando/no-events-on-raw 

Don't display additional content when the output mode is "raw"
This commit is contained in:
Hypolite Petovan 2023-11-28 10:46:30 -05:00 committed by GitHub
parent bb97539a28 405db86750
commit 61035d5007
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Module/Conversation/Channel.php
View File

@ -103,7 +103,7 @@ class Channel extends Timeline
$o .= Renderer::replaceMacros($tpl, ['$reload_uri' => $this->args->getQueryString()]);
}
if (empty($request['mode']) || ($request['mode'] != 'raw')) {
if (!$this->raw) {
$tabs = $this->getTabArray($this->channel->getTimelines($this->session->getLocalUserId()), 'channel');
$tabs = array_merge($tabs, $this->getTabArray($this->channelRepository->selectByUid($this->session->getLocalUserId()), 'channel'));
$tabs = array_merge($tabs, $this->getTabArray($this->community->getTimelines(true), 'channel'));

2
src/Module/Conversation/Community.php
View File

@ -97,7 +97,7 @@ class Community extends Timeline
$o .= Renderer::replaceMacros($tpl, ['$reload_uri' => $this->args->getQueryString()]);
}
if (empty($request['mode']) || ($request['mode'] != 'raw')) {
if (!$this->raw) {
$tabs = $this->getTabArray($this->community->getTimelines($this->session->isAuthenticated()), 'community');
$tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
$o .= Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]);

4
src/Module/Conversation/Network.php
View File

@ -157,7 +157,7 @@ class Network extends Timeline
$o .= Renderer::replaceMacros($tpl, ['$reload_uri' => $this->args->getQueryString()]);
}
if (!(isset($_GET['mode']) and ($_GET['mode'] == 'raw'))) {
if (!$this->raw) {
$o .= $this->getTabsHTML();
Nav::setSelected($this->args->get(0));
@ -210,7 +210,6 @@ class Network extends Timeline
];
$o .= $this->conversation->statusEditor($x);
}
if ($this->circleId) {
$circle = $this->database->selectFirst('group', ['name'], ['id' => $this->circleId, 'uid' => $this->session->getLocalUserId()]);
@ -235,6 +234,7 @@ class Network extends Timeline
$o .= Profile::getBirthdays($this->session->getLocalUserId());
$o .= Profile::getEventsReminderHTML($this->session->getLocalUserId(), $this->session->getPublicContactId());
}
}
try {
if ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) {

3
src/Module/Conversation/Timeline.php
View File

@ -68,6 +68,8 @@ class Timeline extends BaseModule
protected $force;
/** @var bool */
protected $update;
/** @var bool */
protected $raw;
/** @var App\Mode $mode */
protected $mode;
@ -140,6 +142,7 @@ class Timeline extends BaseModule
$this->noSharer = !empty($request['no_sharer']);
$this->force = !empty($request['force']) && !empty($request['item']);
$this->update = !empty($request['force']) && !empty($request['first_received']) && !empty($request['first_created']) && !empty($request['first_uriid']) && !empty($request['first_commented']);
$this->raw = !empty($request['mode']) && ($request['mode'] == 'raw');
}
protected function getNoSharerWidget(string $base): string