From e9b4b79eff08f832744db8e20f6b4e91dd6c9c4f Mon Sep 17 00:00:00 2001 From: vgaNAR6ta Date: Thu, 9 Apr 2026 17:13:18 +0200 Subject: [PATCH] edit : gestion du ptn de REBLOG aaaaah xD --- v1-com-officielle/src/data/audioData.js | 18 +++++--- v1-com-officielle/src/data/msgData.js | 20 ++++++--- v1-com-officielle/src/data/peopleData.js | 54 +++++++++++++++--------- 3 files changed, 58 insertions(+), 34 deletions(-) diff --git a/v1-com-officielle/src/data/audioData.js b/v1-com-officielle/src/data/audioData.js index 09b7f1f..6749573 100644 --- a/v1-com-officielle/src/data/audioData.js +++ b/v1-com-officielle/src/data/audioData.js @@ -25,7 +25,7 @@ export async function loadAudioData() { if(!res.ok) throw new Error(`Server responded with ${res.status} ${res.statusText}`); const pouets = await res.json(); - const filtered = pouets.filter(p => aData.some(user => p.account.username === user)); + const filtered = pouets.filter(p => aData.some(user => p.account.username === user || p.reblog?.account.username === user.name)); //console.log(filtered); const files = {}; for (const user of aData) { @@ -35,18 +35,24 @@ export async function loadAudioData() { let audioFiles = []; for (const pouet of filtered){ + let selectedPouet; + if (pouet.reblog){ + selectedPouet = pouet.reblog; + } else { + selectedPouet = pouet; + } //ignorer les PJ autres que audio - if (pouet.media_attachments?.length > 0 && - !pouet.media_attachments[0].type.includes('audio')) { + if (selectedPouet.media_attachments?.length > 0 && + !selectedPouet.media_attachments[0].type.includes('audio')) { continue; } - if(pouet.media_attachments?.length > 0){ - let credits = creditsContent(pouet.content); + if(selectedPouet.media_attachments?.length > 0){ + let credits = creditsContent(selectedPouet.content); let entry = { track: credits.track, artist: credits.artist, - src: pouet.media_attachments[0].url + src: selectedPouet.media_attachments[0].url } audioFiles.push(entry); } diff --git a/v1-com-officielle/src/data/msgData.js b/v1-com-officielle/src/data/msgData.js index c4731ca..c128a39 100644 --- a/v1-com-officielle/src/data/msgData.js +++ b/v1-com-officielle/src/data/msgData.js @@ -27,21 +27,27 @@ export async function loadMsgData() { if(!res.ok) throw new Error(`Server responded with ${res.status} ${res.statusText}`); const pouets = await res.json(); - console.log("POUETS :" , pouets); - const filtered = pouets.filter(p => p.account.username === 'drags_nerds_live'); - console.log("FILTERED :" , filtered); + //console.log("POUETS :" , pouets); + const filtered = pouets.filter(p => p.account.username === 'drags_nerds_live' || p.reblog?.account.username === 'drags_nerds_live'); + //console.log("FILTERED :" , filtered); let msgContent = []; for (let pouet of filtered){ - let textInfos = titleAndContent(pouet.text); - let dateInfos = idAndDate(pouet.created_at); + let selectedPouet; + if (pouet.reblog){ + selectedPouet = pouet.reblog; + } else { + selectedPouet = pouet; + } + let textInfos = titleAndContent(selectedPouet.text); + let dateInfos = idAndDate(selectedPouet.created_at); let entry = { title: textInfos.title, date: dateInfos.date, - dateInfo: pouet.created_at, + dateInfo: selectedPouet.created_at, content: textInfos.content, - like: pouet.favourites_count, + like: selectedPouet.favourites_count, isLiked: false, wasRead: false, isSelected: false diff --git a/v1-com-officielle/src/data/peopleData.js b/v1-com-officielle/src/data/peopleData.js index 164d1eb..16d2469 100644 --- a/v1-com-officielle/src/data/peopleData.js +++ b/v1-com-officielle/src/data/peopleData.js @@ -22,8 +22,13 @@ function titleAndContent(str){ for(let line of contentData){ if(line.includes('http')||line.includes('@')){ let linkData = line.split("# "); - //console.log(linkData); - let linkNoFormat = linkData[1].split("\""); + //console.log(title, linkData); + let linkNoFormat; + if (linkData.includes('http')){ + linkNoFormat = linkData[1].split("\""); + } else { + linkNoFormat = linkData[0] + } let url = ""; for(let el of linkNoFormat){ if(el.includes('http')){ @@ -76,7 +81,7 @@ export async function loadPeopleData() { const pouets = await res.json(); //console.log("POUETS :" , pouets); - const filtered = pouets.filter(p => pData.some(user => p.account.username === user.name)); + const filtered = pouets.filter(p => pData.some(user => p.account.username === user.name || p.reblog?.account.username === user.name)); //console.log("FILTERED :" , filtered); const files = {}; for (const user of pData) { @@ -84,40 +89,47 @@ export async function loadPeopleData() { } const description = {}; for (const user of pData){ - const pouet = filtered.find(p => p.account.username === user.name); + const pouet = filtered.find(p => p.account.username === user.name || p.reblog?.account.username === user.name); if (pouet){ description[user.name] = pouet.account.note; } } for (const pouet of filtered) { - const username = pouet.account.username; - const displayName = pouet.account.display_name; - let infos = idAndDate(pouet.created_at); + let selectedPouet; + if(pouet.reblog){ + selectedPouet = pouet.reblog; + } else { + selectedPouet = pouet; + } + //console.log(selectedPouet); + const username = selectedPouet.account.username; + const displayName = selectedPouet.account.display_name; + let infos = idAndDate(selectedPouet.created_at); let entry; //console.log(pouet); //ignorer autres que images - if (pouet.media_attachments?.length > 0 && + if (selectedPouet.media_attachments?.length > 0 && !pouet.media_attachments[0].type.includes('image')) { continue; } //ignorer réponses - if (pouet.in_reply_to_account_id) { + if (selectedPouet.in_reply_to_account_id) { continue; } //ignorer exceptions - let exception = exceptionKey(username, pouet.content); + let exception = exceptionKey(username, selectedPouet.content); //console.log(exception) if(exception){ continue; } - if (pouet.content.includes('http')) { - let textInfos = titleAndContent(pouet.content); + if (selectedPouet.content.includes('http')) { + let textInfos = titleAndContent(selectedPouet.content); entry = { id: 'link' + displayName + infos.id, date: infos.date, - dateInfo: pouet.created_at, + dateInfo: selectedPouet.created_at, type: "link", author: displayName, caption: textInfos.title + '.liens', @@ -125,28 +137,28 @@ export async function loadPeopleData() { description: textInfos.content, isSelected: false }; - } else if (pouet.media_attachments?.length > 0) { - let textInfos = titleAndContent(pouet.content); + } else if (selectedPouet.media_attachments?.length > 0) { + let textInfos = titleAndContent(selectedPouet.content); //console.log(pouet); entry = { id: 'img' + displayName + infos.id, date: infos.date, - dateInfo: pouet.created_at, + dateInfo: selectedPouet.created_at, type: "image", author: displayName, caption: textInfos.title + '.star', - src: pouet.media_attachments[0].url, - alt: pouet.media_attachments[0].description, + src: selectedPouet.media_attachments[0].url, + alt: selectedPouet.media_attachments[0].description, description: textInfos.content, - like: pouet.favourites_count, + like: selectedPouet.favourites_count, isSelected: false } } else { - let textInfos = titleAndContent(pouet.content); + let textInfos = titleAndContent(selectedPouet.content); entry = { id: 'txt' + displayName + infos.id, date: infos.date, - dateInfo: pouet.created_at, + dateInfo: selectedPouet.created_at, type: "text", author: displayName, caption: textInfos.title + '.msg',