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

upstream: integrar Oasis 1.3.3

Browse source 
Diferencia 1.3.1 -> 1.3.3 del codigo de la APK oficial aplicada a tres
bandas encima de la rama: karma en el perfil, salas con directo, fotos
selladas, visibilidad de menciones, telefono por stream en Android y
las traducciones nuevas. Sin dependencias nuevas.

OasisMobile.css sigue siendo el del fork; del oficial solo se traen al
final las reglas de las piezas nuevas (karma, directo a pantalla
completa, salas en vivo, graphos).
This commit is contained in:
oasis-bot 2026-10-19 00:30:25 +02:00
parent bc64565e9c
commit 948b6460d9
95 changed files with 3613 additions and 1356 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/models/pixelia_model.js
View file

@ -27,18 +27,41 @@ const resolvePixels = (messages) => {
}
const replaced = new Set();
for (const { m, coordinateKey } of byKey.values()) {
const parentOf = (k) => {
const { m, coordinateKey } = byKey.get(k);
const prev = byKey.get(m.value.content.replaces);
if (prev && prev.coordinateKey === coordinateKey) replaced.add(prev.m.key);
return prev && prev.coordinateKey === coordinateKey ? prev.m.key : null;
};
for (const k of byKey.keys()) {
const parent = parentOf(k);
if (parent) replaced.add(parent);
}
const depthOf = new Map();
const depth = (key) => {
const chain = [];
const inChain = new Set();
let k = key;
while (k && !depthOf.has(k) && !inChain.has(k)) {
chain.push(k);
inChain.add(k);
k = parentOf(k);
}
let d = k && depthOf.has(k) ? depthOf.get(k) + 1 : 0;
for (let i = chain.length - 1; i >= 0; i--) depthOf.set(chain[i], d++);
return depthOf.get(key);
};
const latest = new Map();
for (const [k, { m, coordinateKey }] of byKey) {
if (replaced.has(k) || tombstoned.has(k)) continue;
const cur = latest.get(coordinateKey);
if (!cur) { latest.set(coordinateKey, m); continue; }
const d = depth(k);
const curD = depth(cur.key);
const ts = m.value.timestamp || 0;
const curTs = cur ? cur.value.timestamp || 0 : 0;
if (!cur || ts > curTs || (ts === curTs && k > cur.key)) latest.set(coordinateKey, m);
const curTs = cur.value.timestamp || 0;
if (d > curD || (d === curD && (ts > curTs || (ts === curTs && k > cur.key)))) latest.set(coordinateKey, m);
}
return latest;