EVOgeek/Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-4470 tag: Fix tag parsing using bootstrap classes

Browse Source
This commit is contained in:
Pau Ferrer Ocaña 2024-06-05 15:52:04 +02:00
parent bbbc8454f5
commit 9d30620080
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/features/tag/components/feed/core-tag-feed.html
View File

@ -1,6 +1,7 @@
<ion-card *ngFor="let item of items"> <ion-card *ngFor="let item of items">
<ion-item class="ion-text-wrap" [href]="item.url" core-link [capture]="true"> <ion-item class="ion-text-wrap" [href]="item.url" core-link [capture]="true">
<core-user-avatar *ngIf="item.avatarUrl" [profileUrl]="item.avatarUrl" slot="start" [linkProfile]="false" /> <core-user-avatar *ngIf="item.avatarUrl" [profileUrl]="item.avatarUrl" [fullname]="item.fullname" slot="start"
[linkProfile]="false" />
<core-mod-icon *ngIf="item.iconUrl" [modicon]="item.iconUrl" slot="start" [showAlt]="false" [isBranded]="item.branded" /> <core-mod-icon *ngIf="item.iconUrl" [modicon]="item.iconUrl" slot="start" [showAlt]="false" [isBranded]="item.branded" />
<ion-label> <ion-label>

22
src/core/features/tag/services/tag-helper.ts
View File

@ -32,11 +32,11 @@ export class CoreTagHelperProvider {
const items: CoreTagFeedElement[] = []; const items: CoreTagFeedElement[] = [];
const element = CoreDomUtils.convertToElement(content); const element = CoreDomUtils.convertToElement(content);
Array.from(element.querySelectorAll('ul.tag_feed > li.media')).forEach((itemElement) => { Array.from(element.querySelectorAll('ul.tag_feed > li')).forEach((itemElement) => {
const item: CoreTagFeedElement = { details: [] }; const item: CoreTagFeedElement = { details: [] };
Array.from(itemElement.querySelectorAll('div.media-body > div')).forEach((div: HTMLElement) => { Array.from(itemElement.querySelectorAll('div.media-body > div, div.flex-grow-1 > div')).forEach((div: HTMLElement) => {
if (div.classList.contains('media-heading')) { if (div.classList.contains('media-heading') || div.classList.contains('item-heading')) {
item.heading = div.innerText.trim(); item.heading = div.innerText.trim();
const link = div.querySelector('a'); const link = div.querySelector('a');
if (link) { if (link) {
@ -46,11 +46,11 @@ export class CoreTagHelperProvider {
// Separate details by lines. // Separate details by lines.
const lines = ['']; const lines = [''];
Array.from(div.childNodes).forEach((childNode: Node) => { Array.from(div.childNodes).forEach((childNode: Node) => {
if (childNode.nodeType == Node.TEXT_NODE) { if (childNode.nodeType === Node.TEXT_NODE) {
lines[lines.length - 1] += childNode.textContent; lines[lines.length - 1] += childNode.textContent;
} else if (childNode.nodeType == Node.ELEMENT_NODE) { } else if (childNode.nodeType === Node.ELEMENT_NODE) {
const childElement = childNode as HTMLElement; const childElement = childNode as HTMLElement;
if (childElement.tagName == 'BR') { if (childElement.tagName === 'BR') {
lines.push(''); lines.push('');
} else { } else {
lines[lines.length - 1] += childElement.innerText; lines[lines.length - 1] += childElement.innerText;
@ -61,13 +61,20 @@ export class CoreTagHelperProvider {
} }
}); });
const image = itemElement.querySelector('div.itemimage img'); const image = itemElement.querySelector('div.itemimage img, div.flex-shrink-0 img');
if (image) { if (image) {
if (image.classList.contains('userpicture')) { if (image.classList.contains('userpicture')) {
item.avatarUrl = image.getAttribute('src'); item.avatarUrl = image.getAttribute('src');
item.fullname = image.getAttribute('title');
} else { } else {
item.iconUrl = image.getAttribute('src'); item.iconUrl = image.getAttribute('src');
} }
} else {
const initials = itemElement.querySelector('div.itemimage .userinitials, div.flex-shrink-0 .userinitials');
if (initials) {
item.avatarUrl = 'error'; // Use 'error' to show the default avatar.
item.fullname = initials.getAttribute('title');
}
} }
if (item.heading && item.url) { if (item.heading && item.url) {
@ -91,4 +98,5 @@ export type CoreTagFeedElement = {
iconUrl?: string | null; iconUrl?: string | null;
avatarUrl?: string | null; avatarUrl?: string | null;
url?: string | null; url?: string | null;
fullname?: string | null;
}; };