vgaNAR6ta/drags-and-nerds
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

edit : gestion du ptn de REBLOG aaaaah xD

Browse Source
This commit is contained in:
Vega
2026-04-09 17:13:18 +02:00
parent 823b723a43
commit e9b4b79eff
3 changed files with 58 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v1-com-officielle/src/data/audioData.js
+12 -6
View File
@@ -25,7 +25,7 @@ export async function loadAudioData() {
if(!res.ok) throw new Error(`Server responded with ${res.status} ${res.statusText}`); if(!res.ok) throw new Error(`Server responded with ${res.status} ${res.statusText}`);
const pouets = await res.json(); 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); //console.log(filtered);
const files = {}; const files = {};
for (const user of aData) { for (const user of aData) {
@@ -35,18 +35,24 @@ export async function loadAudioData() {
let audioFiles = []; let audioFiles = [];
for (const pouet of filtered){ for (const pouet of filtered){
let selectedPouet;
if (pouet.reblog){
selectedPouet = pouet.reblog;
} else {
selectedPouet = pouet;
}
//ignorer les PJ autres que audio //ignorer les PJ autres que audio
if (pouet.media_attachments?.length > 0 && if (selectedPouet.media_attachments?.length > 0 &&
!pouet.media_attachments[0].type.includes('audio')) { !selectedPouet.media_attachments[0].type.includes('audio')) {
continue; continue;
} }
if(pouet.media_attachments?.length > 0){ if(selectedPouet.media_attachments?.length > 0){
let credits = creditsContent(pouet.content); let credits = creditsContent(selectedPouet.content);
let entry = { let entry = {
track: credits.track, track: credits.track,
artist: credits.artist, artist: credits.artist,
src: pouet.media_attachments[0].url src: selectedPouet.media_attachments[0].url
} }
audioFiles.push(entry); audioFiles.push(entry);
} }
v1-com-officielle/src/data/msgData.js
+13 -7
View File
@@ -27,21 +27,27 @@ export async function loadMsgData() {
if(!res.ok) throw new Error(`Server responded with ${res.status} ${res.statusText}`); if(!res.ok) throw new Error(`Server responded with ${res.status} ${res.statusText}`);
const pouets = await res.json(); const pouets = await res.json();
console.log("POUETS :" , pouets); //console.log("POUETS :" , pouets);
const filtered = pouets.filter(p => p.account.username === 'drags_nerds_live'); const filtered = pouets.filter(p => p.account.username === 'drags_nerds_live' || p.reblog?.account.username === 'drags_nerds_live');
console.log("FILTERED :" , filtered); //console.log("FILTERED :" , filtered);
let msgContent = []; let msgContent = [];
for (let pouet of filtered){ for (let pouet of filtered){
let textInfos = titleAndContent(pouet.text); let selectedPouet;
let dateInfos = idAndDate(pouet.created_at); if (pouet.reblog){
selectedPouet = pouet.reblog;
} else {
selectedPouet = pouet;
}
let textInfos = titleAndContent(selectedPouet.text);
let dateInfos = idAndDate(selectedPouet.created_at);
let entry = { let entry = {
title: textInfos.title, title: textInfos.title,
date: dateInfos.date, date: dateInfos.date,
dateInfo: pouet.created_at, dateInfo: selectedPouet.created_at,
content: textInfos.content, content: textInfos.content,
like: pouet.favourites_count, like: selectedPouet.favourites_count,
isLiked: false, isLiked: false,
wasRead: false, wasRead: false,
isSelected: false isSelected: false
v1-com-officielle/src/data/peopleData.js
+33 -21
View File
@@ -22,8 +22,13 @@ function titleAndContent(str){
for(let line of contentData){ for(let line of contentData){
if(line.includes('http')||line.includes('@')){ if(line.includes('http')||line.includes('@')){
let linkData = line.split("# "); let linkData = line.split("# ");
//console.log(linkData); //console.log(title, linkData);
let linkNoFormat = linkData[1].split("\""); let linkNoFormat;
if (linkData.includes('http')){
linkNoFormat = linkData[1].split("\"");
} else {
linkNoFormat = linkData[0]
}
let url = ""; let url = "";
for(let el of linkNoFormat){ for(let el of linkNoFormat){
if(el.includes('http')){ if(el.includes('http')){
@@ -76,7 +81,7 @@ export async function loadPeopleData() {
const pouets = await res.json(); const pouets = await res.json();
//console.log("POUETS :" , pouets); //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); //console.log("FILTERED :" , filtered);
const files = {}; const files = {};
for (const user of pData) { for (const user of pData) {
@@ -84,40 +89,47 @@ export async function loadPeopleData() {
} }
const description = {}; const description = {};
for (const user of pData){ 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){ if (pouet){
description[user.name] = pouet.account.note; description[user.name] = pouet.account.note;
} }
} }
for (const pouet of filtered) { for (const pouet of filtered) {
const username = pouet.account.username; let selectedPouet;
const displayName = pouet.account.display_name; if(pouet.reblog){
let infos = idAndDate(pouet.created_at); 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; let entry;
//console.log(pouet); //console.log(pouet);
//ignorer autres que images //ignorer autres que images
if (pouet.media_attachments?.length > 0 && if (selectedPouet.media_attachments?.length > 0 &&
!pouet.media_attachments[0].type.includes('image')) { !pouet.media_attachments[0].type.includes('image')) {
continue; continue;
} }
//ignorer réponses //ignorer réponses
if (pouet.in_reply_to_account_id) { if (selectedPouet.in_reply_to_account_id) {
continue; continue;
} }
//ignorer exceptions //ignorer exceptions
let exception = exceptionKey(username, pouet.content); let exception = exceptionKey(username, selectedPouet.content);
//console.log(exception) //console.log(exception)
if(exception){ if(exception){
continue; continue;
} }
if (pouet.content.includes('http')) { if (selectedPouet.content.includes('http')) {
let textInfos = titleAndContent(pouet.content); let textInfos = titleAndContent(selectedPouet.content);
entry = { entry = {
id: 'link' + displayName + infos.id, id: 'link' + displayName + infos.id,
date: infos.date, date: infos.date,
dateInfo: pouet.created_at, dateInfo: selectedPouet.created_at,
type: "link", type: "link",
author: displayName, author: displayName,
caption: textInfos.title + '.liens', caption: textInfos.title + '.liens',
@@ -125,28 +137,28 @@ export async function loadPeopleData() {
description: textInfos.content, description: textInfos.content,
isSelected: false isSelected: false
}; };
} else if (pouet.media_attachments?.length > 0) { } else if (selectedPouet.media_attachments?.length > 0) {
let textInfos = titleAndContent(pouet.content); let textInfos = titleAndContent(selectedPouet.content);
//console.log(pouet); //console.log(pouet);
entry = { entry = {
id: 'img' + displayName + infos.id, id: 'img' + displayName + infos.id,
date: infos.date, date: infos.date,
dateInfo: pouet.created_at, dateInfo: selectedPouet.created_at,
type: "image", type: "image",
author: displayName, author: displayName,
caption: textInfos.title + '.star', caption: textInfos.title + '.star',
src: pouet.media_attachments[0].url, src: selectedPouet.media_attachments[0].url,
alt: pouet.media_attachments[0].description, alt: selectedPouet.media_attachments[0].description,
description: textInfos.content, description: textInfos.content,
like: pouet.favourites_count, like: selectedPouet.favourites_count,
isSelected: false isSelected: false
} }
} else { } else {
let textInfos = titleAndContent(pouet.content); let textInfos = titleAndContent(selectedPouet.content);
entry = { entry = {
id: 'txt' + displayName + infos.id, id: 'txt' + displayName + infos.id,
date: infos.date, date: infos.date,
dateInfo: pouet.created_at, dateInfo: selectedPouet.created_at,
type: "text", type: "text",
author: displayName, author: displayName,
caption: textInfos.title + '.msg', caption: textInfos.title + '.msg',