Merge branch 'staging' of github.com:jippi/pixelfed into jippi-fork

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.11...dev)
 
+### Updated
+
+- Update ApiV1Controller, fix network timeline ([0faf59e3](https://github.com/pixelfed/pixelfed/commit/0faf59e3))
+- Update public/network timelines, fix non-redis response and fix reblogs in home feed ([8b4ac5cc](https://github.com/pixelfed/pixelfed/commit/8b4ac5cc))
+-  ([](https://github.com/pixelfed/pixelfed/commit/))
+
 ## [v0.11.11 (2024-02-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.10...v0.11.11)
 
 ### Fixes
@@ -27,7 +33,6 @@
 ### Federation
 - Update Privacy Settings, add support for Mastodon `indexable` search flag ([fc24630e](https://github.com/pixelfed/pixelfed/commit/fc24630e))
 - Update AP Helpers, consume actor `indexable` attribute ([fbdcdd9d](https://github.com/pixelfed/pixelfed/commit/fbdcdd9d))
--  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ### Updates
 - Update FollowerService, add forget method to RelationshipService call to reduce load when mass purging ([347e4f59](https://github.com/pixelfed/pixelfed/commit/347e4f59))
@@ -112,7 +117,6 @@
 - Update PublicApiController, consume InstanceService blocked domains for account and statuses endpoints ([01b33fb3](https://github.com/pixelfed/pixelfed/commit/01b33fb3))
 - Update ApiV1Controller, enforce blocked instance domain logic ([5b284cac](https://github.com/pixelfed/pixelfed/commit/5b284cac))
 - Update ApiV2Controller, add vapid key to instance object. Thanks thisismissem! ([4d02d6f1](https://github.com/pixelfed/pixelfed/commit/4d02d6f1))
--  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.9 (2023-08-21)](https://github.com/pixelfed/pixelfed/compare/v0.11.8...v0.11.9)
 

app/Http/Controllers/Api/ApiV1Controller.php

@@ -2523,6 +2523,7 @@ class ApiV1Controller extends Controller
         $napi = $request->has(self::PF_API_ENTITY_KEY);
         $min = $request->input('min_id');
         $max = $request->input('max_id');
+        $minOrMax = $request->anyFilled(['max_id', 'min_id']);
         $limit = $request->input('limit') ?? 20;
         $user = $request->user();
 
@@ -2535,36 +2536,100 @@ class ApiV1Controller extends Controller
         $filtered = $user ? UserFilterService::filters($user->profile_id) : [];
         AccountService::setLastActive($user->id);
         $domainBlocks = UserFilterService::domainBlocks($user->profile_id);
+        $hideNsfw = config('instance.hide_nsfw_on_public_feeds');
+        $amin = SnowflakeService::byDate(now()->subDays(config('federation.network_timeline_days_falloff')));
 
-        if($remote && config('instance.timeline.network.cached')) {
-            Cache::remember('api:v1:timelines:network:cache_check', 10368000, function() {
-                if(NetworkTimelineService::count() == 0) {
-                    NetworkTimelineService::warmCache(true, config('instance.timeline.network.cache_dropoff'));
-                }
-            });
+        if($remote) {
+            if(config('instance.timeline.network.cached')) {
+                Cache::remember('api:v1:timelines:network:cache_check', 10368000, function() {
+                    if(NetworkTimelineService::count() == 0) {
+                        NetworkTimelineService::warmCache(true, config('instance.timeline.network.cache_dropoff'));
+                    }
+                });
 
-            if ($max) {
-                $feed = NetworkTimelineService::getRankedMaxId($max, $limit + 5);
-            } else if ($min) {
-                $feed = NetworkTimelineService::getRankedMinId($min, $limit + 5);
+                if ($max) {
+                    $feed = NetworkTimelineService::getRankedMaxId($max, $limit + 5);
+                } else if ($min) {
+                    $feed = NetworkTimelineService::getRankedMinId($min, $limit + 5);
+                } else {
+                    $feed = NetworkTimelineService::get(0, $limit + 5);
+                }
             } else {
-                $feed = NetworkTimelineService::get(0, $limit + 5);
+                $feed = Status::select(
+                    'id',
+                    'uri',
+                    'type',
+                    'scope',
+                    'local',
+                    'created_at',
+                    'profile_id',
+                    'in_reply_to_id',
+                    'reblog_of_id'
+                  )
+                  ->when($minOrMax, function($q, $minOrMax) use($min, $max) {
+                    $dir = $min ? '>' : '<';
+                    $id = $min ?? $max;
+                    return $q->where('id', $dir, $id);
+                  })
+                  ->whereNull(['in_reply_to_id', 'reblog_of_id'])
+                  ->when($hideNsfw, function($q, $hideNsfw) {
+                    return $q->where('is_nsfw', false);
+                  })
+                  ->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
+                  ->whereLocal(false)
+                  ->whereScope('public')
+                  ->where('id', '>', $amin)
+                  ->orderByDesc('id')
+                  ->limit(($limit * 2))
+                  ->pluck('id')
+                  ->values()
+                  ->toArray();
             }
-        }
+        } else {
+            if(config('instance.timeline.local.cached')) {
+                Cache::remember('api:v1:timelines:public:cache_check', 10368000, function() {
+                    if(PublicTimelineService::count() == 0) {
+                        PublicTimelineService::warmCache(true, 400);
+                    }
+                });
 
-        if($local || !$remote && !$local) {
-            Cache::remember('api:v1:timelines:public:cache_check', 10368000, function() {
-                if(PublicTimelineService::count() == 0) {
-                    PublicTimelineService::warmCache(true, 400);
+                if ($max) {
+                    $feed = PublicTimelineService::getRankedMaxId($max, $limit + 5);
+                } else if ($min) {
+                    $feed = PublicTimelineService::getRankedMinId($min, $limit + 5);
+                } else {
+                    $feed = PublicTimelineService::get(0, $limit + 5);
                 }
-            });
-
-            if ($max) {
-                $feed = PublicTimelineService::getRankedMaxId($max, $limit + 5);
-            } else if ($min) {
-                $feed = PublicTimelineService::getRankedMinId($min, $limit + 5);
             } else {
-                $feed = PublicTimelineService::get(0, $limit + 5);
+                $feed = Status::select(
+                    'id',
+                    'uri',
+                    'type',
+                    'scope',
+                    'local',
+                    'created_at',
+                    'profile_id',
+                    'in_reply_to_id',
+                    'reblog_of_id'
+                  )
+                  ->when($minOrMax, function($q, $minOrMax) use($min, $max) {
+                    $dir = $min ? '>' : '<';
+                    $id = $min ?? $max;
+                    return $q->where('id', $dir, $id);
+                  })
+                  ->whereNull(['in_reply_to_id', 'reblog_of_id'])
+                  ->when($hideNsfw, function($q, $hideNsfw) {
+                    return $q->where('is_nsfw', false);
+                  })
+                  ->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
+                  ->whereLocal(true)
+                  ->whereScope('public')
+                  ->where('id', '>', $amin)
+                  ->orderByDesc('id')
+                  ->limit(($limit * 2))
+                  ->pluck('id')
+                  ->values()
+                  ->toArray();
             }
         }
 

config/instance.php

@@ -29,11 +29,12 @@ return [
 		],
 
 		'local' => [
+			'cached' => env('INSTANCE_PUBLIC_TIMELINE_CACHED', false),
 			'is_public' => env('INSTANCE_PUBLIC_LOCAL_TIMELINE', false)
 		],
 
 		'network' => [
-			'cached' => env('PF_NETWORK_TIMELINE') ? env('INSTANCE_NETWORK_TIMELINE_CACHED', true) : false,
+			'cached' => env('PF_NETWORK_TIMELINE') ? env('INSTANCE_NETWORK_TIMELINE_CACHED', false) : false,
 			'cache_dropoff' => env('INSTANCE_NETWORK_TIMELINE_CACHE_DROPOFF', 100),
 			'max_hours_old' => env('INSTANCE_NETWORK_TIMELINE_CACHE_MAX_HOUR_INGEST', 6)
 		]

resources/assets/components/AccountImport.vue

@@ -197,8 +197,17 @@
                     <div class="list-group">
                         <div class="list-group-item d-flex justify-content-between align-items-center">
                             <p class="text-center font-weight-bold mb-0">Media #{{idx + 1}}</p>
-                            <img :src="getFileNameUrl(media.uri)" width="30" height="30" style="object-fit: cover; border-radius: 5px;">
+                            <template v-if="media.uri.endsWith('.jpg') || media.uri.endsWith('.png')">
+                                <img :src="getFileNameUrl(media.uri)" width="30" height="30" style="object-fit: cover; border-radius: 5px;">
+                            </template>
                         </div>
+                        <template v-if="media.uri.endsWith('.mp4')">
+                            <div class="list-group-item">
+                                <div class="embed-responsive embed-responsive-4by3">
+                                    <video :src="getFileNameUrl(media.uri)" controls></video>
+                                </div>
+                            </div>
+                        </template>
                         <div class="list-group-item">
                             <p class="small text-muted">Caption</p>
                             <p class="mb-0 small read-more" style="font-size: 12px;overflow-y: hidden;">{{ media.title ? media.title : modalData.title }}</p>

resources/assets/components/sections/Timeline.vue

@@ -187,7 +187,7 @@
                 forceUpdateIdx: 0,
                 showReblogBanner: false,
                 enablingReblogs: false,
-                baseApi: '/api/v1/pixelfed/timelines/',
+                baseApi: '/api/v1/timelines/',
             }
         },
 
@@ -204,7 +204,7 @@
             }
             if(window.App.config.ab.hasOwnProperty('cached_home_timeline')) {
                 const cht = window.App.config.ab.cached_home_timeline == true;
-                this.baseApi = cht ? '/api/v1/timelines/' : '/api/pixelfed/v1/timelines/';
+                this.baseApi = cht ? '/api/v1/timelines/' : '/api/v1/timelines/';
             }
             this.fetchSettings();
         },
@@ -261,10 +261,19 @@
                     }
                 } else {
                     url = this.baseApi + this.getScope();
-                    params = {
-                        max_id: this.max_id,
-                        limit: 6,
-                        '_pe': 1,
+
+                    if(this.max_id === 0) {
+                        params = {
+                            min_id: 1,
+                            limit: 6,
+                            '_pe': 1,
+                        }
+                    } else {
+                        params = {
+                            max_id: this.max_id,
+                            limit: 6,
+                            '_pe': 1,
+                        }
                     }
                 }
                 if(this.getScope() === 'network') {