Merge pull request #10807 from annando/emoji-media

[friendica.git] / src / Model / Contact.php

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index ae5c6483c7d8927cf2afc8fddc0d0175759d80ed..72145c17bd6b39054826056d7d251a91b5089fef 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -653,9 +653,9 @@ class Contact
                        'nick'        => $user['nickname'],
                        'pubkey'      => $user['pubkey'],
                        'prvkey'      => $user['prvkey'],
-                       'photo'       => User::getAvatarUrlForId($user['uid']),
-                       'thumb'       => User::getAvatarUrlForId($user['uid'], Proxy::SIZE_THUMB),
-                       'micro'       => User::getAvatarUrlForId($user['uid'], Proxy::SIZE_MICRO),
+                       'photo'       => User::getAvatarUrl($user),
+                       'thumb'       => User::getAvatarUrl($user, Proxy::SIZE_THUMB),
+                       'micro'       => User::getAvatarUrl($user, Proxy::SIZE_MICRO),
                        'blocked'     => 0,
                        'pending'     => 0,
                        'url'         => DI::baseUrl() . '/profile/' . $user['nickname'],
@@ -709,7 +709,7 @@ class Contact
                        return false;
                }
 
-               $fields = ['nickname', 'page-flags', 'account-type', 'prvkey', 'pubkey'];
+               $fields = ['uid', 'nickname', 'page-flags', 'account-type', 'prvkey', 'pubkey'];
                $user = DBA::selectFirst('user', $fields, ['uid' => $uid, 'account_expired' => false]);
                if (!DBA::isResult($user)) {
                        return false;
@@ -768,7 +768,7 @@ class Contact
                        $fields['micro'] = self::getDefaultAvatar($fields, Proxy::SIZE_MICRO);
                }
 
-               $fields['avatar'] = User::getAvatarUrlForId($uid);
+               $fields['avatar'] = User::getAvatarUrl($user);
                $fields['forum'] = $user['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
                $fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP;
                $fields['unsearchable'] = !$profile['net-publish'];
@@ -795,8 +795,8 @@ class Contact
 
                        // Update the profile
                        $fields = [
-                               'photo' => User::getAvatarUrlForId($uid),
-                               'thumb' => User::getAvatarUrlForId($uid, Proxy::SIZE_THUMB)
+                               'photo' => User::getAvatarUrl($user),
+                               'thumb' => User::getAvatarUrl($user, Proxy::SIZE_THUMB)
                        ];
 
                        DBA::update('profile', $fields, ['uid' => $uid]);
@@ -830,17 +830,17 @@ class Contact
         * Sends an unfriend message. Removes the contact for two-way unfriending or sharing only protocols (feed an mail)
         *
         * @param array   $user    User unfriending
-        * @param array   $contact Contact unfriended
+        * @param array   $contact Contact (uid != 0) unfriended
         * @param boolean $two_way Revoke eventual inbound follow as well
         * @return bool|null true if successful, false if not, null if no action was performed
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function terminateFriendship(array $user, array $contact, bool $two_way = false): bool
+       public static function terminateFriendship(array $user, array $contact): bool
        {
-               $result = Protocol::terminateFriendship($user, $contact, $two_way);
+               $result = Protocol::terminateFriendship($user, $contact);
 
-               if ($two_way || in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) {
+               if ($contact['rel'] == Contact::SHARING || in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) {
                        self::remove($contact['id']);
                } else {
                        self::update(['rel' => Contact::FOLLOWER], ['id' => $contact['id']]);
@@ -872,7 +872,11 @@ class Contact
                // A null value here means the remote network doesn't support explicit follow revocation, we can still
                // break the locally recorded relationship
                if ($result !== false) {
-                       DBA::update('contact', ['rel' => $contact['rel'] == self::FRIEND ? self::SHARING : self::NOTHING], ['id' => $contact['id']]);
+                       if ($contact['rel'] == self::FRIEND) {
+                               self::update(['rel' => self::SHARING], ['id' => $contact['id']]);
+                       } else {
+                               self::remove($contact['id']);
+                       }
                }
 
                return $result;
@@ -994,7 +998,6 @@ class Contact
                $pm_url = '';
                $status_link = '';
                $photos_link = '';
-               $contact_drop_link = '';
                $poke_link = '';
 
                if ($uid == 0) {
@@ -1046,10 +1049,6 @@ class Contact
 
                $posts_link = DI::baseUrl() . '/contact/' . $contact['id'] . '/conversations';
 
-               if (!$contact['self']) {
-                       $contact_drop_link = DI::baseUrl() . '/contact/' . $contact['id'] . '/drop?confirm=1';
-               }
-
                $follow_link = '';
                $unfollow_link = '';
                if (!$contact['self'] && Protocol::supportsFollow($contact['network'])) {
@@ -1060,10 +1059,6 @@ class Contact
                        }
                }
 
-               if (!empty($follow_link) || !empty($unfollow_link)) {
-                       $contact_drop_link = '';
-               }
-
                /**
                 * Menu array:
                 * "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ]
@@ -1083,7 +1078,6 @@ class Contact
                                'photos'  => [DI::l10n()->t('View Photos')   , $photos_link      , true],
                                'network' => [DI::l10n()->t('Network Posts') , $posts_link       , false],
                                'edit'    => [DI::l10n()->t('View Contact')  , $contact_url      , false],
-                               'drop'    => [DI::l10n()->t('Drop Contact')  , $contact_drop_link, false],
                                'pm'      => [DI::l10n()->t('Send PM')       , $pm_url           , false],
                                'poke'    => [DI::l10n()->t('Poke')          , $poke_link        , false],
                                'follow'  => [DI::l10n()->t('Connect/Follow'), $follow_link      , true],