diff --git a/app/Helpers/FirstParty/OpenAI/OpenAI.php b/app/Helpers/FirstParty/OpenAI/OpenAI.php index d6abc3e..e4af1ae 100644 --- a/app/Helpers/FirstParty/OpenAI/OpenAI.php +++ b/app/Helpers/FirstParty/OpenAI/OpenAI.php @@ -18,7 +18,6 @@ public static function getRssPostMetaGpt3($user_prompt, $model_max_tokens = 1536 return self::getChatCompletion($user_prompt, $system_prompt, $openai_config, $model_max_tokens, $timeout); } - public static function getRssPostMeta($user_prompt, $model_max_tokens = 1536, $timeout = 60) { diff --git a/app/Jobs/Tasks/BrowseRSSLatestNewsTask.php b/app/Jobs/Tasks/BrowseRSSLatestNewsTask.php index f78de74..8b71ebd 100644 --- a/app/Jobs/Tasks/BrowseRSSLatestNewsTask.php +++ b/app/Jobs/Tasks/BrowseRSSLatestNewsTask.php @@ -11,7 +11,6 @@ public static function handleMulti($hours = 3) { $rss_urls = config('platform.global.rss'); - $raw_posts = []; foreach ($rss_urls as $rss_url) { @@ -29,7 +28,6 @@ public static function handleSingle($rss_url, $hours = 3) { $blacklist_rss_post_domain = config('platform.global.blacklist_rss_post_domain'); - $f = FeedReader::read($rss_url); $raw_posts = []; @@ -44,17 +42,12 @@ public static function handleSingle($rss_url, $hours = 3) $title = trim($item->get_title()); $description = trim($item->get_content()); - $domain = get_domain_from_url($item->get_link()); - if (in_array($domain, $blacklist_rss_post_domain)) - { - continue ; + if (in_array($domain, $blacklist_rss_post_domain)) { + continue; } - - - $raw_posts[] = (object) [ 'source' => $f->get_title(), 'source_url' => $rss_url, diff --git a/app/Jobs/Tasks/ParseRssPostMetadataTask.php b/app/Jobs/Tasks/ParseRssPostMetadataTask.php index 400a48f..788d3ff 100644 --- a/app/Jobs/Tasks/ParseRssPostMetadataTask.php +++ b/app/Jobs/Tasks/ParseRssPostMetadataTask.php @@ -141,22 +141,15 @@ public static function handle(int $rss_post_id) $rss_post->keyword_list = implode(',', $words_to_add_in_keyword_list); - - if (is_empty($rss_post->bites)) - { - $rss_post->status = 'blocked'; + if (is_empty($rss_post->bites)) { + $rss_post->status = 'blocked'; + } else { + $rss_post->status = 'published'; } - else - { - $rss_post->status = 'published'; - } - if ($rss_post->save()) { - - if ($rss_post->status == 'published') - { + if ($rss_post->status == 'published') { $has_saved_keyword = false; diff --git a/config/platform/global.php b/config/platform/global.php index 21560e3..db3883d 100644 --- a/config/platform/global.php +++ b/config/platform/global.php @@ -11,10 +11,10 @@ ], 'blacklist_rss_post_domain' => [ - 'www.techinasia.com', - 'www.marktechpost.com', - 'twitter.com', - 'www.youtube.com', + 'www.techinasia.com', + 'www.marktechpost.com', + 'twitter.com', + 'www.youtube.com', ], 'rss' => [ diff --git a/resources/views/front/layouts/app.blade.php b/resources/views/front/layouts/app.blade.php index 27968e5..1f13315 100644 --- a/resources/views/front/layouts/app.blade.php +++ b/resources/views/front/layouts/app.blade.php @@ -15,4 +15,5 @@ + diff --git a/resources/views/front/partials/news_bites.blade.php b/resources/views/front/partials/news_bites.blade.php index 8d39b42..d6b23b7 100644 --- a/resources/views/front/partials/news_bites.blade.php +++ b/resources/views/front/partials/news_bites.blade.php @@ -14,82 +14,91 @@ @if ($post->entities) @foreach ($post->entities_keywords as $keyword) @if ($keyword->type == 'entity') - @if ($keyword->is_main) -

- {{ $keyword->value }} -

- @else + @if ($loop->iteration <= 2) + @if ($keyword->is_main) +

+ {{ $keyword->value }} +

+ @else +

+ {{ $keyword->value }} +

+ @endif + @elseif ($loop->iteration == 3)

- {{ $keyword->value }} + +{{ count($post->entities_keywords) - 3 }} more

- @endif + @break @endif - @endforeach - @endif - @if ($post->impact_level == 'high') -

- 🔥 High Impact -

- @endif - - -
- @if ($post->category) - {{ $post->category->name }} - - @endif - - - @if ($post->published_at->isBetween(now()->subDays(1), now())) - {{ $post->published_at->diffForHumans() }} - @else - {{ $post->published_at->format('d M') }} @endif - - - - {{ min_read($post->bites) }} -
- - - -
-
- - @if (!is_empty($post->bites)) -
The Bite:
-
{{ $post->bites }}
- @endif - - @if (in_array($post->impact_level, ['medium', 'high'])) -
-
-
Social Impact:
-
{{ $post->impact }}
-
-
- @endif - @if ($post->entities) -
- More about: @foreach ($post->entities_keywords as $keyword) - #{{ $keyword->value_lowercased }} @endforeach -
- @endif -
- Read more at: - {{ get_domain_from_url($post->post_url) }} + + @endif + @if ($post->impact_level == 'high') +

+ 🔥 High Impact +

+ @endif
+ +
+ @if ($post->category) + {{ $post->category->name }} + + @endif + + + @if ($post->published_at->isBetween(now()->subDays(1), now())) + {{ $post->published_at->diffForHumans() }} + @else + {{ $post->published_at->format('d M') }} + @endif + + + + {{ min_read($post->bites) }} +
+
+ + +
+
+ + @if (!is_empty($post->bites)) +
The Bite:
+
{{ $post->bites }}
+ @endif + + @if (in_array($post->impact_level, ['medium', 'high'])) +
+
+
Social Impact:
+
{{ $post->impact }}
+
+
+ @endif + @if ($post->entities) +
+ More about: @foreach ($post->entities_keywords as $keyword) + #{{ $keyword->value_lowercased }} + @endforeach +
+ @endif +
+ Read the full article: + + {{ get_domain_from_url($post->post_url) }}
- @endforeach +
+@endforeach diff --git a/routes/tests.php b/routes/tests.php index d69d0e9..ddb9e13 100644 --- a/routes/tests.php +++ b/routes/tests.php @@ -62,10 +62,9 @@ for ($i = 1; $i <= $last_record->id; $i++) { $rss_post = RssPost::find($i); - if (!is_null($rss_post)) - { - $rss_post->post_domain = get_domain_from_url($rss_post->post_url); - $rss_post->save(); + if (! is_null($rss_post)) { + $rss_post->post_domain = get_domain_from_url($rss_post->post_url); + $rss_post->save(); } }