Merge branch 'main' into develop

# Conflicts: # public/build/manifest.json
owlchester · Aug 12, 2023 · 9bda8dc · 9bda8dc
2 parents 66fe29e + 9132ddc
commit 9bda8dc
Show file tree

Hide file tree

Showing 32 changed files with 114 additions and 60 deletions.
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -48,7 +48,7 @@ protected function schedule(Schedule $schedule): void
         $schedule->command(CleanupEntityLogs::class)->dailyAt('03:30');
         $schedule->command(AnonymiseUserLogs::class)->dailyAt('03:50');
         $schedule->command(CleanupTrashed::class)->dailyAt('02:15');
-        //$schedule->command(CleanupUsers::class)->dailyAt('01:50');
+        $schedule->command(CleanupUsers::class)->dailyAt('01:50');
     }
 
     /**

diff --git a/app/Http/Controllers/Entity/AttributeController.php b/app/Http/Controllers/Entity/AttributeController.php
@@ -70,7 +70,8 @@ public function index(Entity $entity)
             'entity',
             'model',
             'marketplaceTemplate',
-            'template'
+            'template',
+            'campaign'
         ));
     }
 
@@ -115,7 +116,8 @@ public function dashboard(Entity $entity)
             'entity',
             'model',
             'marketplaceTemplate',
-            'template'
+            'template',
+            'campaign'
         ));
     }
 

diff --git a/app/Http/Controllers/Entity/StoryController.php b/app/Http/Controllers/Entity/StoryController.php
@@ -55,6 +55,7 @@ public function more(Entity $entity)
         return view('entities.components.posts')
             ->with('entity', $entity)
             ->with('model', $entity->child)
+            ->with('more', true)
             ->with('campaign', $campaign)
             ->with('pinnedPosts', $posts);
     }

diff --git a/app/Http/Resources/Entity.php b/app/Http/Resources/Entity.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Str;
 
 class Entity extends EntityChild
@@ -24,6 +25,7 @@ public function toArray($request)
         $url = $model->url();
         $lang = request()->header('kanka-locale', auth()->user()->locale ?? 'en');
         $url = Str::replaceFirst('campaign/', $lang . '/campaign/', $url);
+        $apiViewUrl = 'campaigns.' . $model->pluralType() . '.show';
 
         return [
             'id' => $model->child->id,
@@ -49,7 +51,7 @@ public function toArray($request)
 
             'urls' => [
                 'view' => $url,
-                'api' => route('campaigns.' . $model->pluralType() . '.show', [$model->campaign_id, $model->entity_id]),
+                'api' => Route::has($apiViewUrl) ? route($apiViewUrl, [$model->campaign_id, $model->entity_id]) : null,
             ]
         ];
     }

diff --git a/app/Mail/Purge/FirstWarning.php b/app/Mail/Purge/FirstWarning.php
@@ -40,6 +40,7 @@ public function envelope(): Envelope
         return new Envelope(
             from: new Address('[email protected]', 'Kanka'),
             subject: __('emails/purge/first.title', ['amount' => config('purge.users.first.limit')]),
+            tags: ['purge', 'first']
         );
     }
 

diff --git a/app/Mail/Purge/SecondWarning.php b/app/Mail/Purge/SecondWarning.php
@@ -5,6 +5,7 @@
 use App\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Address;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;
@@ -37,7 +38,9 @@ public function __construct(User $user, mixed $campaigns)
     public function envelope(): Envelope
     {
         return new Envelope(
+            from: new Address('[email protected]', 'Kanka'),
             subject: __('emails/purge/second.title', ['amount' => config('purge.users.second.limit')]),
+            tags: ['purge', 'second']
         );
     }
 

diff --git a/app/Models/Campaign.php b/app/Models/Campaign.php
@@ -203,7 +203,10 @@ public function adminCount(): int
      */
     public function userIsMember(User $user = null): bool
     {
-        return CampaignCache::members()->where('user_id', $user ?? auth()->user()->id)->count() == 1;
+        if (empty($user)) {
+            $user = auth()->user();
+        }
+        return CampaignCache::members()->where('user_id', $user->id)->count() == 1;
     }
 
     /**

diff --git a/app/Models/Location.php b/app/Models/Location.php
@@ -224,7 +224,9 @@ public function allCharacters()
         };
 
         $table = new Character();
-        return Character::whereIn($table->getTable() . '.location_id', $locationIds)->with('location');
+        return Character::whereIn($table->getTable() . '.location_id', $locationIds)
+            ->with('location')
+            ->has('entity');
     }
 
     /**

diff --git a/app/Models/TimelineElement.php b/app/Models/TimelineElement.php
@@ -201,4 +201,12 @@ public function mentions()
     {
         return $this->hasMany('App\Models\EntityMention', 'timeline_element_id', 'id');
     }
+
+    public function visible(): bool
+    {
+        if (empty($this->entity_id)) {
+            return true;
+        }
+        return !empty($this->entity->child);
+    }
 }
diff --git a/app/Models/TimelineEra.php b/app/Models/TimelineEra.php
@@ -181,6 +181,9 @@ public function positionOptions($position = null, bool $new = false): array
         $elements = $this->orderedElements;
         $hasFirst = false;
         foreach ($elements as $element) {
+            if (!$element->visible()) {
+                continue;
+            }
             if (!$hasFirst) {
                 $hasFirst = true;
                 $options[1] = __('posts.position.first');

diff --git a/app/Services/AttributeService.php b/app/Services/AttributeService.php
@@ -241,11 +241,11 @@ public function templateList(): array
         }
 
         // Kanka templates - deprecated as of 1.30
-        /*$key = __('attributes/templates.list.kanka');
-        foreach (config('attribute-templates.templates') as $code => $class) {
-            $template = new $class();
-            $templates[$key][$code] = $template->name();
-        }*/
+//        $key = __('attributes/templates.list.kanka');
+//        foreach (config('attribute-templates.templates') as $code => $class) {
+//            $template = new $class();
+//            $templates[$key][$code] = $template->name();
+//        }
 
         // If the campaign isn't boosted, or the marketplace isn't enable, end here
         if (!$this->campaign->boosted() || !config('marketplace.enabled')) {

diff --git a/app/Services/Logs/ApiLogService.php b/app/Services/Logs/ApiLogService.php
@@ -11,7 +11,7 @@ class ApiLogService
 
     public function log()
     {
-        if (!env('DB_LOGS_DATABASE', false)) {
+        if (!config('logging.api')) {
             return;
         }
 

diff --git a/app/Services/MentionsService.php b/app/Services/MentionsService.php
@@ -485,9 +485,30 @@ protected function extractAndReplace()
         // Clean up weird ` chars that break the js
         $this->text = str_replace('`', '\'', $this->text);
 
+        $this->fixGalleryUrls();
+
         return $this->text;
     }
 
+    /**
+     * The gallery injects images as a thumbnail, instead of the final URL.
+     * Meaning that when we switched from images.kanka.io to th.kanka.io,
+     * all the gallery images in text were broken.
+     * @return $this
+     */
+    protected function fixGalleryUrls(): self
+    {
+        if (empty(config('thumbor.key'))) {
+            return $this;
+        }
+        $this->text = Str::replace(
+            'https://images.kanka.io/user/',
+            config('thumbor.url'),
+            $this->text
+        );
+        return $this;
+    }
+
     /**
      * @return string
      */

diff --git a/app/Services/Subscription/SubscriptionEndService.php b/app/Services/Subscription/SubscriptionEndService.php
@@ -25,7 +25,10 @@ public function run(bool $dispatch = true): int
 
         $this->logs[] = 'Sofort';
         $subscriptions = Subscription::with(['user', 'user.boosts', 'user.boosts.campaign'])
-            ->where('stripe_id', 'like', 'sofort_%')
+            ->where(function ($sub) {
+                $sub->where('stripe_id', 'like', 'sofort_%')
+                ->orWhere('stripe_id', 'like', 'giropay_%');
+            })
             ->where('stripe_status', 'active')
             ->whereDate('ends_at', '<', Carbon::today()->toDateString())
             ->get();

diff --git a/app/Services/SubscriptionService.php b/app/Services/SubscriptionService.php
@@ -523,7 +523,7 @@ public function sourceCharge(array $payload)
                     'green'
                 )
             );
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             $this->user->notify(
                 new Header(
                     'subscriptions.charge_fail',

diff --git a/config/logging.php b/config/logging.php
@@ -88,4 +88,6 @@
             'level' => 'debug',
         ],
     ],
+
+    'api' => env('DB_LOGS_DATABASE'),
 ];
diff --git a/database/migrations/2023_06_10_220139_create_api_logs.php b/database/migrations/2023_06_10_220139_create_api_logs.php
@@ -10,7 +10,7 @@
      */
     public function up(): void
     {
-        if (!env('DB_LOGS_DATABASE', false)) {
+        if (!config('logging.api')) {
             return;
         }
         Schema::connection('logs')->create('api_logs', function (Blueprint $table) {
@@ -29,7 +29,7 @@ public function up(): void
      */
     public function down(): void
     {
-        if (!env('DB_LOGS_DATABASE', false)) {
+        if (!config('logging.api')) {
             return;
         }
         Schema::connection('logs')->dropIfExists('api_logs');

diff --git a/database/migrations/2023_06_15_210220_create_user_logs_table.php b/database/migrations/2023_06_15_210220_create_user_logs_table.php
@@ -10,6 +10,9 @@
      */
     public function up(): void
     {
+        if (!config('logging.api')) {
+            return;
+        }
         Schema::connection('logs')->create('user_logs', function (Blueprint $table) {
             $table->id();
             $table->integer('user_id')->unsigned();
@@ -27,6 +30,9 @@ public function up(): void
      */
     public function down(): void
     {
+        if (!config('logging.api')) {
+            return;
+        }
         Schema::dropIfExists('user_logs');
     }
 };
diff --git a/lang/en/settings/appearance.php b/lang/en/settings/appearance.php
@@ -39,7 +39,7 @@
         'advanced-mentions'     => 'When editing texts, control if mentions are rendered as the entity\'s name, or as the advanced mention.',
         'campaign-order'        => 'Change the order in which campaigns are listed in the campaign switcher.',
         'date-format'           => 'When available, control the format in which to display real world dates.',
-        'default-nested'        => 'Control how lists which support nesting to be displayed by default.',
+        'default-nested'        => 'Control how lists which support nesting are displayed by default.',
         'editor'                => 'Using the legacy text editor (TinyMCE) doesn\'t support mentions on mobile devices, campaign galleries or other advanced features.',
         'entity-explore'        => 'Control the way in which entity lists are displayed on campaigns.',
         'new-entity-workflow'   => 'Control which interface you are taken to after creating a new entity.',

diff --git a/public/build/assets/app-56f9e212.js b/public/build/assets/app-56f9e212.js
diff --git a/public/build/manifest.json b/public/build/manifest.json
@@ -320,4 +320,4 @@
     "isEntry": true,
     "src": "resources/sass/vendor.scss"
   }
-}
+}
diff --git a/resources/js/post-layouts.js b/resources/js/post-layouts.js
@@ -5,18 +5,18 @@ $(document).ready(function () {
 function initPostLayoutsForm() {
     let selector = $('#post-layout-selector');
     if (selector.length === 0) {
-        return false;
+        return;
     }
     selector.change(function (e) {
         e.preventDefault();
         let selected = $(this).find(":selected").val();
 
-        if (selected == '') {
+        if (selected === '') {
             $('#field-entry').show();
             $('#field-location').show();
             $('#field-display').show();
-            $('#post-layout-subform').hide();
 
+            $('#post-layout-subform').hide();
         } else {
             $('#field-entry').hide();
             $('#field-location').hide();

diff --git a/resources/js/utility/formError.js b/resources/js/utility/formError.js
@@ -35,6 +35,8 @@ window.formErrorHandler = function(err, form) {
             foundAllErrors = false;
             logs.push(errors[i][0]);
         }
+
+        window.showToast(errors[i][0], 'toast-error');
     });
 
     // If not all error fields could be found, show a generic error message on top of the form.
@@ -49,7 +51,7 @@ window.formErrorHandler = function(err, form) {
     }
 
     // No tabs? Try no further
-    if ($(this).find('.tab-content').length === 0) {
+    if ($(form).find('.tab-content').length === 0) {
         return;
     }
 
@@ -60,10 +62,11 @@ window.formErrorHandler = function(err, form) {
     if (!firstItemDom[0]) {
         return;
     }
-    firstItemDom[0].scrollIntoView({ behavior: 'smooth' });
     $('.tab-content .active').removeClass('active');
     $('.nav-tabs li.active').removeClass('active');
     let firstPane = $('[name="' + firstItem + '"').closest('.tab-pane');
     firstPane.addClass('active');
     $('a[href="#' + firstPane.attr('id') + '"]').closest('li').addClass('active');
+
+    firstItemDom[0].scrollIntoView({ behavior: 'smooth' });
 }
diff --git a/resources/views/cruds/forms/attributes/_buttons.blade.php b/resources/views/cruds/forms/attributes/_buttons.blade.php
@@ -38,7 +38,7 @@
         </ul>
     </div>
     @if (isset($entity) && $entity->attributes()->where('is_hidden', '1')->get()->has('0'))
-        <button type="button" class="btn2 btn-ghost" data-toggle="modal" data-target="#hidden-attributes">
+        <button type="button" class="btn2 btn-ghost" data-toggle="dialog" data-target="hidden-attributes">
             <i class="fa-solid fa-eye-slash" aria-hidden="true"></i>
             {{ __('entities/attributes.actions.show_hidden') }}
         </button>
@@ -83,23 +83,13 @@
 @section('modals')
     @parent
     @if (isset($entity) && $entity->attributes()->where('is_hidden', '1')->get()->has('0'))
-    <div class="modal fade" id="hidden-attributes" tabindex="-1" role="dialog" aria-labelledby="clickConfirmLabel">
-            <div class="modal-dialog" role="document">
-                <div class="modal-content bg-base-100 rounded-2xl text-center">
-                    <div class="modal-body">
-                        <x-dialog.close />
-                        <h4 class="modal-title md-5" id="clickModalLabel">{{ __('entities/attributes.show.hidden') }}</h4>
-                        <p class="mt-5">
-                            @foreach ($entity->attributes()->ordered()->get() as $attribute)
-                                @if ($attribute->is_hidden)
-                                    @include('cruds.forms.attributes._hidden_attribute')
-                                @endif
-                            @endforeach
-                        </p>
-                    </div>
-                </div>
-            </div>
-        </div>
+        <x-dialog id="hidden-attributes" :title="__('entities/attributes.show.hidden')" :full="true">
+            @foreach ($entity->attributes()->ordered()->get() as $attribute)
+                @if ($attribute->is_hidden)
+                    @include('cruds.forms.attributes._hidden_attribute')
+                @endif
+            @endforeach
+        </x-dialog>
     @endif
     <x-dialog id="attributes-delete-all-confirm" :title="__('crud.delete_modal.title')">
         <p>

diff --git a/resources/views/cruds/forms/attributes/_hidden_attribute.blade.php b/resources/views/cruds/forms/attributes/_hidden_attribute.blade.php
@@ -1,12 +1,10 @@
-<div class="field-hidden-attribute">
-    <div class="row attribute_row">
-        <div class="col-xs-12 col-sm-4">
-            <dt>{{ $attribute->name }}</dt>
-        </div>
-        @if ($attribute->isCheckbox())
-            <i class="@if($attribute->value == 1)fa-solid fa-check-square @else fa-solid fa-square @endif mr-2 fa-2x" data-tab="{{ __('entities/attributes.visibility.tab') }}" data-entry="{{ __('entities/attributes.visibility.entry') }}" title="@if($attribute->isPinned()) {{ __('entities/attributes.visibility.entry') }} @else  {{ __('entities/attributes.visibility.tab') }} @endif"></i>
-        @else
-            {{ $attribute->value }}
-        @endif
-    </div>
+<div class="field-hidden-attribute w-full grid grid-cols-2">
+    <span>{{ $attribute->name }}</span>
+    <span>
+    @if ($attribute->isCheckbox())
+        <i class="@if($attribute->value == 1)fa-solid fa-check-square @else fa-solid fa-square @endif mr-2 fa-2x" data-tab="{{ __('entities/attributes.visibility.tab') }}" data-entry="{{ __('entities/attributes.visibility.entry') }}" title="@if($attribute->isPinned()) {{ __('entities/attributes.visibility.entry') }} @else  {{ __('entities/attributes.visibility.tab') }} @endif"></i>
+    @else
+        {{ $attribute->value }}
+    @endif
+    </span>
 </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ class ApiLogService @@
         public function log()
         {
-            if (!env('DB_LOGS_DATABASE', false)) {
+            if (!config('logging.api')) {
                 return;
             }
@@ Expand Down @@