GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Removed Inbox from core (unused since 4b2a66ed29)

Browse Source 
Added the following FIXME:
How should a Twitter user get their Inbox filled with foreign tweets?

Every imported Twitter user has a profile in the Profile table, so we
could setup a Subscription entry for each of those, meaning they get
collected in the InboxNoticeStream... But this would mean a lot of
unnecessary entries and listings that generally just point to the
locked down Twitter service.

Let's figure out a good relation so we can connect any profile to any
imported foreign notice, so it shows up in the "all" feed.
This commit is contained in:
Mikael Nordfeldth
2014-03-06 04:36:00 +01:00
parent 4b2a66ed29
commit 2272cc244d
10 changed files with 34 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
lib/inboxtagcloudsection.php
View File

@@ -42,6 +42,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
*/
class InboxTagCloudSection extends TagCloudSection
{
const MAX_NOTICES = 1024; // legacy value for "Inbox" table size when that existed
protected $target = null;
function __construct($out=null, Profile $target)
@@ -60,52 +62,42 @@ class InboxTagCloudSection extends TagCloudSection
{
$profile = Profile::current();
$keypart = sprintf('Inbox:notice_tag:%d:%d', $this->target,
$profile instanceof Profile ? $profile->id : 0);
$stream = new InboxNoticeStream($this->target, $profile);
$tag = Memcached_DataObject::cacheGet($keypart);
$ids = $stream->getNoticeIds(0, self::MAX_NOTICES, null, null);
if ($tag === false) {
if (empty($ids)) {
$tag = array();
} else {
$weightexpr = common_sql_weight('notice_tag.created', common_config('tag', 'dropoff'));
// @fixme should we use the cutoff too? Doesn't help with indexing per-user.
$stream = new InboxNoticeStream($this->target, $profile);
$qry = 'SELECT notice_tag.tag, '.
$weightexpr . ' as weight ' .
'FROM notice_tag JOIN notice ' .
'ON notice_tag.notice_id = notice.id ' .
'WHERE notice.id in (' . implode(',', $ids) . ')'.
'GROUP BY notice_tag.tag ' .
'ORDER BY weight DESC ';
$ids = $stream->getNoticeIds(0, Inbox::MAX_NOTICES, null, null);
$limit = TAGS_PER_SECTION;
$offset = 0;
if (empty($ids)) {
$tag = array();
if (common_config('db','type') == 'pgsql') {
$qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
} else {
$weightexpr = common_sql_weight('notice_tag.created', common_config('tag', 'dropoff'));
// @fixme should we use the cutoff too? Doesn't help with indexing per-user.
$qry = 'SELECT notice_tag.tag, '.
$weightexpr . ' as weight ' .
'FROM notice_tag JOIN notice ' .
'ON notice_tag.notice_id = notice.id ' .
'WHERE notice.id in (' . implode(',', $ids) . ')'.
'GROUP BY notice_tag.tag ' .
'ORDER BY weight DESC ';
$limit = TAGS_PER_SECTION;
$offset = 0;
if (common_config('db','type') == 'pgsql') {
$qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
} else {
$qry .= ' LIMIT ' . $offset . ', ' . $limit;
}
$t = new Notice_tag();
$t->query($qry);
$tag = array();
while ($t->fetch()) {
$tag[] = clone($t);
}
$qry .= ' LIMIT ' . $offset . ', ' . $limit;
}
Memcached_DataObject::cacheSet($keypart, $tag, 3600);
$t = new Notice_tag();
$t->query($qry);
$tag = array();
while ($t->fetch()) {
$tag[] = clone($t);
}
}
return new ArrayWrapper($tag);