Browse Source

Relocated function

pull/5794/head
Michael 3 years ago
parent
commit
da79566125
2 changed files with 20 additions and 20 deletions
  1. +17
    -0
      src/Model/User.php
  2. +3
    -20
      src/Protocol/ActivityPub.php

+ 17
- 0
src/Model/User.php View File

@ -31,6 +31,23 @@ require_once 'include/text.php';
*/
class User
{
/**
* @brief Returns the user id of a given profile url
*
* @param string $profile
*
* @return integer user id
*/
public static function getIdForURL($url)
{
$self = DBA::selectFirst('contact', ['uid'], ['nurl' => normalise_link($url), 'self' => true]);
if (!DBA::isResult($self)) {
return false;
} else {
return $self['uid'];
}
}
/**
* @brief Get owner data by user id
*


+ 3
- 20
src/Protocol/ActivityPub.php View File

@ -1665,23 +1665,6 @@ class ActivityPub
logger('Activity ' . $url . ' had been fetched and processed.');
}
/**
* @brief Returns the user id of a given profile url
*
* @param string $profile
*
* @return integer user id
*/
private static function getUserOfProfile($profile)
{
$self = DBA::selectFirst('contact', ['uid'], ['nurl' => normalise_link($profile), 'self' => true]);
if (!DBA::isResult($self)) {
return false;
} else {
return $self['uid'];
}
}
/**
* @brief perform a "follow" request
*
@ -1690,7 +1673,7 @@ class ActivityPub
private static function followUser($activity)
{
$actor = JsonLD::fetchElement($activity, 'object', 'id');
$uid = self::getUserOfProfile($actor);
$uid = User::getIdForURL($actor);
if (empty($uid)) {
return;
}
@ -1745,7 +1728,7 @@ class ActivityPub
private static function acceptFollowUser($activity)
{
$actor = JsonLD::fetchElement($activity, 'object', 'actor');
$uid = self::getUserOfProfile($actor);
$uid = User::getIdForURL($actor);
if (empty($uid)) {
return;
}
@ -1803,7 +1786,7 @@ class ActivityPub
private static function undoFollowUser($activity)
{
$object = JsonLD::fetchElement($activity, 'object', 'object');
$uid = self::getUserOfProfile($object);
$uid = User::getIdForURL($object);
if (empty($uid)) {
return;
}


Loading…
Cancel
Save