tracer/speedBB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed post count

Browse Source
This commit is contained in:
Micha
2026-01-23 19:26:42 +01:00
parent 662e00bec1
commit bc893b644d
3 changed files with 69 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app/Http/Controllers/AuthController.php
View File

@@ -22,17 +22,18 @@ class AuthController extends Controller
public function register(Request $request, CreateNewUser $creator): JsonResponse
{
$input = [
'name' => $request->input('name') ?? $request->input('username'),
'email' => $request->input('email'),
'password' => $request->input('password') ?? $request->input('plainPassword'),
'password_confirmation' => $request->input('password_confirmation') ?? $request->input('plainPassword'),
'name' => $request->input(key: 'name') ?? $request->input(key: 'username'),
'email' => $request->input(key: 'email'),
'password' => $request->input(key: 'password') ?? $request->input(key: 'plainPassword'),
'password_confirmation' => $request->input(key: 'password_confirmation')
?? $request->input(key: 'plainPassword'),
];
$user = $creator->create($input);
$user = $creator->create(input: $input);
$user->sendEmailVerificationNotification();
return response()->json([
return response()->json(data: [
'user_id' => $user->id,
'email' => $user->email,
'message' => 'Verification email sent.',
@@ -41,46 +42,46 @@ class AuthController extends Controller
public function login(Request $request): JsonResponse
{
$request->merge([
'login' => $request->input('login', $request->input('email')),
$request->merge(input: [
'login' => $request->input(key: 'login', default: $request->input(key: 'email')),
]);
$request->validate([
$request->validate(rules: [
'login' => ['required', 'string'],
'password' => ['required', 'string'],
]);
$login = trim((string) $request->input('login'));
$loginNormalized = Str::lower($login);
$login = trim(string: (string) $request->input(key: 'login'));
$loginNormalized = Str::lower(value: $login);
$userQuery = User::query();
if (filter_var($login, FILTER_VALIDATE_EMAIL)) {
$userQuery->whereRaw('lower(email) = ?', [$loginNormalized]);
if (filter_var(value: $login, filter: FILTER_VALIDATE_EMAIL)) {
$userQuery->whereRaw(sql: 'lower(email) = ?', bindings: [$loginNormalized]);
} else {
$userQuery->where('name_canonical', $loginNormalized);
$userQuery->where(column: 'name_canonical', operator: $loginNormalized);
}
$user = $userQuery->first();
if (!$user || !Hash::check($request->input('password'), $user->password)) {
throw ValidationException::withMessages([
if (!$user || !Hash::check(value: $request->input(key: 'password'), hashedValue: $user->password)) {
throw ValidationException::withMessages(messages: [
'login' => ['Invalid credentials.'],
]);
}
if (!$user->hasVerifiedEmail()) {
return response()->json([
return response()->json(data : [
'message' => 'Email not verified.',
], 403);
], status: 403);
}
$token = $user->createToken('api')->plainTextToken;
$token = $user->createToken(name: 'api')->plainTextToken;
return response()->json([
return response()->json(data: [
'token' => $token,
'user_id' => $user->id,
'email' => $user->email,
'roles' => $user->roles()->pluck('name')->values(),
'roles' => $user->roles()->pluck(column: 'name')->values(),
]);
}
@@ -88,13 +89,13 @@ class AuthController extends Controller
{
$user = User::findOrFail($id);
if (!hash_equals($hash, sha1($user->getEmailForVerification()))) {
abort(403);
if (!hash_equals(known_string: $hash, user_string: sha1(string: $user->getEmailForVerification()))) {
abort(code: 403);
}
if (!$user->hasVerifiedEmail()) {
$user->markEmailAsVerified();
event(new Verified($user));
event(new Verified(user: $user));
}
return redirect('/login');

4
resources/js/components/PortalTopicRow.jsx
View File

@@ -28,6 +28,8 @@ export default function PortalTopicRow({ thread, forumName, forumId, showForum =
return `${day}.${month}.${year} ${hours}:${minutes}:${seconds}`
}
const repliesCount = Math.max((thread.posts_count ?? 0) - 1, 0)
return (
<div className="bb-portal-topic-row">
<div className="bb-portal-topic-main">
@@ -72,7 +74,7 @@ export default function PortalTopicRow({ thread, forumName, forumId, showForum =
</div>
</div>
</div>
<div className="bb-portal-topic-cell">{thread.posts_count ?? 0}</div>
<div className="bb-portal-topic-cell">{repliesCount}</div>
<div className="bb-portal-topic-cell">{thread.views_count ?? 0}</div>
<div className="bb-portal-topic-cell bb-portal-topic-cell--last">
<div className="bb-portal-last">

41
resources/js/pages/Home.jsx
View File

@@ -91,7 +91,48 @@ export default function Home() {
nodes.forEach((node) => sortNodes(node.children))
}
const aggregateNodes = (node) => {
if (!node.children?.length) {
return {
threads: node.threads_count ?? 0,
views: node.views_count ?? 0,
posts: node.posts_count ?? 0,
last: node.last_post_at ? { at: node.last_post_at, node } : null,
}
}
let threads = node.threads_count ?? 0
let views = node.views_count ?? 0
let posts = node.posts_count ?? 0
let last = node.last_post_at ? { at: node.last_post_at, node } : null
node.children.forEach((child) => {
const agg = aggregateNodes(child)
threads += agg.threads
views += agg.views
posts += agg.posts
if (agg.last && (!last || agg.last.at > last.at)) {
last = agg.last
}
})
node.threads_count = threads
node.views_count = views
node.posts_count = posts
if (last) {
const source = last.node
node.last_post_at = source.last_post_at
node.last_post_user_id = source.last_post_user_id
node.last_post_user_name = source.last_post_user_name
node.last_post_user_rank_color = source.last_post_user_rank_color
node.last_post_user_group_color = source.last_post_user_group_color
}
return { threads, views, posts, last }
}
sortNodes(roots)
roots.forEach((root) => aggregateNodes(root))
return roots
}, [forums])