admin/38443-vm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ReleaseV18+CadreOnline

Browse Source
This commit is contained in:
Flatlogic Bot 2026-02-21 17:35:44 +00:00
parent c1d3fb9875
commit a27d7005d7
4 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api_v1_roles.php
View File

@ -28,7 +28,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
// Fetch members and their roles // Fetch members and their roles
$stmt = db()->prepare(" $stmt = db()->prepare("
SELECT u.id, u.display_name as username, u.username as login_name, u.avatar_url, SELECT u.id, u.display_name as username, u.username as login_name, u.avatar_url, u.status,
GROUP_CONCAT(DISTINCT r.id) as role_ids, GROUP_CONCAT(DISTINCT r.id) as role_ids,
GROUP_CONCAT(DISTINCT r.name) as role_names, GROUP_CONCAT(DISTINCT r.name) as role_names,
(SELECT r2.color FROM roles r2 JOIN user_roles ur2 ON r2.id = ur2.role_id WHERE ur2.user_id = u.id AND r2.server_id = ? ORDER BY r2.position DESC LIMIT 1) as role_color, (SELECT r2.color FROM roles r2 JOIN user_roles ur2 ON r2.id = ur2.role_id WHERE ur2.user_id = u.id AND r2.server_id = ? ORDER BY r2.position DESC LIMIT 1) as role_color,

42
assets/js/main.js
View File

@ -889,23 +889,31 @@ document.addEventListener('DOMContentLoaded', () => {
} }
function updatePresenceUI(userId, status) { function updatePresenceUI(userId, status) {
const memberItem = document.querySelector(`.start-dm-btn[data-user-id="${userId}"] .message-avatar`); const selectors = [
if (memberItem) { `.start-dm-btn[data-user-id="${userId}"] .message-avatar`,
let indicator = memberItem.querySelector('.presence-indicator'); `.member-item[data-user-id="${userId}"] .message-avatar`
if (!indicator) { ];
indicator = document.createElement('div');
indicator.className = 'presence-indicator'; selectors.forEach(selector => {
memberItem.appendChild(indicator); const container = document.querySelector(selector);
if (container) {
let indicator = container.querySelector('.presence-indicator');
if (!indicator) {
indicator = document.createElement('div');
indicator.className = 'presence-indicator';
container.appendChild(indicator);
}
indicator.style.position = 'absolute';
indicator.style.bottom = '0';
indicator.style.right = '0';
indicator.style.width = '10px';
indicator.style.height = '10px';
indicator.style.borderRadius = '50%';
indicator.style.border = '2px solid var(--bg-members)';
indicator.style.backgroundColor = status === 'online' ? '#23a559' : '#80848e';
container.style.backgroundColor = status === 'online' ? '#23a559' : '#80848e';
} }
indicator.style.position = 'absolute'; });
indicator.style.bottom = '0';
indicator.style.right = '0';
indicator.style.width = '10px';
indicator.style.height = '10px';
indicator.style.borderRadius = '50%';
indicator.style.border = '2px solid var(--bg-members)';
indicator.style.backgroundColor = status === 'online' ? '#23a559' : '#80848e';
}
} }
// Presence indicators initialization (can be expanded) // Presence indicators initialization (can be expanded)
@ -1916,7 +1924,7 @@ document.addEventListener('DOMContentLoaded', () => {
item.innerHTML = ` item.innerHTML = `
<div class="message-avatar" style="width: 32px; height: 32px; background-color: ${statusColor}; position: relative; ${avatarBg}"> <div class="message-avatar" style="width: 32px; height: 32px; background-color: ${statusColor}; position: relative; ${avatarBg}">
${m.status === 'online' ? `<div style="position: absolute; bottom: 0; right: 0; width: 10px; height: 10px; background-color: #23a559; border-radius: 50%; border: 2px solid var(--bg-members);"></div>` : ''} <div class="presence-indicator" style="position: absolute; bottom: 0; right: 0; width: 10px; height: 10px; background-color: ${statusColor}; border-radius: 50%; border: 2px solid var(--bg-members);"></div>
</div> </div>
<span style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap; ${m.role_color ? `color: ${m.role_color};` : ''}"> <span style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap; ${m.role_color ? `color: ${m.role_color};` : ''}">
${escapeHTML(m.username)} ${escapeHTML(m.username)}

2
auth/logout.php
View File

@ -4,6 +4,8 @@ require_once __DIR__ . '/session.php';
$user = getCurrentUser(); $user = getCurrentUser();
if ($user) { if ($user) {
try { try {
// Update user status
db()->prepare("UPDATE users SET status = 'offline' WHERE id = ?")->execute([$user['id']]);
// Clean up DB session // Clean up DB session
db()->prepare("DELETE FROM voice_sessions WHERE user_id = ?")->execute([$user['id']]); db()->prepare("DELETE FROM voice_sessions WHERE user_id = ?")->execute([$user['id']]);
} catch (Exception $e) { } catch (Exception $e) {

8
index.php
View File

@ -134,6 +134,10 @@ function parse_emotes($content, $username_to_mention = null) {
requireLogin(); requireLogin();
$user = getCurrentUser(); $user = getCurrentUser();
if ($user) {
db()->prepare("UPDATE users SET status = 'online' WHERE id = ?")->execute([$user['id']]);
$user['status'] = 'online'; // Update local variable too
}
$current_user_id = $user['id']; $current_user_id = $user['id'];
$messages = []; // Initialize messages array $messages = []; // Initialize messages array
$threads = []; $threads = [];
@ -1684,7 +1688,9 @@ $projectImageUrl = $_SERVER['PROJECT_IMAGE_URL'] ?? '';
<div class="channel-item member-item" data-user-id="<?php echo $m['id']; ?>" data-username="<?php echo htmlspecialchars($m['username']); ?>" data-avatar="<?php echo htmlspecialchars($m['avatar_url'] ?? ''); ?>" data-role-ids="<?php echo $m['role_ids'] ?? ''; ?>" data-badge-data="<?php echo htmlspecialchars($m['badge_data'] ?? ''); ?>" style="color: var(--text-primary); margin-bottom: 8px; cursor: pointer;"> <div class="channel-item member-item" data-user-id="<?php echo $m['id']; ?>" data-username="<?php echo htmlspecialchars($m['username']); ?>" data-avatar="<?php echo htmlspecialchars($m['avatar_url'] ?? ''); ?>" data-role-ids="<?php echo $m['role_ids'] ?? ''; ?>" data-badge-data="<?php echo htmlspecialchars($m['badge_data'] ?? ''); ?>" style="color: var(--text-primary); margin-bottom: 8px; cursor: pointer;">
<div class="message-avatar" style="width: 32px; height: 32px; background-color: <?php echo ($m['status'] ?? 'offline') == 'online' ? '#23a559' : '#80848e'; ?>; position: relative; <?php echo $m['avatar_url'] ? "background-image: url('{$m['avatar_url']}');" : ""; ?>"> <div class="message-avatar" style="width: 32px; height: 32px; background-color: <?php echo ($m['status'] ?? 'offline') == 'online' ? '#23a559' : '#80848e'; ?>; position: relative; <?php echo $m['avatar_url'] ? "background-image: url('{$m['avatar_url']}');" : ""; ?>">
<?php if(($m['status'] ?? 'offline') == 'online'): ?> <?php if(($m['status'] ?? 'offline') == 'online'): ?>
<div style="position: absolute; bottom: 0; right: 0; width: 10px; height: 10px; background-color: #23a559; border-radius: 50%; border: 2px solid var(--bg-members);"></div> <div class="presence-indicator" style="position: absolute; bottom: 0; right: 0; width: 10px; height: 10px; background-color: #23a559; border-radius: 50%; border: 2px solid var(--bg-members);"></div>
<?php else: ?>
<div class="presence-indicator" style="position: absolute; bottom: 0; right: 0; width: 10px; height: 10px; background-color: #80848e; border-radius: 50%; border: 2px solid var(--bg-members);"></div>
<?php endif; ?> <?php endif; ?>
</div> </div>
<span style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap; <?php echo !empty($m['role_color']) ? "color: {$m['role_color']};" : ""; ?>"> <span style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap; <?php echo !empty($m['role_color']) ? "color: {$m['role_color']};" : ""; ?>">