graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-12-24 05:23:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

chore: lint

Browse source
This commit is contained in:
Mar0xy 2023-10-01 02:06:04 +02:00
parent 54578f6965
commit 099b86ff3c
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
4 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/backend/src/core/MfmService.ts
View file

@ -339,13 +339,6 @@ export class MfmService {
mention: (node) => {
const a = doc.createElement('a');
const { username, host, acct } = node.props;
/* if (mastodon) {
const splitacct = acct.split("@");
a.setAttribute('href', splitacct[2] !== this.config.host && splitacct[2] !== undefined ? `https://${splitacct[2]}/@${splitacct[1]}` : `https://${this.config.host}/${acct}`);
a.className = 'u-url mention';
a.textContent = acct;
return a;
} */
const remoteUserInfo = mentionedRemoteUsers.find(remoteUser => remoteUser.username === username && remoteUser.host === host);
a.setAttribute('href', remoteUserInfo ? (remoteUserInfo.url ? remoteUserInfo.url : remoteUserInfo.uri) : `${this.config.url}/${acct}`);
a.className = 'u-url mention';

8
packages/backend/src/server/api/mastodon/MastodonApiServerService.ts
View file

@ -263,8 +263,8 @@ export class MastodonApiServerService {
// displayed without being logged in
try {
const data = await client.search((_request.query as any).acct, { type: 'accounts' });
const profile = await this.userProfilesRepository.findOneBy({userId: data.data.accounts[0].id});
data.data.accounts[0].fields = profile?.fields.map(f => ({...f, verified_at: null})) || [];
const profile = await this.userProfilesRepository.findOneBy({ userId: data.data.accounts[0].id });
data.data.accounts[0].fields = profile?.fields.map(f => ({ ...f, verified_at: null })) || [];
reply.send(convertAccount(data.data.accounts[0]));
} catch (e: any) {
/* console.error(e); */
@ -302,8 +302,8 @@ export class MastodonApiServerService {
try {
const sharkId = convertId(_request.params.id, IdType.SharkeyId);
const data = await client.getAccount(sharkId);
const profile = await this.userProfilesRepository.findOneBy({userId: sharkId});
data.data.fields = profile?.fields.map(f => ({...f, verified_at: null})) || [];
const profile = await this.userProfilesRepository.findOneBy({ userId: sharkId });
data.data.fields = profile?.fields.map(f => ({ ...f, verified_at: null })) || [];
reply.send(convertAccount(data.data));
} catch (e: any) {
/* console.error(e);

4
packages/backend/src/server/api/mastodon/converters.ts
View file

@ -67,7 +67,7 @@ export class MastoConverters {
public async getUser(id: string): Promise<MiUser> {
return this.GetterService.getUser(id).then(p => {
return p;
})
});
}
public async convertStatus(status: Entity.Status) {
@ -94,7 +94,7 @@ export class MastoConverters {
id: convertId(mention.id, IdConvertType.MastodonId),
}));
const convertedMFM = this.MfmService.toHtml(parse(status.content), JSON.parse(note.mentionedRemoteUsers));
status.content = status.content ? convertedMFM?.replace(/&amp;/g , "&").replaceAll(`<span>&</span><a href="${this.config.url}/tags/39;" rel="tag">#39;</a>` , "<span>\'</span>")! : status.content;
status.content = status.content ? convertedMFM?.replace(/&amp;/g, "&").replaceAll(`<span>&</span><a href="${this.config.url}/tags/39;" rel="tag">#39;</a>`, "<span>\'</span>") as string : status.content;
if (status.poll) status.poll = convertPoll(status.poll);
if (status.reblog) status.reblog = convertStatus(status.reblog);

2
packages/frontend/src/components/MkNoteSub.vue
View file

@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
<template>
<div ref="el" v-if="!muted" :class="[$style.root, { [$style.children]: depth > 1 }]">
<div v-if="!muted" ref="el" :class="[$style.root, { [$style.children]: depth > 1 }]">
<div :class="$style.main">
<div v-if="note.channel" :class="$style.colorBar" :style="{ background: note.channel.color }"></div>
<MkAvatar :class="$style.avatar" :user="note.user" link preview/>