kopia lustrzana https://github.com/nextcloud/social
Merge pull request #1516 from nextcloud/fix/noid/auto-accept-internal-followers
fix following internal accountpull/1183/merge
commit
15ff9b6dcb
|
@ -138,6 +138,11 @@ class FollowService {
|
||||||
$follow->setObjectId($remoteActor->getId());
|
$follow->setObjectId($remoteActor->getId());
|
||||||
$follow->setFollowId($remoteActor->getFollowers());
|
$follow->setFollowId($remoteActor->getFollowers());
|
||||||
|
|
||||||
|
if ($remoteActor->isLocal()) {
|
||||||
|
// TODO: check user's setting about locked account/auto-accept followers
|
||||||
|
$follow->setAccepted(true);
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$this->followsRequest->getByPersons($actor->getId(), $remoteActor->getId());
|
$this->followsRequest->getByPersons($actor->getId(), $remoteActor->getId());
|
||||||
} catch (FollowNotFoundException $e) {
|
} catch (FollowNotFoundException $e) {
|
||||||
|
|
|
@ -129,7 +129,6 @@ class PostService {
|
||||||
*/
|
*/
|
||||||
private function generateDocumentsFromAttachments(Note $note, Post $post) {
|
private function generateDocumentsFromAttachments(Note $note, Post $post) {
|
||||||
$documents = [];
|
$documents = [];
|
||||||
\OC::$server->getLogger()->error(var_export($_FILES["attachments"], true));
|
|
||||||
if (!isset($_FILES['attachments'])) {
|
if (!isset($_FILES['attachments'])) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
Ładowanie…
Reference in New Issue