diff options
| author | Marie <marie@kaifa.ch> | 2024-02-03 18:28:47 +0000 |
|---|---|---|
| committer | Marie <marie@kaifa.ch> | 2024-02-03 18:28:47 +0000 |
| commit | f93a8e2d38dcbdbe55d8759de6b92ec6a67cffb5 (patch) | |
| tree | a5567899f8932dd92f92ca623cf4b6c304367bb3 /packages/backend/src/server | |
| parent | merge: DeepLX-JS support (!396) (diff) | |
| parent | chore: change sfm registry and name (diff) | |
| download | sharkey-f93a8e2d38dcbdbe55d8759de6b92ec6a67cffb5.tar.gz sharkey-f93a8e2d38dcbdbe55d8759de6b92ec6a67cffb5.tar.bz2 sharkey-f93a8e2d38dcbdbe55d8759de6b92ec6a67cffb5.zip | |
merge: Fix sfm-js linkage (!399)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/399
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
Diffstat (limited to 'packages/backend/src/server')
| -rw-r--r-- | packages/backend/src/server/api/endpoints/i/update.ts | 2 | ||||
| -rw-r--r-- | packages/backend/src/server/api/mastodon/converters.ts | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts index 22079de042..bfb3fffdc6 100644 --- a/packages/backend/src/server/api/endpoints/i/update.ts +++ b/packages/backend/src/server/api/endpoints/i/update.ts @@ -4,7 +4,7 @@ */ import RE2 from 're2'; -import * as mfm from '@sharkey/sfm-js'; +import * as mfm from '@transfem-org/sfm-js'; import { Inject, Injectable } from '@nestjs/common'; import ms from 'ms'; import { JSDOM } from 'jsdom'; diff --git a/packages/backend/src/server/api/mastodon/converters.ts b/packages/backend/src/server/api/mastodon/converters.ts index cce7f798fe..ca6f233b7f 100644 --- a/packages/backend/src/server/api/mastodon/converters.ts +++ b/packages/backend/src/server/api/mastodon/converters.ts @@ -1,6 +1,6 @@ import { Inject, Injectable } from '@nestjs/common'; import { Entity } from 'megalodon'; -import mfm from '@sharkey/sfm-js'; +import mfm from '@transfem-org/sfm-js'; import { DI } from '@/di-symbols.js'; import { MfmService } from '@/core/MfmService.js'; import type { Config } from '@/config.js'; @@ -9,9 +9,9 @@ import type { MiUser } from '@/models/User.js'; import type { NoteEditRepository, NotesRepository, UserProfilesRepository, UsersRepository } from '@/models/_.js'; import { awaitAll } from '@/misc/prelude/await-all.js'; import { CustomEmojiService } from '@/core/CustomEmojiService.js'; -import { GetterService } from '../GetterService.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import { IdService } from '@/core/IdService.js'; +import { GetterService } from '../GetterService.js'; export enum IdConvertType { MastodonId, @@ -94,10 +94,10 @@ export class MastoConverters { text_url: f.url, meta: { width: f.properties.width, - height: f.properties.height + height: f.properties.height, }, description: f.comment ? f.comment : null, - blurhash: f.blurhash ? f.blurhash : null + blurhash: f.blurhash ? f.blurhash : null, }; } @@ -185,7 +185,7 @@ export class MastoConverters { sensitive: files.then(files => files.length > 0 ? files.some((f) => f.isSensitive) : false), spoiler_text: edit.cw ?? '', poll: null, - media_attachments: files.then(files => files.length > 0 ? files.map((f) => this.encodeFile(f)) : []) + media_attachments: files.then(files => files.length > 0 ? files.map((f) => this.encodeFile(f)) : []), }; lastDate = edit.updatedAt; history.push(awaitAll(item)); |