Skip to content

Commit c51cdb5

Browse files
committed
feat: Prepare code for MEP
1 parent 0fa781e commit c51cdb5

File tree

12 files changed

+26
-79
lines changed

12 files changed

+26
-79
lines changed

app/Console/Kernel.php

Lines changed: 0 additions & 34 deletions
This file was deleted.

app/Listeners/SendNewThreadNotification.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@
55
namespace App\Listeners;
66

77
use App\Events\ThreadWasCreated;
8-
use App\Notifications\PostThreadToSlack;
98

109
final class SendNewThreadNotification
1110
{
1211
public function handle(ThreadWasCreated $event): void
1312
{
14-
$thread = $event->thread;
15-
16-
$thread->user->notify(new PostThreadToSlack($thread));
13+
// @Todo: Send notification to Discord
1714
}
1815
}

app/Notifications/PostThreadToSlack.php

Lines changed: 0 additions & 34 deletions
This file was deleted.

config/markdown.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
'username' => [
6767
'prefix' => '@',
6868
'pattern' => '[a-z\d](?:[a-z\d]|-(?=[a-z\d])){0,38}(?!\w)',
69-
'generator' => config('app.url').'/user/%s',
69+
'generator' => config('app.url').'/@%s',
7070
],
7171
],
7272

lang/en/pages/discussion.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
'popular' => 'Popular',
1919
'active' => 'Active',
2020
],
21-
'comments_count' => 'Comments (:count)',
21+
'comments_count' => 'Comments',
2222
'convert_to_thread' => 'Convert to thread',
2323
'confirm_conversion' => 'Confirm conversion',
2424
'confirm_comment_remove' => 'Are you sure you want to delete this comment?',

lang/fr/pages/discussion.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
'popular' => 'Populaire',
1919
'active' => 'Actif',
2020
],
21-
'comments_count' => 'Commentaires (:count)',
21+
'comments_count' => 'Commentaires',
2222
'convert_to_thread' => 'Convertir en sujet',
2323
'confirm_conversion' => 'Confirmez la conversion',
2424
'confirm_comment_remove' => 'Êtes-vous sûr de vouloir supprimer ce commentaire ?',

resources/views/components/feeds/created_reply.blade.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,12 @@ class="size-5 text-gray-400 dark:text-gray-500"
1212
</x-slot:icon>
1313

1414
{{ __('pages/account.activities.answer_reply') }}
15+
1516
<x-link
16-
:href="url('/forum/' . $activity->subject->replyAble->slug . '#reply-'. $activity->subject->id)"
17+
:href="url(
18+
($activity->subject->replyable_type === 'discussion' ? '/discussions/' : '/forum/')
19+
. $activity->subject->replyAble->slug . '#reply-'. $activity->subject->id
20+
)"
1721
class="font-medium text-primary-600 hover:text-primary-700 dark:text-primary-500 dark:hover:text-primary-600"
1822
>
1923
{{ $activity->subject->replyAble->title }}

resources/views/layouts/forum.blade.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ class="hidden"
6464
:href="route('forum.index') . '?no-replies=true'"
6565
:active="request()->getUri() === route('forum.index') . '?no-replies'"
6666
icon="untitledui-message-x-square"
67+
class="hidden"
6768
>
6869
{{ __('pages/forum.navigation.no_reply') }}
6970
</x-nav.forum-link>

resources/views/livewire/components/discussion/comments.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@if ($this->comments->isNotEmpty())
33
<ul role="list" class="space-y-5">
44
@foreach ($this->comments as $comment)
5-
<li class="comment" id="c{{ $comment->id }}">
5+
<li class="comment" id="reply-{{ $comment->id }}">
66
<livewire:components.discussion.comment :comment="$comment" :key="$comment->id" />
77
</li>
88
@endforeach

resources/views/livewire/pages/discussions/single-discussion.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class="mx-auto mt-6 text-sm prose prose-sm prose-green max-w-none dark:prose-inv
114114

115115
<div class="flex items-center justify-between py-6">
116116
<p class="font-semibold text-gray-900 dark:text-white">
117-
{{ __('pages/discussion.comments_count', ['count' => $discussion->count_all_replies_with_child]) }}
117+
{{ __('pages/discussion.comments_count') }}
118118
</p>
119119

120120
</div>

0 commit comments

Comments
 (0)