kibi/f0ckm
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

adding user id to delete modal and making sure it does not fall back to "unknown"

Browse Source
This commit is contained in:
Kibi Kelburton
2026-05-14 16:37:29 +02:00
parent 6453144d97
commit 47eef70bdc
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/s/js/admin.js
View File

@@ -9,7 +9,8 @@
return { return {
postid: +idLink.innerText, postid: +idLink.innerText,
// Prefer data-username (raw DB username) over innerText (may be a display name) // Prefer data-username (raw DB username) over innerText (may be a display name)
poster: usernameEl?.dataset?.username || usernameEl?.innerText?.trim() || null, poster: (usernameEl?.dataset?.username || '').trim() || usernameEl?.innerText?.trim() || null,
authorId: usernameEl?.dataset?.authorId || null,
tags: [...inner.querySelectorAll(".badge")].map(t => t.innerText.slice(0, -2)) tags: [...inner.querySelectorAll(".badge")].map(t => t.innerText.slice(0, -2))
}; };
}; };
@@ -217,15 +218,18 @@
} }
const ctx = getContext(); const ctx = getContext();
if (!ctx) return; if (!ctx) return;
const { postid, poster } = ctx; const { postid, poster, authorId } = ctx;
if (typeof ModAction === 'undefined') return alert('Error: ModAction module not loaded'); if (typeof ModAction === 'undefined') return alert('Error: ModAction module not loaded');
const i18n = window.f0ckI18n || {}; const i18n = window.f0ckI18n || {};
const confirmTitle = i18n.item_delete_title || 'Delete Item'; const confirmTitle = i18n.item_delete_title || 'Delete Item';
const posterStr = poster
? (authorId ? `${poster} (${authorId})` : poster)
: 'unknown';
const confirmMsg = (i18n.item_delete_confirm || 'Are you sure you want to delete item {id} by {user}?') const confirmMsg = (i18n.item_delete_confirm || 'Are you sure you want to delete item {id} by {user}?')
.replace('{id}', postid) .replace('{id}', postid)
.replace('{user}', poster || 'unknown'); .replace('{user}', posterStr);
ModAction.confirm(confirmTitle, confirmMsg, async (reason) => { ModAction.confirm(confirmTitle, confirmMsg, async (reason) => {
// Flag immediately so the SSE delete_item handler skips navigation // Flag immediately so the SSE delete_item handler skips navigation

2
views/item-partial-legacy.html
View File

@@ -96,7 +96,7 @@
<a href="/{{ item.id }}" class="id-link" @if(user_alternative_infobox)style="display:none"@endif>{{ item.id }}</a> <a href="/{{ item.id }}" class="id-link" @if(user_alternative_infobox)style="display:none"@endif>{{ item.id }}</a>
@if(item.src.short)@if(!user_alternative_infobox) — @endif<a href="{{ item.src.long }}" target="_blank">{{ item.src.short }}</a>@endif @if(item.src.short)@if(!user_alternative_infobox) — @endif<a href="{{ item.src.long }}" target="_blank">{{ item.src.short }}</a>@endif
@if(session && !user_alternative_infobox) — [<a id="a_username" data-username="{!! item.username || '' !!}" href="/user/{{ (item.username || '').toLowerCase() }}" @if(item.author_id) tooltip="ID: {{ item.author_id }}" @endif @if(item.author_color) style="color: {{ item.author_color }}" @endif>{!! item.author_display_name || item.username || 'unknown' !!}</a>] @endif @if(session && !user_alternative_infobox) — [<a id="a_username" data-username="{{ item.username || '' }}" data-author-id="{{ item.author_id || '' }}" href="/user/{{ (item.username || '').toLowerCase() }}" @if(item.author_id) tooltip="ID: {{ item.author_id }}" @endif @if(item.author_color) style="color: {{ item.author_color }}" @endif>{!! item.author_display_name || item.username || 'unknown' !!}</a>] @endif
@if(item.is_oc)@if(!user_alternative_infobox || item.src.short) — @endif<span class="oc-badge" tooltip="Original Content">OC</span>@endif @if(item.is_oc)@if(!user_alternative_infobox || item.src.short) — @endif<span class="oc-badge" tooltip="Original Content">OC</span>@endif
</span> </span>
@if(!user_alternative_infobox) — <span class="badge badge-dark"><time class="timeago" tooltip="{{ item.timestamp.timefull }}">{{item.timestamp.timeago }}</time></span> — @endif @if(!user_alternative_infobox) — <span class="badge badge-dark"><time class="timeago" tooltip="{{ item.timestamp.timefull }}">{{item.timestamp.timeago }}</time></span> — @endif

2
views/item-partial-modern.html
View File

@@ -107,7 +107,7 @@
</div> </div>
<div class="blahlol"> <div class="blahlol">
<span class="badge badge-dark"> <span class="badge badge-dark">
<a href="/{{ item.id }}" class="id-link">{{ item.id }}</a>@if(item.src.short) — <a href="{{ item.src.long }}" target="_blank">{{ item.src.short }}</a>@endif @if(session) — [<a id="a_username" data-username="{!! item.username || '' !!}" href="/user/{{ item_username_lower }}" @if(item.author_id) tooltip="ID: {{ item.author_id }}" @endif @if(item.author_color) style="color: {{ item.author_color }}" @endif>{!! item.author_display_name || item.username || 'unknown' !!}</a>] @endif @if(item.is_oc) — <span class="oc-badge" tooltip="Original Content">OC</span>@endif <a href="/{{ item.id }}" class="id-link">{{ item.id }}</a>@if(item.src.short) — <a href="{{ item.src.long }}" target="_blank">{{ item.src.short }}</a>@endif @if(session) — [<a id="a_username" data-username="{{ item.username || '' }}" data-author-id="{{ item.author_id || '' }}" href="/user/{{ item_username_lower }}" @if(item.author_id) tooltip="ID: {{ item.author_id }}" @endif @if(item.author_color) style="color: {{ item.author_color }}" @endif>{!! item.author_display_name || item.username || 'unknown' !!}</a>] @endif @if(item.is_oc) — <span class="oc-badge" tooltip="Original Content">OC</span>@endif
</span> — </span> —
@if(halls_enabled && item.primaryHall) @if(halls_enabled && item.primaryHall)
<span class="badge hall-badge-wrap"> <span class="badge hall-badge-wrap">