fix: fix vcard import to generate avatars (#5193)

monicahq · May 16, 2021 · 6323a5d · 6323a5d
1 parent 16cd47e
commit 6323a5d
Showing 1 changed file with 25 additions and 1 deletion.
diff --git a/app/Services/VCard/ImportVCard.php b/app/Services/VCard/ImportVCard.php
@@ -15,7 +15,6 @@
 use App\Services\BaseService;
 use function Safe\preg_split;
 use App\Models\Contact\Gender;
-use App\Models\Contact\Address;
 use App\Models\Contact\Contact;
 use Illuminate\Validation\Rule;
 use App\Helpers\CountriesHelper;
@@ -26,7 +25,9 @@
 use App\Services\Contact\Tag\DetachTag;
 use App\Models\Contact\ContactFieldType;
 use App\Services\Contact\Tag\AssociateTag;
+use App\Jobs\Avatars\GenerateDefaultAvatar;
 use App\Services\Account\Photo\UploadPhoto;
+use App\Jobs\Avatars\GetAvatarsFromInternet;
 use App\Services\Contact\Avatar\UpdateAvatar;
 use App\Services\Contact\Address\CreateAddress;
 use App\Services\Contact\Address\UpdateAddress;
@@ -516,6 +517,8 @@ private function importEntry($contact, VCard $entry): Contact
 
  $contact->save();
 
+ $this->addAvatars($contact);
+
  return $contact;
  }
 
@@ -1060,4 +1063,25 @@ private function importCategories(Contact $contact, VCard $entry)
  ]);
  }
  }
+
+ /**
+ * Add the different default avatars.
+ *
+ * @param Contact $contact
+ * @return void
+ */
+ private function addAvatars(Contact $contact)
+ {
+ // set the default avatar color
+ if (! $contact->default_avatar_color) {
+ $contact->setAvatarColor();
+ $contact->save();
+ }
+
+ // populate the avatar from Adorable and grab the Gravatar
+ GetAvatarsFromInternet::dispatch($contact);
+
+ // also generate the default avatar
+ GenerateDefaultAvatar::dispatch($contact);
+ }
 }