hacklab/OASIS_MOBILE
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

upstream: integrar 0.9.5 en lo que no diverge (57 ficheros) + dependencias nuevas

Browse source 
Primera tanda de la integracion 0.9.1 -> 0.9.5. Se actualizan los 57 ficheros que
upstream cambio y la rama no tocaba, entre ellos los 11 de traduccion: eso ya solo
es posible gracias al overlay de i18n, antes eran 11 conflictos garantizados.

Se portan ademas las dependencias que 0.9.5 introduce y de las que dependen los
ficheros actualizados: pdfDocument, content_favorites, recurrence, media_gallery,
comments_view, gallery_view y polls (modelo, limites y vista).

Quedan 48 ficheros con divergencia real por resolver a mano (backend.js,
main_views.js, OasisMobile.css y 45 vistas y modelos).

Verificado: 0 errores de sintaxis en src/, 0 requires relativos rotos, la app
arranca declarando 0.9.5 y las 47 rutas principales responden 200/302.
This commit is contained in:
SITO 2026-08-18 21:42:59 +02:00
parent b3986b12a0
commit f964e61a1c
67 changed files with 5740 additions and 10907 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/models/reports_model.js
View file

@ -1,4 +1,5 @@
const pull = require('../server/node_modules/pull-stream');
const { normalizeImages, normalizeVideo } = require('./media_gallery');
const { getConfig } = require('../configs/config-manager.js');
const { buildValidatedTombstoneSet } = require('./tombstone_validator');
const { dedupeBy, norm } = require('../backend/dedupe');
@ -39,7 +40,7 @@ const normalizeTemplate = (category, tpl) => {
}
if (cat === 'CONTENT') {
return pick(['contentLocation', 'whyInappropriate', 'requestedAction', 'evidenceLinks']);
return pick(['contentLocation', 'whyInappropriate', 'evidenceLinks']);
}
return {};
@ -164,6 +165,8 @@ module.exports = ({ cooler }) => {
...c,
category: cat,
status: normalizeStatus(c.status || 'OPEN'),
images: normalizeImages(c.images && c.images.length ? c.images : c.image),
video: normalizeVideo(c.video),
severity: normalizeSeverity(c.severity) || 'low',
confirmations,
tags: ensureArray(c.tags),
@ -174,14 +177,13 @@ module.exports = ({ cooler }) => {
};
return {
async createReport(title, description, category, image, tagsRaw = [], severity = 'low', template = {}) {
async createReport(title, description, category, image, tagsRaw = [], severity = 'low', template = {}, media = {}) {
const ssb = await openSsb();
const userId = ssb.id;
let blobId = null;
if (image) {
blobId = String(image).trim() || null;
}
const images = normalizeImages((media && media.images && media.images.length) ? media.images : image);
const blobId = images[0] || null;
const clip = normalizeVideo(media && media.video);
const tags = Array.isArray(tagsRaw)
? tagsRaw.filter(Boolean)
@ -196,6 +198,8 @@ module.exports = ({ cooler }) => {
createdAt: new Date().toISOString(),
author: userId,
image: blobId,
images,
video: clip,
tags,
confirmations: [],
severity: normalizeSeverity(severity) || 'low',
@ -227,10 +231,15 @@ module.exports = ({ cooler }) => {
? String(updatedContent.tags || '').split(',').map(t => t.trim()).filter(Boolean)
: ensureArray(report.content.tags);
let blobId = report.content.image || null;
if (updatedContent.image) {
blobId = String(updatedContent.image).trim() || null;
}
const nextImages = normalizeImages(
Object.prototype.hasOwnProperty.call(updatedContent, 'images')
? updatedContent.images
: (report.content.images && report.content.images.length ? report.content.images : (updatedContent.image || report.content.image))
);
const blobId = nextImages[0] || null;
const nextVideo = Object.prototype.hasOwnProperty.call(updatedContent, 'video')
? normalizeVideo(updatedContent.video)
: normalizeVideo(report.content.video);
const nextStatus = Object.prototype.hasOwnProperty.call(updatedContent, 'status')
? normalizeStatus(updatedContent.status)
@ -258,6 +267,8 @@ module.exports = ({ cooler }) => {
type: 'report',
replaces: tipId,
image: blobId,
images: nextImages,
video: nextVideo,
tags,
confirmations,
opinions: agg.opinions,