keith
/
friendica
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12502 from annando/no-gs-import 

The GNU-Social import is removed
This commit is contained in:
Hypolite Petovan 2022-12-21 17:52:17 -05:00 committed by GitHub
parent 07162e557d d75cd8a00a
commit 02bca72de3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Module/Contact/Follow.php
View File

@ -105,11 +105,10 @@ class Follow extends BaseModule
// Don't try to add a pending contact
$userContact = Contact::selectFirst(['pending'], [
"`uid` = ? AND ((`rel` != ?) OR (`network` = ?)) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
"`uid` = ? AND ((`rel` != ?) OR (`network` = ?)) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)",
$uid, Contact::FOLLOWER, Protocol::DFRN,
Strings::normaliseLink($url),
Strings::normaliseLink($url), $url,
Protocol::STATUSNET]);
Strings::normaliseLink($url), $url]);
if (!empty($userContact['pending'])) {
$this->sysMessages->addNotice($this->t('You already added this contact.'));

4
src/Module/Search/Acl.php
View File

@ -135,13 +135,13 @@ class Acl extends BaseModule
switch ($type) {
case self::TYPE_MENTION_CONTACT_GROUP:
$condition = DBA::mergeConditions($condition,
["NOT `self` AND NOT `blocked` AND `notify` != ? AND NOT `network` IN (?, ?)", '', Protocol::OSTATUS, Protocol::STATUSNET
["NOT `self` AND NOT `blocked` AND `notify` != ? AND `network` != ?", '', Protocol::OSTATUS
]);
break;
case self::TYPE_MENTION_CONTACT:
$condition = DBA::mergeConditions($condition,
["NOT `self` AND NOT `blocked` AND `notify` != ? AND `network` != ?", '', Protocol::STATUSNET
["NOT `self` AND NOT `blocked` AND `notify` != ?", ''
]);
break;

4
src/Module/User/PortableContacts.php
View File

@ -223,10 +223,6 @@ class PortableContacts extends BaseModule
if ($selectedFields['network']) {
$entry['network'] = $contact['network'];
if ($entry['network'] == Protocol::STATUSNET) {
$entry['network'] = Protocol::OSTATUS;
}
if (($entry['network'] == '') && ($contact['self'])) {
$entry['network'] = Protocol::DFRN;
}

4
src/Protocol/DFRN.php
View File

@ -1066,8 +1066,8 @@ class DFRN
$fields = ['id', 'uid', 'url', 'network', 'avatar-date', 'avatar', 'name-date', 'uri-date', 'addr',
'name', 'nick', 'about', 'location', 'keywords', 'xmpp', 'bdyear', 'bd', 'hidden', 'contact-type'];
$condition = ["`uid` = ? AND `nurl` = ? AND `network` != ? AND NOT `pending` AND NOT `blocked`",
$importer["importer_uid"], Strings::normaliseLink($author["link"]), Protocol::STATUSNET];
$condition = ["`uid` = ? AND `nurl` = ? AND NOT `pending` AND NOT `blocked`",
$importer["importer_uid"], Strings::normaliseLink($author["link"])];
if ($importer['account-type'] != User::ACCOUNT_TYPE_COMMUNITY) {
$condition = DBA::mergeConditions($condition, ['rel' => [Contact::SHARING, Contact::FRIEND]]);

10
src/Protocol/OStatus.php
View File

@ -103,9 +103,9 @@ class OStatus
*/
if ($aliaslink != '') {
$contact = DBA::selectFirst('contact', [], [
"`uid` = ? AND `alias` = ? AND `network` != ? AND `rel` IN (?, ?)",
"`uid` = ? AND `alias` = ? AND `rel` IN (?, ?)",
$importer['uid'],
$aliaslink, Protocol::STATUSNET,
$aliaslink,
Contact::SHARING, Contact::FRIEND,
]);
}
@ -116,11 +116,10 @@ class OStatus
}
$contact = DBA::selectFirst('contact', [], [
"`uid` = ? AND `nurl` IN (?, ?) AND `network` != ? AND `rel` IN (?, ?)",
"`uid` = ? AND `nurl` IN (?, ?) AND `rel` IN (?, ?)",
$importer['uid'],
Strings::normaliseLink($author['author-link']),
Strings::normaliseLink($aliaslink),
Protocol::STATUSNET,
Contact::SHARING,
Contact::FRIEND,
]);
@ -128,10 +127,9 @@ class OStatus
if (!DBA::isResult($contact) && ($addr != '')) {
$contact = DBA::selectFirst('contact', [], [
"`uid` = ? AND `addr` = ? AND `network` != ? AND `rel` IN (?, ?)",
"`uid` = ? AND `addr` = ? AND `rel` IN (?, ?)",
$importer['uid'],
$addr,
Protocol::STATUSNET,
Contact::SHARING,
Contact::FRIEND,
]);