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/bookmarking_model.js
View file

@ -145,7 +145,6 @@ module.exports = ({ cooler }) => {
updatedAt: c.updatedAt || null,
lastVisit: c.lastVisit || null,
tags: safeArr(c.tags),
category: c.category || "",
description: c.description || "",
opinions,
opinions_inhabitants: voters,
@ -182,7 +181,7 @@ module.exports = ({ cooler }) => {
return root;
},
async createBookmark(url, tagsRaw, description, category, lastVisit) {
async createBookmark(url, tagsRaw, description, lastVisit) {
const ssbClient = await openSsb();
const now = new Date().toISOString();
@ -195,7 +194,6 @@ module.exports = ({ cooler }) => {
url: u,
tags: normalizeTags(tagsRaw),
description: description || "",
category: category || "",
createdAt: now,
updatedAt: now,
lastVisit: coerceLastVisit(lastVisit),
@ -231,7 +229,6 @@ module.exports = ({ cooler }) => {
url,
tags: updatedData.tags !== undefined ? normalizeTags(updatedData.tags) : safeArr(oldMsg.content.tags),
description: updatedData.description !== undefined ? updatedData.description || "" : oldMsg.content.description || "",
category: updatedData.category !== undefined ? updatedData.category || "" : oldMsg.content.category || "",
lastVisit: coerceLastVisit(updatedData.lastVisit || oldMsg.content.lastVisit),
createdAt: oldMsg.content.createdAt,
updatedAt: now
@ -296,11 +293,10 @@ module.exports = ({ cooler }) => {
if (q) {
list = list.filter((b) => {
const url = String(b.url || "").toLowerCase();
const cat = String(b.category || "").toLowerCase();
const desc = String(b.description || "").toLowerCase();
const tags = safeArr(b.tags).join(" ").toLowerCase();
const author = String(b.author || "").toLowerCase();
return url.includes(q) || cat.includes(q) || desc.includes(q) || tags.includes(q) || author.includes(q);
return url.includes(q) || desc.includes(q) || tags.includes(q) || author.includes(q);
});
}