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

Let's handle notice dataobjects instead, despite fetching twice from db

Browse Source 
Actually the original object should be fixed here, but we'll handle the FIXME's later.
This commit is contained in:
Mikael Nordfeldth 2015-09-09 17:03:52 +02:00
parent 4b83d62750
commit 52de57e2f6
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/apiaction.php
View File

@ -795,7 +795,13 @@ class ApiAction extends Action
'xmlns:statusnet' => 'http://status.net/schema/api/1/')); 'xmlns:statusnet' => 'http://status.net/schema/api/1/'));
if (is_array($notice)) { if (is_array($notice)) {
$notice = new ArrayWrapper($notice); //FIXME: make everything calling showJsonTimeline use only Notice objects
common_debug('ArrayWrapper avoidance in progress! Beep boop, make showJsonTimeline only receive Notice objects!');
$ids = array();
foreach ($notice as $n) {
$ids[] = $n->getID();
}
$notice = Notice::multiGet('id', $ids);
} }
while ($notice->fetch()) { while ($notice->fetch()) {
@ -851,7 +857,13 @@ class ApiAction extends Action
$this->element('ttl', null, '40'); $this->element('ttl', null, '40');
if (is_array($notice)) { if (is_array($notice)) {
$notice = new ArrayWrapper($notice); //FIXME: make everything calling showJsonTimeline use only Notice objects
common_debug('ArrayWrapper avoidance in progress! Beep boop, make showJsonTimeline only receive Notice objects!');
$ids = array();
foreach ($notice as $n) {
$ids[] = $n->getID();
}
$notice = Notice::multiGet('id', $ids);
} }
while ($notice->fetch()) { while ($notice->fetch()) {
@ -895,7 +907,13 @@ class ApiAction extends Action
$this->element('subtitle', null, $subtitle); $this->element('subtitle', null, $subtitle);
if (is_array($notice)) { if (is_array($notice)) {
$notice = new ArrayWrapper($notice); //FIXME: make everything calling showJsonTimeline use only Notice objects
common_debug('ArrayWrapper avoidance in progress! Beep boop, make showJsonTimeline only receive Notice objects!');
$ids = array();
foreach ($notice as $n) {
$ids[] = $n->getID();
}
$notice = Notice::multiGet('id', $ids);
} }
while ($notice->fetch()) { while ($notice->fetch()) {