1
1
Fork 0

Merge remote-tracking branch 'upstream/develop' into write-tags

This commit is contained in:
Michael 2020-04-29 02:38:33 +00:00
commit 8c44f535b7
7 changed files with 69 additions and 33 deletions

View file

@ -1,6 +1,6 @@
-- ------------------------------------------ -- ------------------------------------------
-- Friendica 2020.06-dev (Red Hot Poker) -- Friendica 2020.06-dev (Red Hot Poker)
-- DB_UPDATE_VERSION 1340 -- DB_UPDATE_VERSION 1341
-- ------------------------------------------ -- ------------------------------------------
@ -1425,7 +1425,7 @@ CREATE VIEW `owner-view` AS SELECT
`contact`.`about` AS `about`, `contact`.`about` AS `about`,
`contact`.`keywords` AS `keywords`, `contact`.`keywords` AS `keywords`,
`contact`.`gender` AS `gender`, `contact`.`gender` AS `gender`,
`profile`.`xmpp` AS `xmpp`, `contact`.`xmpp` AS `xmpp`,
`contact`.`attag` AS `attag`, `contact`.`attag` AS `attag`,
`contact`.`avatar` AS `avatar`, `contact`.`avatar` AS `avatar`,
`contact`.`photo` AS `photo`, `contact`.`photo` AS `photo`,
@ -1457,11 +1457,9 @@ CREATE VIEW `owner-view` AS SELECT
`contact`.`name-date` AS `name-date`, `contact`.`name-date` AS `name-date`,
`contact`.`uri-date` AS `uri-date`, `contact`.`uri-date` AS `uri-date`,
`contact`.`avatar-date` AS `avatar-date`, `contact`.`avatar-date` AS `avatar-date`,
`contact`.`id` AS `contact_id`,
`contact`.`avatar-date` AS `picdate`, `contact`.`avatar-date` AS `picdate`,
`contact`.`term-date` AS `term-date`, `contact`.`term-date` AS `term-date`,
`contact`.`last-item` AS `last-item`, `contact`.`last-item` AS `last-item`,
`contact`.`last-item` AS `lastitem_date`,
`contact`.`priority` AS `priority`, `contact`.`priority` AS `priority`,
`contact`.`blocked` AS `blocked`, `contact`.`blocked` AS `blocked`,
`contact`.`block_reason` AS `block_reason`, `contact`.`block_reason` AS `block_reason`,
@ -1484,29 +1482,47 @@ CREATE VIEW `owner-view` AS SELECT
`contact`.`profile-id` AS `profile-id`, `contact`.`profile-id` AS `profile-id`,
`contact`.`bdyear` AS `bdyear`, `contact`.`bdyear` AS `bdyear`,
`contact`.`bd` AS `bd`, `contact`.`bd` AS `bd`,
`contact`.`notify_new_posts` AS `notify_new_posts`,
`contact`.`fetch_further_information` AS `fetch_further_information`,
`contact`.`ffi_keyword_blacklist` AS `ffi_keyword_blacklist`,
`user`.`parent-uid` AS `parent-uid`,
`user`.`guid` AS `guid`, `user`.`guid` AS `guid`,
`user`.`theme` AS `theme`,
`user`.`language` AS `language`,
`user`.`email` AS `email`,
`user`.`prvkey` AS `uprvkey`,
`user`.`pubkey` AS `upubkey`,
`user`.`timezone` AS `timezone`,
`user`.`nickname` AS `nickname`, `user`.`nickname` AS `nickname`,
`user`.`username` AS `username`, `user`.`email` AS `email`,
`user`.`openid` AS `openid`,
`user`.`timezone` AS `timezone`,
`user`.`language` AS `language`,
`user`.`register_date` AS `register_date`,
`user`.`login_date` AS `login_date`,
`user`.`default-location` AS `default-location`,
`user`.`allow_location` AS `allow_location`,
`user`.`theme` AS `theme`,
`user`.`pubkey` AS `upubkey`,
`user`.`prvkey` AS `uprvkey`,
`user`.`sprvkey` AS `sprvkey`, `user`.`sprvkey` AS `sprvkey`,
`user`.`spubkey` AS `spubkey`, `user`.`spubkey` AS `spubkey`,
`user`.`verified` AS `verified`,
`user`.`blockwall` AS `blockwall`,
`user`.`hidewall` AS `hidewall`,
`user`.`blocktags` AS `blocktags`,
`user`.`unkmail` AS `unkmail`,
`user`.`cntunkmail` AS `cntunkmail`,
`user`.`notify-flags` AS `notify-flags`,
`user`.`page-flags` AS `page-flags`, `user`.`page-flags` AS `page-flags`,
`user`.`account-type` AS `account-type`, `user`.`account-type` AS `account-type`,
`user`.`prvnets` AS `prvnets`, `user`.`prvnets` AS `prvnets`,
`user`.`account_removed` AS `account_removed`, `user`.`maxreq` AS `maxreq`,
`user`.`hidewall` AS `hidewall`,
`user`.`login_date` AS `login_date`,
`user`.`register_date` AS `register_date`,
`user`.`verified` AS `verified`,
`user`.`expire` AS `expire`, `user`.`expire` AS `expire`,
`user`.`expire_notification_sent` AS `expire_notification_sent`, `user`.`account_removed` AS `account_removed`,
`user`.`account_expired` AS `account_expired`, `user`.`account_expired` AS `account_expired`,
`user`.`account_expires_on` AS `account_expires_on`, `user`.`account_expires_on` AS `account_expires_on`,
`user`.`expire_notification_sent` AS `expire_notification_sent`,
`user`.`def_gid` AS `def_gid`,
`user`.`allow_cid` AS `allow_cid`,
`user`.`allow_gid` AS `allow_gid`,
`user`.`deny_cid` AS `deny_cid`,
`user`.`deny_gid` AS `deny_gid`,
`user`.`openidserver` AS `openidserver`,
`profile`.`publish` AS `publish`, `profile`.`publish` AS `publish`,
`profile`.`net-publish` AS `net-publish`, `profile`.`net-publish` AS `net-publish`,
`profile`.`hide-friends` AS `hide-friends`, `profile`.`hide-friends` AS `hide-friends`,
@ -1523,6 +1539,22 @@ CREATE VIEW `owner-view` AS SELECT
INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self` INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`
INNER JOIN `profile` ON `profile`.`uid` = `user`.`uid`; INNER JOIN `profile` ON `profile`.`uid` = `user`.`uid`;
--
-- VIEW participation-view
--
DROP VIEW IF EXISTS `participation-view`;
CREATE VIEW `participation-view` AS SELECT
`participation`.`iid` AS `iid`,
`contact`.`id` AS `id`,
`contact`.`url` AS `url`,
`contact`.`name` AS `name`,
`contact`.`protocol` AS `protocol`,
CASE `contact`.`batch` WHEN '' THEN `fcontact`.`batch` ELSE `contact`.`batch` END AS `batch`,
CASE `fcontact`.`network` WHEN '' THEN `contact`.`network` ELSE `fcontact`.`network` END AS `network`
FROM `participation`
INNER JOIN `contact` ON `contact`.`id` = `participation`.`cid` AND NOT `contact`.`archive`
INNER JOIN `fcontact` ON `fcontact`.`id` = `participation`.`fid`;
-- --
-- VIEW pending-view -- VIEW pending-view
-- --
@ -1545,4 +1577,15 @@ CREATE VIEW `pending-view` AS SELECT
INNER JOIN `contact` ON `register`.`uid` = `contact`.`uid` INNER JOIN `contact` ON `register`.`uid` = `contact`.`uid`
INNER JOIN `user` ON `register`.`uid` = `user`.`uid`; INNER JOIN `user` ON `register`.`uid` = `user`.`uid`;
--
-- VIEW workerqueue-view
--
DROP VIEW IF EXISTS `workerqueue-view`;
CREATE VIEW `workerqueue-view` AS SELECT
`process`.`pid` AS `pid`,
`workerqueue`.`priority` AS `priority`
FROM `process`
INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid`
WHERE NOT `workerqueue`.`done`;

View file

@ -352,13 +352,7 @@ function message_content(App $a)
$messages = DBA::toArray($messages_stmt); $messages = DBA::toArray($messages_stmt);
DBA::update('mail', ['seen' => 1], ['parent-uri' => $message['parent-uri'], 'uid' => local_user()]); DBA::update('mail', ['seen' => 1], ['parent-uri' => $message['parent-uri'], 'uid' => local_user()]);
DBA::update('notify', ['seen' => 1], ['type' => Type::MAIL, 'parent' => $message['id'], 'uid' => local_user()]);
if ($message['convid']) {
// Clear Diaspora private message notifications
DBA::update('notify', ['seen' => 1], ['type' => Type::MAIL, 'parent' => $message['convid'], 'uid' => local_user()]);
}
// Clear DFRN private message notifications
DBA::update('notify', ['seen' => 1], ['type' => Type::MAIL, 'parent' => $message['parent-uri'], 'uid' => local_user()]);
} else { } else {
$messages = false; $messages = false;
} }

View file

@ -142,7 +142,7 @@ class Search
$profiles = $results['profiles'] ?? []; $profiles = $results['profiles'] ?? [];
foreach ($profiles as $profile) { foreach ($profiles as $profile) {
$profile_url = $profile['profile_url'] ?? ''; $profile_url = $profile['url'] ?? '';
$contactDetails = Contact::getDetailsByURL($profile_url, local_user()); $contactDetails = Contact::getDetailsByURL($profile_url, local_user());
$result = new ContactResult( $result = new ContactResult(

View file

@ -92,7 +92,7 @@ class Mail
'to_email' => $user['email'], 'to_email' => $user['email'],
'uid' => $user['uid'], 'uid' => $user['uid'],
'item' => $msg, 'item' => $msg,
'parent' => 0, 'parent' => $msg['id'],
'source_name' => $msg['from-name'], 'source_name' => $msg['from-name'],
'source_link' => $msg['from-url'], 'source_link' => $msg['from-url'],
'source_photo' => $msg['from-photo'], 'source_photo' => $msg['from-photo'],

View file

@ -56,7 +56,7 @@ class Register
*/ */
public static function getPendingForUser(int $uid) public static function getPendingForUser(int $uid)
{ {
return DBA::selectToArray('pending-view', [], ['uid' => $uid]); return DBA::selectFirst('pending-view', [], ['uid' => $uid, 'self' => true]);
} }
/** /**

View file

@ -120,9 +120,9 @@ class Directory extends BaseModule
*/ */
public static function formatEntry(array $contact, $photo_size = 'photo') public static function formatEntry(array $contact, $photo_size = 'photo')
{ {
$itemurl = (($contact['addr'] != "") ? $contact['addr'] : $contact['profile_url']); $itemurl = (($contact['addr'] != "") ? $contact['addr'] : $contact['url']);
$profile_link = $contact['profile_url']; $profile_link = $contact['url'];
$about = (($contact['about']) ? $contact['about'] . '<br />' : ''); $about = (($contact['about']) ? $contact['about'] . '<br />' : '');

View file

@ -128,9 +128,9 @@ return [
"profile-id" => ["contact", "profile-id"], "profile-id" => ["contact", "profile-id"],
"bdyear" => ["contact", "bdyear"], "bdyear" => ["contact", "bdyear"],
"bd" => ["contact", "bd"], "bd" => ["contact", "bd"],
"notify_new_posts" => ["notify_new_posts"], "notify_new_posts" => ["contact", "notify_new_posts"],
"fetch_further_information" => ["fetch_further_information"], "fetch_further_information" => ["contact", "fetch_further_information"],
"ffi_keyword_blacklist" => ["ffi_keyword_blacklist"], "ffi_keyword_blacklist" => ["contact", "ffi_keyword_blacklist"],
"parent-uid" => ["user", "parent-uid"], "parent-uid" => ["user", "parent-uid"],
"guid" => ["user", "guid"], "guid" => ["user", "guid"],
"nickname" => ["user", "nickname"], /// @todo Replaces all uses of "nickname" with "nick" "nickname" => ["user", "nickname"], /// @todo Replaces all uses of "nickname" with "nick"
@ -180,7 +180,6 @@ return [
"postal-code" => ["profile", "postal-code"], "postal-code" => ["profile", "postal-code"],
"country-name" => ["profile", "country-name"], "country-name" => ["profile", "country-name"],
"homepage" => ["profile", "homepage"], "homepage" => ["profile", "homepage"],
"xmpp" => ["profile", "xmpp"],
"dob" => ["profile", "dob"], "dob" => ["profile", "dob"],
], ],
"query" => "FROM `user` "query" => "FROM `user`