Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 04:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Issue 13859: Posts to a group in "Vier" is now possible (#13864)

Browse source
This commit is contained in:
Michael Vogel 2024-01-31 19:09:57 +01:00 committed by GitHub
parent fef14d96c7
commit 665316c14d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Module/Contact/Conversations.php
View file

@ -27,11 +27,13 @@ use Friendica\Contact\LocalRelationship\Repository\LocalRelationship;
use Friendica\Content\Conversation; use Friendica\Content\Conversation;
use Friendica\Content\Nav; use Friendica\Content\Nav;
use Friendica\Content\Widget; use Friendica\Content\Widget;
use Friendica\Core\ACL;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Core\Session\Capability\IHandleUserSessions; use Friendica\Core\Session\Capability\IHandleUserSessions;
use Friendica\Core\Theme; use Friendica\Core\Theme;
use Friendica\Model; use Friendica\Model;
use Friendica\Model\Contact as ModelContact;
use Friendica\Module\Contact; use Friendica\Module\Contact;
use Friendica\Module\Response; use Friendica\Module\Response;
use Friendica\Module\Security\Login; use Friendica\Module\Security\Login;
@ -109,8 +111,13 @@ class Conversations extends BaseModule
Nav::setSelected('contact'); Nav::setSelected('contact');
// We need the editor here to be able to reshare an item. $options = [
$o = $this->conversation->statusEditor([], 0, true); 'lockstate' => ACL::getLockstateForUserId($this->userSession->getLocalUserId()) ? 'lock' : 'unlock',
'acl' => ACL::getFullSelectorHTML($this->page, $this->userSession->getLocalUserId(), true, []),
'bang' => '',
'content' => ($contact['contact-type'] == ModelContact::TYPE_COMMUNITY ? '!' : '@') . ($contact['addr'] ?: $contact['url']),
];
$o = $this->conversation->statusEditor($options);
$o .= Contact::getTabsHTML($contact, Contact::TAB_CONVERSATIONS); $o .= Contact::getTabsHTML($contact, Contact::TAB_CONVERSATIONS);
$o .= Model\Contact::getThreadsFromId($contact['id'], $this->userSession->getLocalUserId(), 0, 0, $request['last_created'] ?? ''); $o .= Model\Contact::getThreadsFromId($contact['id'], $this->userSession->getLocalUserId(), 0, 0, $request['last_created'] ?? '');

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

@ -162,8 +162,6 @@ class Network extends Timeline
Nav::setSelected($this->args->get(0)); Nav::setSelected($this->args->get(0));
$content = '';
$default_permissions = []; $default_permissions = [];
if ($this->circleId) { if ($this->circleId) {
$default_permissions['allow_gid'] = [$this->circleId]; $default_permissions['allow_gid'] = [$this->circleId];
@ -195,7 +193,7 @@ class Network extends Timeline
'lockstate' => $this->circleId || $this->network || ACL::getLockstateForUserId($this->session->getLocalUserId()) ? 'lock' : 'unlock', 'lockstate' => $this->circleId || $this->network || ACL::getLockstateForUserId($this->session->getLocalUserId()) ? 'lock' : 'unlock',
'acl' => ACL::getFullSelectorHTML($this->page, $this->session->getLocalUserId(), true, $default_permissions), 'acl' => ACL::getFullSelectorHTML($this->page, $this->session->getLocalUserId(), true, $default_permissions),
'bang' => (($this->circleId || $this->network) ? '!' : ''), 'bang' => (($this->circleId || $this->network) ? '!' : ''),
'content' => $content, 'content' => '',
]; ];
$o .= $this->conversation->statusEditor($x); $o .= $this->conversation->statusEditor($x);

3
view/templates/widget/vcard.tpl
View file

@ -41,9 +41,6 @@
{{if $wallmessage_link}} {{if $wallmessage_link}}
<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li> <li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
{{/if}} {{/if}}
{{if $mention_link}}
<li><a id="mention-link" href="{{$mention_link}}">{{$mention}}</a></li>
{{/if}}
{{if $showgroup_link}} {{if $showgroup_link}}
<li><a id="showgroup-link" href="{{$showgroup_link}}">{{$showgroup}}</a></li> <li><a id="showgroup-link" href="{{$showgroup_link}}">{{$showgroup}}</a></li>
{{/if}} {{/if}}