nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #7955 from annando/api-mentions

Browse source 
Issue 6867: Only display direct mentions in the mentions API
This commit is contained in:
Hypolite Petovan 2019-12-15 15:08:25 -05:00 committed by GitHub
parent 1479c426c7 533f07e874
commit b096172cdc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
database.sql
View file

@ -1,6 +1,6 @@
-- ------------------------------------------ -- ------------------------------------------
-- Friendica 2019.12-rc (Dalmatian Bellflower) -- Friendica 2019.12-rc (Dalmatian Bellflower)
-- DB_UPDATE_VERSION 1325 -- DB_UPDATE_VERSION 1326
-- ------------------------------------------ -- ------------------------------------------
@ -637,6 +637,7 @@ CREATE TABLE IF NOT EXISTS `item` (
INDEX `resource-id` (`resource-id`), INDEX `resource-id` (`resource-id`),
INDEX `deleted_changed` (`deleted`,`changed`), INDEX `deleted_changed` (`deleted`,`changed`),
INDEX `uid_wall_changed` (`uid`,`wall`,`changed`), INDEX `uid_wall_changed` (`uid`,`wall`,`changed`),
INDEX `mention_uid_id` (`mention`,`uid`,`id`),
INDEX `uid_eventid` (`uid`,`event-id`), INDEX `uid_eventid` (`uid`,`event-id`),
INDEX `icid` (`icid`), INDEX `icid` (`icid`),
INDEX `iaid` (`iaid`), INDEX `iaid` (`iaid`),

4
include/api.php
View file

@ -2165,8 +2165,8 @@ function api_statuses_mentions($type)
$start = max(0, ($page - 1) * $count); $start = max(0, ($page - 1) * $count);
$condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `item`.`id` > ? AND `author-id` != ? $condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `item`.`id` > ? AND `author-id` != ? AND `mention`
AND `item`.`parent` IN (SELECT `iid` FROM `thread` WHERE `thread`.`uid` = ? AND `thread`.`mention` AND NOT `thread`.`ignored`)", AND `item`.`parent` IN (SELECT `iid` FROM `thread` WHERE `thread`.`uid` = ? AND NOT `thread`.`ignored`)",
api_user(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, $user_info['pid'], api_user()]; api_user(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, $user_info['pid'], api_user()];
if ($max_id > 0) { if ($max_id > 0) {

3
static/dbstructure.config.php
View file

@ -34,7 +34,7 @@
use Friendica\Database\DBA; use Friendica\Database\DBA;
if (!defined('DB_UPDATE_VERSION')) { if (!defined('DB_UPDATE_VERSION')) {
define('DB_UPDATE_VERSION', 1325); define('DB_UPDATE_VERSION', 1326);
} }
return [ return [
@ -705,6 +705,7 @@ return [
"resource-id" => ["resource-id"], "resource-id" => ["resource-id"],
"deleted_changed" => ["deleted", "changed"], "deleted_changed" => ["deleted", "changed"],
"uid_wall_changed" => ["uid", "wall", "changed"], "uid_wall_changed" => ["uid", "wall", "changed"],
"mention_uid_id" => ["mention", "uid", "id"],
"uid_eventid" => ["uid", "event-id"], "uid_eventid" => ["uid", "event-id"],
"icid" => ["icid"], "icid" => ["icid"],
"iaid" => ["iaid"], "iaid" => ["iaid"],