Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-22 23:50:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #11030 from MrPetovan/bug/11029-add-remove-group

Browse source 
Add backward compatibility with user contacts in Module\Group
This commit is contained in:
Philipp 2021-11-27 12:37:18 +01:00 • committed by GitHub
commit e852623c4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 200 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/Model/Group.php
View file

@ -25,8 +25,10 @@ use Friendica\BaseModule;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Database\Database;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Network\HTTPException;
/**
* functions for interacting with the group database table
@ -259,21 +261,24 @@ class Group
* @return boolean
* @throws \Exception
*/
public static function addMember($gid, $cid)
public static function addMember(int $gid, int $cid): bool
{
if (!$gid || !$cid) {
return false;
}
$row_exists = DBA::exists('group_member', ['gid' => $gid, 'contact-id' => $cid]);
if ($row_exists) {
// Row already existing, nothing to do
$return = true;
} else {
$return = DBA::insert('group_member', ['gid' => $gid, 'contact-id' => $cid]);
// @TODO Backward compatibility with user contacts, remove by version 2022.03
$group = DBA::selectFirst('group', ['uid'], ['id' => $gid]);
if (empty($group)) {
throw new HTTPException\NotFoundException('Group not found.');
}
return $return;
$cdata = Contact::getPublicAndUserContactID($cid, $group['uid']);
if (empty($cdata['user'])) {
throw new HTTPException\NotFoundException('Invalid contact.');
}
return DBA::insert('group_member', ['gid' => $gid, 'contact-id' => $cdata['user']], Database::INSERT_IGNORE);
}
/**
@ -284,15 +289,24 @@ class Group
* @return boolean
* @throws \Exception
*/
public static function removeMember($gid, $cid)
public static function removeMember(int $gid, int $cid): bool
{
if (!$gid || !$cid) {
return false;
}
$return = DBA::delete('group_member', ['gid' => $gid, 'contact-id' => $cid]);
// @TODO Backward compatibility with user contacts, remove by version 2022.03
$group = DBA::selectFirst('group', ['uid'], ['id' => $gid]);
if (empty($group)) {
throw new HTTPException\NotFoundException('Group not found.');
}
return $return;
$cdata = Contact::getPublicAndUserContactID($cid, $group['uid']);
if (empty($cdata['user'])) {
throw new HTTPException\NotFoundException('Invalid contact.');
}
return DBA::delete('group_member', ['gid' => $gid, 'contact-id' => $cid]);
}
/**