Merge pull request #6726 from MrPetovan/task/6676-fix-implicit-mentions

Fix last batch of implicit mentions issues

diff --combined src/Model/Contact.php
index bf7d806db96a1c51fd4c2d069a8cf7cbe1f0aec4,5f63d89d0f974243d6f2ea7de78212c8ce14e54e..6e83b76e6fe3024cb139fa7ccb9c6d4123a9f62b
--- 1/src/Model/Contact.php
--- 2/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@@ -232,11 -232,6 +232,11 @@@ class Contact extends BaseObjec
                }
  
                DBA::update('user-contact', ['blocked' => $blocked], ['cid' => $cdata['public'], 'uid' => $uid], true);
 +
 +              if ($blocked) {
 +                      // Blocked contact can't be in any group
 +                      self::removeFromGroups($cid);
 +              }
        }
  
        /**
@@@ -2189,7 -2184,7 +2189,7 @@@
        {
                $contact = DBA::selectFirst('contact', ['id', 'network', 'url', 'uid'], ['id' => $cid]);
  
-               return self::magicLinkbyContact($contact, $url);
+               return self::magicLinkByContact($contact, $url);
        }
  
        /**
@@@ -2202,7 -2197,7 +2202,7 @@@
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function magicLinkbyContact($contact, $url = '')
+       public static function magicLinkByContact($contact, $url = '')
        {
                if ((!local_user() && !remote_user()) || ($contact['network'] != Protocol::DFRN)) {
                        return $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url'];
@@@ -2225,9 -2220,4 +2225,9 @@@
  
                return $redirect;
        }
 +
 +      public static function removeFromGroups($contact_id)
 +      {
 +              return DBA::delete('group_member', ['contact-id' => $contact_id]);
 +      }
  }