upstream: integrar Oasis 1.3.1

Base del merge a tres bandas: git 0.9.5 de epsylon, esta rama y el src de la
APK oficial 1.3.1 (la variante movil: OASIS_MOBILE, regex sin \p{}, audio y
video de Android). Corre en el mismo nodejs-mobile 18.20.4 que ya usabamos.

Se conserva de la rama: Karvan, identidades y multicuenta, topbar y barra
inferior, borrado de EXIF sin sharp, filtro hot del foro, RTC sin STUN y los
modulos apagados en movil (wallet, banking, torrents).

Se toma de upstream lo que ya hace de serie: respuesta citada en chats, ssb-lan
en movil, configuracion en ~/.ssb/oasis (sobrevive a reinstalar el backend).
El asistente de bienvenida deja elegir workflow tambien en movil.
This commit is contained in:
oasis-bot 2026-10-18 02:52:17 +02:00
parent 8d838dd8b1
commit c332afd6ea
265 changed files with 80970 additions and 29167 deletions

View file

@ -3,10 +3,12 @@ const { form, button, div, h2, p, section, input, label, br, a, img, span, texta
const { renderCommentsSection: renderSharedCommentsSection, renderCommentsLink } = require("./comments_view");
const moment = require("../server/node_modules/moment");
const { template, i18n, renderOpinionsVoting, renderEngagement, userLink, renderSpreadButton, renderEcoTax, renderLifespanChip, renderStateChip, renderContentActions , renderSpreadEditWarning } = require("./main_views");
const { renderLicenseChip, renderLicenseSelect, renderReachChip, renderClearnetSelector, renderClearnetSwitch, renderTribeOriginChip } = require('./clearnet_view');
const { clearnetItemHref, template, i18n, renderOpinionsVoting, renderEngagement, userLink, renderSpreadButton, renderEcoTax, renderLifespanChip, renderStateChip, renderContentActions , renderSpreadEditWarning, renderModuleStats, moduleIsEmpty, contentDeleteAction, paged } = require("./main_views");
const { config } = require("../server/SSB_server.js");
const { renderUrl } = require("../backend/renderUrl")
const { renderMapLocationVisitLabel } = require("./maps_view");
const { renderStyledText } = require("../backend/renderStyledText")
const { renderMapLocationVisitLabel, renderMapEmbed } = require("./maps_view");
const { renderZoomableImage } = require("./gallery_view");
const userId = config.keys.id;
@ -39,14 +41,7 @@ const renderImageMedia = (imgObj, filter, params = {}) => {
return imgObj?.url
? div(
{ class: "image-container image-container-row" },
a(
{
href: `/images/${encodeURIComponent(imgObj.key)}?filter=${encodeURIComponent(filter || "all")}${
params.q ? `&q=${encodeURIComponent(params.q)}` : ""
}${params.sort ? `&sort=${encodeURIComponent(params.sort)}` : ""}`
},
img({ src, alt: imgObj.title || "", class: "media-preview", loading: "lazy" })
)
renderZoomableImage(src, { alt: imgObj.title || "", imgClass: "post-image" })
)
: p(i18n.imageNoFile);
};
@ -56,27 +51,15 @@ const renderImageOwnerActions = (filter, imgObj, params = {}) => {
const isAuthor = String(imgObj.author) === String(userId);
const hasOpinions = Object.keys(imgObj.opinions || {}).length > 0;
if (!isAuthor) return [];
if (!isAuthor || hasOpinions) return [];
const items = [];
if (!hasOpinions) {
items.push(
form(
{ method: "GET", action: `/images/edit/${encodeURIComponent(imgObj.key)}` },
input({ type: "hidden", name: "returnTo", value: returnTo }),
button({ class: "update-btn", type: "submit" }, i18n.imageUpdateButton)
)
);
}
items.push(
return [
form(
{ method: "POST", action: `/images/delete/${encodeURIComponent(imgObj.key)}` },
{ method: "GET", action: `/images/edit/${encodeURIComponent(imgObj.key)}` },
input({ type: "hidden", name: "returnTo", value: returnTo }),
button({ class: "delete-btn", type: "submit" }, i18n.imageDeleteButton)
button({ class: "update-btn", type: "submit" }, i18n.imageUpdateButton)
)
);
return items;
];
};
const renderImageList = exports.renderImageList = (images, filter, params = {}) => {
@ -87,24 +70,34 @@ const renderImageList = exports.renderImageList = (images, filter, params = {})
const title = safeText(imgObj.title);
const isOwn = imgObj.author && String(imgObj.author) === String(userId);
const headerActions = typeof params.headerActions === "function"
? params.headerActions(imgObj)
: imgObj.tribeOrigin
? renderContentActions(null, imgObj.tribeOrigin.href)
: renderContentActions(imgObj.key, `/images/${encodeURIComponent(imgObj.key)}`, { spread: (params.spreadMap && params.spreadMap.get(imgObj.key)) || params.spreads || null, author: imgObj.author, favKind: 'images', torrentFrom: { blobId: imgObj.url, name: imgObj.title }, isFavorite: imgObj.isFavorite, reportTitle: imgObj.title, returnTo, deleteAction: isOwn ? contentDeleteAction("image", imgObj.key) : null });
const titleHref = typeof params.headerActions === "function" ? null : imgObj.tribeOrigin ? imgObj.tribeOrigin.href : `/images/${encodeURIComponent(imgObj.key)}`;
const engagement = typeof params.engagement === "function"
? params.engagement(imgObj)
: imgObj.tribeOrigin ? null : renderEngagement(imgObj.key,
renderOpinionsVoting('/images/opinions', imgObj.key, imgObj.opinions, returnTo, imgObj.opinions_inhabitants),
renderCommentsLink({ href: `/images/${encodeURIComponent(imgObj.key)}`, count: commentCount })
);
return div(
{ class: "trending-card image-card" + (isOwn ? " own-content" : "") },
div(
{ class: "card-header activity-card-header" },
span(),
renderContentActions(imgObj.key, `/images/${encodeURIComponent(imgObj.key)}`, { spread: (params.spreadMap && params.spreadMap.get(imgObj.key)) || params.spreads || null, author: imgObj.author, favKind: 'images', isFavorite: imgObj.isFavorite, reportTitle: imgObj.title })
headerActions
),
div(
{ class: "card-section image-card-body" },
title ? h2(title) : null,
div({ class: "shop-title-row" }, title ? h2(titleHref ? a({ href: titleHref, class: "card-title-link" }, title) : title) : null, imgObj.tribeOrigin ? renderTribeOriginChip(imgObj.tribeOrigin) : imgObj.clearnet === true ? renderReachChip(true, i18n, clearnetItemHref('images', imgObj.title, imgObj.key)) : null, renderLicenseChip(imgObj.license), ...(typeof params.titleChips === "function" ? params.titleChips(imgObj) : [])),
imgObj.lifetime ? div({ class: "card-chips-row" },
imgObj.lifetime ? renderLifespanChip(imgObj.lifetime, i18n) : null
) : null,
renderImageMedia(imgObj, filter, params),
renderEngagement(imgObj.key,
renderOpinionsVoting('/images/opinions', imgObj.key, imgObj.opinions, returnTo, imgObj.opinions_inhabitants),
renderCommentsLink({ href: `/images/${encodeURIComponent(imgObj.key)}`, count: commentCount })
),
...(typeof params.bodyExtra === "function" ? params.bodyExtra(imgObj) : []),
engagement,
renderMapLocationVisitLabel(imgObj.mapUrl),
br(),
(() => {
@ -114,7 +107,7 @@ const renderImageList = exports.renderImageList = (images, filter, params = {})
return p(
{ class: "card-footer" },
span({ class: "date-link" }, `${moment(imgObj.createdAt).format("YYYY/MM/DD HH:mm")} ${i18n.performed} `),
span({ class: "date-link" }, `${moment(imgObj.createdAt).format("YYYY/MM/DD HH:mm")}`),
userLink(imgObj.author),
showUpdated
? span(
@ -151,7 +144,7 @@ const renderImageForm = (filter, imageId, imageToEdit, params = {}) => {
br(),
br(),
imageToEdit?.url
? img({ src: `/blob/${encodeURIComponent(imageToEdit.url)}`, class: "media-preview", alt: imageToEdit?.title || "" })
? img({ loading: 'lazy', src: `/blob/${encodeURIComponent(imageToEdit.url)}`, class: "media-preview", alt: imageToEdit?.title || "" })
: null,
label(i18n.imageTitleLabel),
br(),
@ -159,7 +152,7 @@ const renderImageForm = (filter, imageId, imageToEdit, params = {}) => {
br(),
label(i18n.imageDescriptionLabel),
br(),
textarea({ name: "description", placeholder: i18n.imageDescriptionPlaceholder, rows: "4" }, imageToEdit?.description || ""),
textarea({ maxlength: "5000", name: "description", placeholder: i18n.imageDescriptionPlaceholder, rows: "4" }, imageToEdit?.description || ""),
br(),
label(i18n.mapLocationTitle || "Map Location"),
br(),
@ -169,6 +162,9 @@ const renderImageForm = (filter, imageId, imageToEdit, params = {}) => {
br(),
input({ type: "text", name: "tags", placeholder: i18n.imageTagsPlaceholder, value: tagsValue }),
br(),
...renderLicenseSelect(imageToEdit?.license, i18n),
br(),
renderClearnetSelector(filter === "edit" ? !!imageToEdit?.clearnet : false, i18n),
br(),
button({ type: "submit" }, filter === "edit" ? i18n.imageUpdateButton : i18n.imageCreateButton)
)
@ -183,7 +179,7 @@ const renderGallery = (images) => {
images.map((imgObj) => {
const src = imgObj.url ? `/image/256/${encodeURIComponent(imgObj.url)}` : "";
return a(
{ href: `#img-${encodeURIComponent(imgObj.key)}`, class: "gallery-item" },
{ href: `#img-${encodeURIComponent(imgObj.key)}`, id: `img-${encodeURIComponent(imgObj.key)}-src`, class: "gallery-item" },
img({ src, alt: imgObj.title || "", class: "gallery-image", loading: "lazy" })
);
})
@ -195,7 +191,7 @@ const renderLightbox = (images) =>
const src = imgObj.url ? `/blob/${encodeURIComponent(imgObj.url)}` : "";
return div(
{ id: `img-${encodeURIComponent(imgObj.key)}`, class: "lightbox" },
a({ href: "#", class: "lightbox-close" }, "×"),
a({ href: `#img-${encodeURIComponent(imgObj.key)}-src`, class: "lightbox-close" }, "×"),
img({ src, class: "lightbox-image", alt: imgObj.title || "" })
);
});
@ -208,6 +204,18 @@ const renderImageCommentsSection = (imageKey, comments = [], returnTo = null) =>
});
};
const mediaChipFor = (filter, censusM) => (mode) => {
if (mode === filter) return true;
if (!Array.isArray(censusM)) return true;
if (mode === "top") return censusM.some((x) => !x.tribeOrigin);
if (mode === "gallery") return censusM.length > 0;
if (mode === "mine") return censusM.some((x) => String(x.author) === String(userId));
if (mode === "recent") return censusM.length > 0;
if (mode === "favorites") return censusM.some((x) => x.isFavorite);
if (mode === "bcs") return censusM.some((x) => String(x.title || "").toUpperCase().startsWith("BCS-"));
return true;
};
exports.imageView = async (images, filter = "all", imageId = null, params = {}) => {
if (filter === "edit") params = { ...params, spreadWarning: await renderSpreadEditWarning(imageId) };
const title = i18n.imageTitle;
@ -216,39 +224,38 @@ exports.imageView = async (images, filter = "all", imageId = null, params = {})
const sort = safeText(params.sort || "recent");
const list = safeArr(images);
const emptyMod = moduleIsEmpty(list, filter, "all", q);
const mediaChip = mediaChipFor(filter, Array.isArray(params.censusList) ? params.censusList : list);
const imageToEdit = imageId ? list.find((im) => im.key === imageId) : null;
return template(
title,
section(
div({ class: "tags-header" },
div({ class: "tags-header module-header-line" },
h2(title),
p(i18n.imageDescription)
),
(() => {
const { renderReachChip } = require('./clearnet_view');
const isClearnet = !!(params.viewerPrefs && params.viewerPrefs.clearnetImages);
return div({ class: "shop-title-row" }, renderReachChip(isClearnet, i18n));
})(),
br(),
div(
{ class: "filters" },
form(
{ method: "GET", action: "/images", class: "ui-toolbar ui-toolbar--filters" },
input({ type: "hidden", name: "q", value: q }),
input({ type: "hidden", name: "sort", value: sort }),
...(emptyMod ? [] : [
button({ type: "submit", name: "filter", value: "all", class: filter === "all" ? "filter-btn active" : "filter-btn" }, String(i18n.imageFilterAll).toUpperCase()),
button({ type: "submit", name: "filter", value: "mine", class: filter === "mine" ? "filter-btn active" : "filter-btn" }, String(i18n.imageFilterMine).toUpperCase()),
button({ type: "submit", name: "filter", value: "recent", class: filter === "recent" ? "filter-btn active" : "filter-btn" }, String(i18n.imageFilterRecent).toUpperCase()), button(
...(mediaChip("recent") ? [button({ type: "submit", name: "filter", value: "recent", class: filter === "recent" ? "filter-btn active" : "filter-btn" }, String(i18n.imageFilterRecent).toUpperCase())] : []),
...(mediaChip("mine") ? [button({ type: "submit", name: "filter", value: "mine", class: filter === "mine" ? "filter-btn active" : "filter-btn" }, String(i18n.imageFilterMine).toUpperCase())] : []),
...(mediaChip("favorites") ? [button(
{ type: "submit", name: "filter", value: "favorites", class: filter === "favorites" ? "filter-btn active" : "filter-btn" },
String(i18n.imageFilterFavorites).toUpperCase()
),
)] : []),
button({ type: "submit", name: "filter", value: "top", class: filter === "top" ? "filter-btn active" : "filter-btn" }, String(i18n.imageFilterTop).toUpperCase()),
button(
...(mediaChip("top") ? [button({ type: "submit", name: "filter", value: "top", class: filter === "top" ? "filter-btn active" : "filter-btn" }, String(i18n.imageFilterTop).toUpperCase())] : []),
...(mediaChip("gallery") ? [button(
{ type: "submit", name: "filter", value: "gallery", class: filter === "gallery" ? "filter-btn active" : "filter-btn" },
String(i18n.imageFilterGallery).toUpperCase()
),
)] : []),
]),
button({ type: "submit", name: "filter", value: "create", class: "create-button" }, i18n.imageCreateButton)
)
)
@ -257,8 +264,9 @@ exports.imageView = async (images, filter = "all", imageId = null, params = {})
filter === "create" || filter === "edit"
? renderImageForm(filter, imageId, imageToEdit, { ...params, filter })
: section(
div(
{ class: "images-search" },
emptyMod ? null : div(
{ class: "images-search activity-filter-chips activity-toolbar-row" },
renderModuleStats(list.length),
form(
{ method: "GET", action: "/images", class: "filter-box" },
input({ type: "hidden", name: "filter", value: filter }),
@ -281,21 +289,22 @@ exports.imageView = async (images, filter = "all", imageId = null, params = {})
)
)
),
filter === "gallery" ? renderGallery(list) : div({ class: "images-list" }, renderImageList(list, filter, { q, sort }))
filter === "gallery" ? renderGallery(paged(list)) : div({ class: "images-list" }, renderImageList(paged(list), filter, { q, sort, spreadMap: params.spreadMap }))
)
),
...(filter === "gallery" ? renderLightbox(list) : [])
...(filter === "gallery" ? renderLightbox(paged(list)) : [])
);
};
exports.singleImageView = async (imageObj, filter = "all", comments = [], params = {}) => {
const mediaChip = mediaChipFor(filter, Array.isArray(params.censusList) ? params.censusList : null);
const q = safeText(params.q || "");
const sort = safeText(params.sort || "recent");
const returnTo = safeText(params.returnTo) || buildReturnTo(filter, { q, sort });
const title = safeText(imageObj.title);
const { renderReachChip } = require('./clearnet_view');
const isClearnet = !!(params.authorPrefs && params.authorPrefs.clearnetImages);
const isAuthor = String(imageObj.author) === String(userId);
const isClearnet = !!imageObj.clearnet;
const chips = [
renderLifespanChip(imageObj.lifetime, i18n),
@ -309,9 +318,10 @@ exports.singleImageView = async (imageObj, filter = "all", comments = [], params
const tagsNode = renderTags(imageObj.tags);
const detailActions = div({ class: "card-header activity-card-header" },
renderContentActions(imageObj.key, null, {
renderContentActions(imageObj.key, `/images/${encodeURIComponent(imageObj.key)}`, {
author: imageObj.author,
favKind: 'images',
deleteAction: String(imageObj.author) === String(userId) ? contentDeleteAction("image", imageObj.key) : null,
favKind: 'images', torrentFrom: { blobId: imageObj.url, name: imageObj.title },
isFavorite: imageObj.isFavorite,
spread: params.spreads || null,
returnTo,
@ -322,14 +332,16 @@ exports.singleImageView = async (imageObj, filter = "all", comments = [], params
const imageSide = div({ class: "tribe-side" },
div({ class: "shop-title-row" },
title ? h2({ class: "tribe-card-title" }, title) : null,
renderReachChip(isClearnet, i18n)
renderReachChip(isClearnet, i18n, isClearnet ? clearnetItemHref('images', imageObj.title, imageObj.key) : null),
isAuthor ? renderClearnetSwitch('images', imageObj.rootId || imageObj.key, isClearnet) : null,
renderLicenseChip(imageObj.license)
),
chips.length ? div({ class: "card-chips-row" }, ...chips) : null,
safeText(imageObj.description)
? p({ class: "tribe-side-description" }, ...renderUrl(imageObj.description))
? p({ class: "tribe-side-description" }, ...renderStyledText(imageObj.description))
: null,
tagsNode,
renderMapLocationVisitLabel(imageObj.mapUrl),
renderMapEmbed(params.mapData, imageObj.mapUrl),
sideActions.length ? div({ class: "tribe-side-actions" }, ...sideActions) : null
);
@ -353,7 +365,7 @@ exports.singleImageView = async (imageObj, filter = "all", comments = [], params
return p(
{ class: "card-footer" },
span({ class: "date-link" }, `${moment(imageObj.createdAt).format("YYYY/MM/DD HH:mm")} ${i18n.performed} `),
span({ class: "date-link" }, `${moment(imageObj.createdAt).format("YYYY/MM/DD HH:mm")}`),
userLink(imageObj.author),
showUpdated
? span(
@ -372,7 +384,7 @@ exports.singleImageView = async (imageObj, filter = "all", comments = [], params
return template(
i18n.imageTitle,
section(
div({ class: "tags-header" },
div({ class: "tags-header module-header-line" },
h2(i18n.imageAllSectionTitle || i18n.imageTitle),
p(i18n.imageDescription)
),
@ -382,18 +394,18 @@ exports.singleImageView = async (imageObj, filter = "all", comments = [], params
{ method: "GET", action: "/images", class: "ui-toolbar ui-toolbar--filters" },
input({ type: "hidden", name: "q", value: q }),
input({ type: "hidden", name: "sort", value: sort }),
button({ type: "submit", name: "filter", value: "all", class: filter === "all" ? "filter-btn active" : "filter-btn" }, String(i18n.imageFilterAll).toUpperCase()),
button({ type: "submit", name: "filter", value: "mine", class: filter === "mine" ? "filter-btn active" : "filter-btn" }, String(i18n.imageFilterMine).toUpperCase()),
button({ type: "submit", name: "filter", value: "recent", class: filter === "recent" ? "filter-btn active" : "filter-btn" }, String(i18n.imageFilterRecent).toUpperCase()), button(
button({ type: "submit", name: "filter", value: "all", class: filter === "all" ? "filter-btn active" : "filter-btn" }, String(i18n.imageFilterAll).toUpperCase()), ...(mediaChip("favorites") ? [button(
...(mediaChip("recent") ? [button({ type: "submit", name: "filter", value: "recent", class: filter === "recent" ? "filter-btn active" : "filter-btn" }, String(i18n.imageFilterRecent).toUpperCase())] : []),
...(mediaChip("mine") ? [button({ type: "submit", name: "filter", value: "mine", class: filter === "mine" ? "filter-btn active" : "filter-btn" }, String(i18n.imageFilterMine).toUpperCase())] : []),
{ type: "submit", name: "filter", value: "favorites", class: filter === "favorites" ? "filter-btn active" : "filter-btn" },
String(i18n.imageFilterFavorites).toUpperCase()
),
)] : []),
button({ type: "submit", name: "filter", value: "top", class: filter === "top" ? "filter-btn active" : "filter-btn" }, String(i18n.imageFilterTop).toUpperCase()),
button(
...(mediaChip("gallery") ? [button(
{ type: "submit", name: "filter", value: "gallery", class: filter === "gallery" ? "filter-btn active" : "filter-btn" },
String(i18n.imageFilterGallery).toUpperCase()
),
)] : []),
button({ type: "submit", name: "filter", value: "create", class: "create-button" }, i18n.imageCreateButton)
)
),