From bab085fdf6479328378559bbee98bd3a13efcde5 Mon Sep 17 00:00:00 2001 From: Mh-Asmi Date: Fri, 17 May 2024 20:05:17 +0400 Subject: [PATCH] fix web source filter to avoid mobile posts --- .../V5/Repository/Post/EloquentPostRepository.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Ushahidi/Modules/V5/Repository/Post/EloquentPostRepository.php b/src/Ushahidi/Modules/V5/Repository/Post/EloquentPostRepository.php index cc47e0573..21025b31f 100644 --- a/src/Ushahidi/Modules/V5/Repository/Post/EloquentPostRepository.php +++ b/src/Ushahidi/Modules/V5/Repository/Post/EloquentPostRepository.php @@ -209,10 +209,15 @@ private function setSearchCondition(PostSearchFields $search_fields, $query, boo $join->on('posts.id', '=', 'messages.post_id'); $join->where('messages.direction', '=', "incoming"); }); + // To Do : update when put all source in one place , no this condition id complex !! if ($search_fields->webSource()) { $query->where(function ($builder) use ($search_fields) { - $builder->whereNull('messages.type') - ->orWhereIn('messages.type', $search_fields->source()); + $builder->where(function ($builder_1) { + $builder_1->whereNull('messages.type') + ->whereNull('posts.source'); + }); + $builder->orWhere('posts.source', 'web'); + $builder->orWhereIn('messages.type', $search_fields->source()); if (in_array('mobile', $search_fields->source())) { $builder->orWhere('posts.source', 'mobile'); }