Merge branch 'main' into feat/replace-blade-ui-kit-with-flux

Author: driesvints

README.md

@@ -19,13 +19,15 @@ This is the repository for the [Laravel.io](http://laravel.io) community portal.
 
 We'd like to thank these **amazing companies** for sponsoring us. If you are interested in becoming a sponsor, please visit <a href="https://github.com/sponsors/laravelio">the Laravel.io GitHub Sponsors page</a>.
 
+- **[NativePHP for Mobile](https://nativephp.com/mobile?ref=laravel.io)**
 - **[Eventy](https://https://eventy.io/?utm_source=Laravel.io&utm_campaign=eventy&utm_medium=advertisement)**
 - [Forge](https://forge.laravel.com)
 - [Envoyer](https://envoyer.io)
 - [Fathom](https://usefathom.com)
 - [Tinkerwell](https://tinkerwell.app)
 - [BairesDev](https://www.bairesdev.com/sponsoring-open-source-projects/)
 - [N-iX](https://www.n-ix.com/)
+- [Litslink](https://litslink.com/)
 
 ## Requirements
 

app/Http/Controllers/Articles/ArticlesController.php

@@ -42,7 +42,6 @@ public function index(Request $request)
             ->get();
 
         $articles = Article::published()
-            ->notPinned($pinnedArticles)
             ->latest('approved_at')
             ->{$filter}();
 

app/Markdown/MarkdownServiceProvider.php

@@ -14,7 +14,7 @@ class MarkdownServiceProvider extends ServiceProvider
 {
     public function register(): void
     {
-        $this->app->singleton(Converter::class, function () {
+        $this->app->singleton(Converter::class, function ($app, array $params = []) {
             $environment = new Environment([
                 'html_input' => 'escape',
                 'max_nesting_level' => 10,
@@ -29,7 +29,7 @@ public function register(): void
                 'external_link' => [
                     'internal_hosts' => config('app.host'),
                     'open_in_new_window' => true,
-                    'nofollow' => 'external',
+                    'nofollow' => ($params['nofollow'] ?? true) ? 'external' : '',
                 ],
             ]);
 

app/Models/Article.php

@@ -100,7 +100,7 @@ public function body(): string
 
     public function excerpt(int $limit = 100): string
     {
-        return Str::limit(strip_tags(md_to_html($this->body())), $limit);
+        return Str::limit(strip_tags(md_to_html($this->body(), false)), $limit);
     }
 
     public function hasHeroImageAuthor(): bool
@@ -273,11 +273,6 @@ public function scopePinned(Builder $query): Builder
         return $query->where('is_pinned', true);
     }
 
-    public function scopeNotPinned(Builder $query, Collection $pinnedArticles): Builder
-    {
-        return $query->whereNotIn('id', $pinnedArticles->pluck('id'));
-    }
-
     public function scopeShared(Builder $query): Builder
     {
         return $query->whereNotNull('shared_at');