Move mod/fsuggest to src/Module/SuggestFriends

This commit is contained in:
nupplaPhil 2020-01-31 23:50:46 +01:00
parent 4ab893a561
commit 34f4aedb87
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
9 changed files with 236 additions and 7 deletions

View file

@ -0,0 +1,10 @@
<?php
namespace Friendica\Collection;
use Friendica\BaseCollection;
class FSuggests extends BaseCollection
{
}

View file

@ -292,6 +292,14 @@ abstract class DI
// "Repository" namespace // "Repository" namespace
// //
/**
* @return Repository\FSuggest;
*/
public static function fsuggest()
{
return self::$dice->create(Repository\FSuggest::class);
}
/** /**
* @return Repository\Introduction * @return Repository\Introduction
*/ */

22
src/Model/FSuggest.php Normal file
View file

@ -0,0 +1,22 @@
<?php
namespace Friendica\Model;
use Friendica\BaseModel;
/**
* Model for interacting with a friend suggest
*
* @property int uid
* @property int cid
* @property string name
* @property string url
* @property string request
* @property string photo
* @property string note
* @property string created
*/
class FSuggest extends BaseModel
{
}

View file

@ -0,0 +1,105 @@
<?php
namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\Worker;
use Friendica\DI;
use Friendica\Model\Contact as ContactModel;
use Friendica\Network\HTTPException\ForbiddenException;
use Friendica\Network\HTTPException\NotFoundException;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings;
use Friendica\Worker\Delivery;
/**
* Suggest friends to a known contact
*/
class FriendSuggest extends BaseModule
{
public static function init(array $parameters = [])
{
if (! local_user()) {
throw new ForbiddenException(DI::l10n()->t('Permission denied.'));
}
}
public static function post(array $parameters = [])
{
$cid = intval($parameters['contact']);
// We do query the "uid" as well to ensure that it is our contact
if (!DI::dba()->exists('contact', ['id' => $cid, 'uid' => local_user()])) {
throw new NotFoundException(DI::l10n()->t('Contact not found.'));
}
$suggest_contact_id = intval($_POST['suggest']);
if (empty($suggest_contact_id)) {
return;
}
// We do query the "uid" as well to ensure that it is our contact
$contact = DI::dba()->selectFirst('contact', ['name', 'url', 'request', 'avatar'], ['id' => $suggest_contact_id, 'uid' => local_user()]);
if (empty($contact)) {
notice(DI::l10n()->t('Suggested contact not found.'));
return;
}
$note = Strings::escapeHtml(trim($_POST['note'] ?? ''));
$suggest = DI::fsuggest()->insert([
'uid' => local_user(),
'cid' => $cid,
'name' => $contact['name'],
'url' => $contact['url'],
'request' => $contact['request'],
'photo' => $contact['avatar'],
'note' => $note,
'created' => DateTimeFormat::utcNow()
]);
Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::SUGGESTION, $suggest->id);
info(DI::l10n()->t('Friend suggestion sent.'));
}
public static function content(array $parameters = [])
{
$cid = intval($parameters['contact']);
$contact = DI::dba()->selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]);
if (empty($contact)) {
notice(DI::l10n()->t('Contact not found.'));
DI::baseUrl()->redirect();
}
$stmtContacts = ContactModel::select(['id', 'name'], [
'`uid` = ? AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND NOT `deleted` AND `notify` != "" AND `id` != ? AND `networks` = ?',
local_user(),
$cid,
Protocol::DFRN,
]);
$formattedContacts = [];
while ($contact = DI::dba()->fetch($stmtContacts)) {
$formattedContacts[$contact['id']] = $contact['name'];
}
$tpl = Renderer::getMarkupTemplate('fsuggest.tpl');
return Renderer::replaceMacros($tpl, [
'$contact_id' => $cid,
'$fsuggest_title' => DI::l10n()->t('Suggest Friends'),
'$fsuggest_select' => [
'suggest',
DI::l10n()->t('Suggest a friend for %s', $contact['name']),
'',
'',
$formattedContacts,
],
'$submit' => DI::l10n()->t('Submit'),
]);
}
}

View file

@ -1510,14 +1510,14 @@ class Transmitter
{ {
$owner = User::getOwnerDataById($uid); $owner = User::getOwnerDataById($uid);
$suggestion = DBA::selectFirst('fsuggest', ['url', 'note', 'created'], ['id' => $suggestion_id]); $suggestion = DI::fsuggest()->getById($suggestion_id);
$data = ['@context' => ActivityPub::CONTEXT, $data = ['@context' => ActivityPub::CONTEXT,
'id' => DI::baseUrl() . '/activity/' . System::createGUID(), 'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
'type' => 'Announce', 'type' => 'Announce',
'actor' => $owner['url'], 'actor' => $owner['url'],
'object' => $suggestion['url'], 'object' => $suggestion->url,
'content' => $suggestion['note'], 'content' => $suggestion->note,
'instrument' => self::getService(), 'instrument' => self::getService(),
'to' => [ActivityPub::PUBLIC_COLLECTION], 'to' => [ActivityPub::PUBLIC_COLLECTION],
'cc' => []]; 'cc' => []];

View file

@ -0,0 +1,74 @@
<?php
namespace Friendica\Repository;
use Friendica\BaseRepository;
use Friendica\Collection;
use Friendica\Model;
class FSuggest extends BaseRepository
{
protected static $table_name = 'fsuggest';
protected static $model_class = Model\FSuggest::class;
protected static $collection_class = Collection\FSuggests::class;
/**
* @param array $data
* @return Model\FSuggest
*/
protected function create(array $data)
{
return new Model\FSuggest($this->dba, $this->logger, $data);
}
/**
* Returns the Friend Suggest based on it's ID
*
* @param int $id The id of the fsuggest
*
* @return Model\FSuggest
*
* @throws \Friendica\Network\HTTPException\NotFoundException
*/
public function getById(int $id)
{
return $this->selectFirst(['id' => $id]);
}
/**
* @param array $condition
* @return Model\FSuggest
* @throws \Friendica\Network\HTTPException\NotFoundException
*/
public function selectFirst(array $condition)
{
return parent::selectFirst($condition);
}
/**
* @param array $condition
* @param array $params
* @return Collection\FSuggests
* @throws \Exception
*/
public function select(array $condition = [], array $params = [])
{
return parent::select($condition, $params);
}
/**
* @param array $condition
* @param array $params
* @param int|null $max_id
* @param int|null $since_id
* @param int $limit
* @return Collection\FSuggests
* @throws \Exception
*/
public function selectByBoundaries(array $condition = [], array $params = [], int $max_id = null, int $since_id = null, int $limit = self::LIMIT)
{
return parent::selectByBoundaries($condition, $params, $max_id, $since_id, $limit);
}
}

View file

@ -70,12 +70,12 @@ class Notifier
'APDelivery', $cmd, $target_id, $inbox, $uid); 'APDelivery', $cmd, $target_id, $inbox, $uid);
} }
} elseif ($cmd == Delivery::SUGGESTION) { } elseif ($cmd == Delivery::SUGGESTION) {
$suggest = DBA::selectFirst('fsuggest', ['uid', 'cid'], ['id' => $target_id]); $suggest = DI::fsuggest()->getById($target_id);
if (!DBA::isResult($suggest)) { if (empty($suggest)) {
return; return;
} }
$uid = $suggest['uid']; $uid = $suggest->uid;
$recipients[] = $suggest['cid']; $recipients[] = $suggest->cid;
} elseif ($cmd == Delivery::REMOVAL) { } elseif ($cmd == Delivery::REMOVAL) {
return self::notifySelfRemoval($target_id, $a->queue['priority'], $a->queue['created']); return self::notifySelfRemoval($target_id, $a->queue['priority'], $a->queue['created']);
} elseif ($cmd == Delivery::RELOCATION) { } elseif ($cmd == Delivery::RELOCATION) {

View file

@ -128,6 +128,7 @@ return [
'/followers/{owner}' => [Module\Followers::class, [R::GET]], '/followers/{owner}' => [Module\Followers::class, [R::GET]],
'/following/{owner}' => [Module\Following::class, [R::GET]], '/following/{owner}' => [Module\Following::class, [R::GET]],
'/friendica[/json]' => [Module\Friendica::class, [R::GET]], '/friendica[/json]' => [Module\Friendica::class, [R::GET]],
'/fsuggest/{contact}' => [Module\FriendSuggest::class, [R::GET, R::POST]],
'/group' => [ '/group' => [
'[/]' => [Module\Group::class, [R::GET, R::POST]], '[/]' => [Module\Group::class, [R::GET, R::POST]],

View file

@ -0,0 +1,9 @@
<div class="generic-page-wrapper">
<h2>{{$fsuggest_title}}</h2>
<form id="fsuggest-form" action="fsuggest/{{$contact_id}}" method="post">
{{include file="field_select.tpl" field=$fsuggest_select}}
<div id="fsuggest-submit-wrapper">
<input id="fsuggest-submit" type="submit" name="submit" value="{{$submit}}" />
</div>
</form>
</div>