Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Merge pull request #1219 from coollabsio/next

Browse Source 
Fixes
This commit is contained in:
Andras Bacsai 2023-09-11 10:50:18 +02:00 committed by GitHub
commit 26f490bb00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Notifications/Internal/GeneralNotification.php
View File

@ -19,7 +19,17 @@ public function __construct(public string $message)
public function via(object $notifiable): array public function via(object $notifiable): array
{ {
return [TelegramChannel::class, DiscordChannel::class]; $channels = [];
$isDiscordEnabled = data_get($notifiable, 'discord_enabled');
$isTelegramEnabled = data_get($notifiable, 'telegram_enabled');
if ($isDiscordEnabled) {
$channels[] = DiscordChannel::class;
}
if ($isTelegramEnabled) {
$channels[] = TelegramChannel::class;
}
return $channels;
} }
public function toDiscord(): string public function toDiscord(): string

2
resources/views/auth/two-factor-challenge.blade.php
View File

@ -20,7 +20,7 @@
</template> </template>
<template x-if="showRecovery"> <template x-if="showRecovery">
<div> <div>
<x-forms.input required type="text" name="recovery_code " <x-forms.input required type="text" name="recovery_code"
label="{{ __('input.recovery_code') }}" /> label="{{ __('input.recovery_code') }}" />
<div class="pt-2 text-xs cursor-pointer hover:underline hover:text-white" <div class="pt-2 text-xs cursor-pointer hover:underline hover:text-white"
x-on:click="showRecovery = !showRecovery">Use x-on:click="showRecovery = !showRecovery">Use