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

8
src/models/images_model.js
View file

@ -142,7 +142,6 @@ module.exports = ({ cooler }) => {
title: c.title || "",
description: c.description || "",
mapUrl: c.mapUrl || "",
meme: !!c.meme,
opinions: agg ? agg.opinions : (c.opinions || {}),
opinions_inhabitants: voters,
hasVoted: viewerId ? voters.includes(viewerId) : false,
@ -177,7 +176,7 @@ module.exports = ({ cooler }) => {
return root;
},
async createImage(blobMarkdown, tagsRaw, title, description, memeBool, mapUrl) {
async createImage(blobMarkdown, tagsRaw, title, description, mapUrl) {
const ssbClient = await openSsb();
const blobId = parseBlobId(blobMarkdown);
const tags = normalizeTags(tagsRaw) || [];
@ -193,7 +192,6 @@ module.exports = ({ cooler }) => {
title: title || "",
description: description || "",
mapUrl: mapUrl || "",
meme: !!memeBool,
opinions: {},
opinions_inhabitants: []
};
@ -203,7 +201,7 @@ module.exports = ({ cooler }) => {
});
},
async updateImageById(id, blobMarkdown, tagsRaw, title, description, memeBool, mapUrl) {
async updateImageById(id, blobMarkdown, tagsRaw, title, description, mapUrl) {
const ssbClient = await openSsb();
const userId = ssbClient.id;
const tipId = await this.resolveCurrentId(id);
@ -226,7 +224,6 @@ module.exports = ({ cooler }) => {
title: title !== undefined ? title || "" : oldMsg.content.title || "",
description: description !== undefined ? description || "" : oldMsg.content.description || "",
mapUrl: mapUrl !== undefined ? mapUrl || "" : oldMsg.content.mapUrl || "",
meme: typeof memeBool === "boolean" ? memeBool : !!oldMsg.content.meme,
createdAt: oldMsg.content.createdAt,
updatedAt: now
};
@ -280,7 +277,6 @@ module.exports = ({ cooler }) => {
if (filter === "mine") list = list.filter((im) => String(im.author) === String(viewerId));
else if (filter === "recent") list = list.filter((im) => new Date(im.createdAt).getTime() >= now - 86400000);
else if (filter === "meme") list = list.filter((im) => im.meme === true);
else if (filter === "top") {
list = list
.slice()