Merge pull request #8955 from annando/ignore-gcign

"gcign" is removed

diff --git a/src/Module/Admin/Federation.php b/src/Module/Admin/Federation.php
index fd60b071526b88fc65e3b8106342db0554c72548..aef8aa74932d68a0c34717857625dab8c25b7e13 100644 (file)
--- a/src/Module/Admin/Federation.php
+++ b/src/Module/Admin/Federation.php
@@ -42,6 +42,7 @@ class Federation extends BaseAdmin
                        'hubzilla'    => ['name' => 'Hubzilla/Red Matrix', 'color' => '#43488a'], // blue from the logo
                        'mastodon'    => ['name' => 'Mastodon', 'color' => '#1a9df9'], // blue from the Mastodon logo
                        'misskey'     => ['name' => 'Misskey', 'color' => '#ccfefd'], // Font color of the homepage
+                       'nextcloud'   => ['name' => 'Nextcloud', 'color' => '#1cafff'], // Logo color
                        'peertube'    => ['name' => 'Peertube', 'color' => '#ffad5c'], // One of the logo colors
                        'pixelfed'    => ['name' => 'Pixelfed', 'color' => '#11da47'], // One of the logo colors
                        'pleroma'     => ['name' => 'Pleroma', 'color' => '#E46F0F'], // Orange from the text that is used on Pleroma instances

diff --git a/src/Worker/PullDirectory.php b/src/Worker/PullDirectory.php
index af11a3fd06d74efdd6f3b3a02d36e09aa6417c40..a83b0a13be383e7615c03e17a522054c78c5f749 100644 (file)
--- a/src/Worker/PullDirectory.php
+++ b/src/Worker/PullDirectory.php
@@ -63,14 +63,19 @@ class PullDirectory
                $now = $contacts['now'] ?? 0;
                $count = $contacts['count'] ?? 0;
                $added = 0;
+               $updated = 0;
                foreach ($contacts['results'] as $url) {
-                       if (empty(Contact::getByURL($url, false, ['id']))) {
+                       $contact = Contact::getByURL($url, false, ['id']); 
+                       if (empty($contact['id'])) {
                                Worker::add(PRIORITY_LOW, 'AddContact', 0, $url);
                                ++$added;
+                       } else {
+                               Worker::add(PRIORITY_LOW, "UpdateContact", $contact['id']);
+                               ++$updated;
                        }
                }
                DI::config()->set('system', 'last-directory-sync', $now);
 
-               Logger::info('Synchronization ended.', ['now' => $now, 'count' => $count, 'added' => $added, 'directory' => $directory]);
+               Logger::info('Synchronization ended.', ['now' => $now, 'count' => $count, 'added' => $added, 'updated' => $updated, 'directory' => $directory]);
        }
 }