rework timelines. inclusion reasons supported now

2 files changed, 10 insertions, 4 deletions

diff --git a/Digitigrade/Timeline/GlobalTimeline.php b/Digitigrade/Timeline/GlobalTimeline.php
index 2236ee4..278b557 100644
--- a/Digitigrade/Timeline/GlobalTimeline.php
+++ b/Digitigrade/Timeline/GlobalTimeline.php
@@ -2,10 +2,12 @@
 namespace Digitigrade\Timeline;
 
 use Digitigrade\Db;
+use Digitigrade\Model\Note;
 use Digitigrade\Timeline;
+use Digitigrade\TimelineItem;
 
 class GlobalTimeline extends Timeline {
-    protected function getNoteIds(int $limit, int $offset): array {
+    protected function getItems(int $limit, int $offset): array {
         $db = Db::getInstance()->getPdo();
         $stmt = $db->prepare(<<<END
         SELECT note.id FROM note LEFT JOIN note_privacy ON note_privacy.note_id = note.id
@@ -13,6 +15,7 @@ class GlobalTimeline extends Timeline {
         ORDER BY note.created DESC LIMIT ? OFFSET ?
         END);
         $stmt->execute([$limit, $offset]);
-        return $stmt->fetchAll(\PDO::FETCH_COLUMN, 0);
+        $ids = $stmt->fetchAll(\PDO::FETCH_COLUMN, 0);
+        return array_map(fn($id) => new TimelineItem(Note::find($id)), $ids);
     }
 }
\ No newline at end of file
diff --git a/Digitigrade/Timeline/LocalTimeline.php b/Digitigrade/Timeline/LocalTimeline.php
index 69b8634..c20ada6 100644
--- a/Digitigrade/Timeline/LocalTimeline.php
+++ b/Digitigrade/Timeline/LocalTimeline.php
@@ -2,10 +2,12 @@
 namespace Digitigrade\Timeline;
 
 use Digitigrade\Db;
+use Digitigrade\Model\Note;
 use Digitigrade\Timeline;
+use Digitigrade\TimelineItem;
 
 class LocalTimeline extends Timeline {
-    protected function getNoteIds(int $limit, int $offset): array {
+    protected function getItems(int $limit, int $offset): array {
         $db = Db::getInstance()->getPdo();
         $stmt = $db->prepare(<<<END
         SELECT note.id FROM note
@@ -15,6 +17,7 @@ class LocalTimeline extends Timeline {
         ORDER BY note.created DESC LIMIT ? OFFSET ?
         END);
         $stmt->execute([$limit, $offset]);
-        return $stmt->fetchAll(\PDO::FETCH_COLUMN, 0);
+        $ids = $stmt->fetchAll(\PDO::FETCH_COLUMN, 0);
+        return array_map(fn($id) => new TimelineItem(Note::find($id)), $ids);
     }
 }
\ No newline at end of file