Support the "only_media" parameter

diff --git a/src/Module/Api/Mastodon/Accounts/Statuses.php b/src/Module/Api/Mastodon/Accounts/Statuses.php
index f6da2aebe2cb7c1f553812c31002cf31829488ab..14cd19e4261d3e7f004681d144e01f328ce91dc4 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Statuses.php
+++ b/src/Module/Api/Mastodon/Accounts/Statuses.php
@@ -76,6 +76,11 @@ class Statuses extends BaseApi
                $condition = DBA::mergeConditions($condition, ["(`gravity` IN (?, ?) OR (`gravity` = ? AND `vid` = ?))",
                        GRAVITY_PARENT, GRAVITY_COMMENT, GRAVITY_ACTIVITY, Verb::getID(Activity::ANNOUNCE)]);
 
+               if ($only_media) {
+                       $condition = DBA::mergeConditions($condition, ["`uri-id` IN (SELECT `uri-id` FROM `post-media` WHERE `type` IN (?, ?, ?))",
+                               Post\Media::AUDIO, Post\Media::IMAGE, Post\Media::VIDEO]);
+               }
+       
                if (!empty($max_id)) {
                        $condition = DBA::mergeConditions($condition, ["`uri-id` < ?", $max_id]);
                }

diff --git a/src/Module/Api/Mastodon/Timelines/PublicTimeline.php b/src/Module/Api/Mastodon/Timelines/PublicTimeline.php
index 694ed46b88c90138f0be9b45c2ad8f050da398f8..a0a975d20943aee3d1a49560ca0161f33b4c6039 100644 (file)
--- a/src/Module/Api/Mastodon/Timelines/PublicTimeline.php
+++ b/src/Module/Api/Mastodon/Timelines/PublicTimeline.php
@@ -69,6 +69,11 @@ class PublicTimeline extends BaseApi
                        $condition = DBA::mergeConditions($condition, ["NOT `uri-id` IN (SELECT `uri-id` FROM `post-user` WHERE `origin`)"]);
                }
 
+               if ($only_media) {
+                       $condition = DBA::mergeConditions($condition, ["`uri-id` IN (SELECT `uri-id` FROM `post-media` WHERE `type` IN (?, ?, ?))",
+                               Post\Media::AUDIO, Post\Media::IMAGE, Post\Media::VIDEO]);
+               }
+
                if (!empty($max_id)) {
                        $condition = DBA::mergeConditions($condition, ["`uri-id` < ?", $max_id]);
                }

diff --git a/src/Module/Api/Mastodon/Timelines/Tag.php b/src/Module/Api/Mastodon/Timelines/Tag.php
index 8e56f2f16327767db94894efc5b714d6c865a1c2..f61e3c3f7445cc73bb8cc3a667065764a0b3b953 100644 (file)
--- a/src/Module/Api/Mastodon/Timelines/Tag.php
+++ b/src/Module/Api/Mastodon/Timelines/Tag.php
@@ -70,6 +70,11 @@ class Tag extends BaseApi
                        $condition = DBA::mergeConditions($condition, ["`uri-id` IN (SELECT `uri-id` FROM `post-user` WHERE `origin`)"]);
                }
 
+               if ($only_media) {
+                       $condition = DBA::mergeConditions($condition, ["`uri-id` IN (SELECT `uri-id` FROM `post-media` WHERE `type` IN (?, ?, ?))",
+                               Post\Media::AUDIO, Post\Media::IMAGE, Post\Media::VIDEO]);
+               }
+
                if (!empty($max_id)) {
                        $condition = DBA::mergeConditions($condition, ["`uri-id` < ?", $max_id]);
                }