DatseMultimediaSites
/
Sharkey
mirror of https://activitypub.software/TransFem-org/Sharkey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

various fixes after the merge

This commit is contained in:
dakkar 2024-05-31 12:55:53 +01:00
parent 1169614b7c
commit bf710428eb
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/backend/src/core/NoteEditService.ts
View File

@ -524,7 +524,7 @@ export class NoteEditService implements OnApplicationShutdown {
noteVisibility: note.visibility, noteVisibility: note.visibility,
userId: user.id, userId: user.id,
userHost: user.host, userHost: user.host,
channelId: data.channelId, channelId: data.channel ? data.channel.id : null,
}); });
if (!oldnote.hasPoll) { if (!oldnote.hasPoll) {

11
packages/backend/src/queue/processors/ExportAccountDataProcessorService.ts
View File

@ -287,7 +287,7 @@ export class ExportAccountDataProcessorService {
const mutings = await this.mutingsRepository.findBy({ const mutings = await this.mutingsRepository.findBy({
muterId: user.id, muterId: user.id,
}); });
while (true) { while (true) {
const followings = await this.followingsRepository.find({ const followings = await this.followingsRepository.find({
where: { where: {
@ -353,7 +353,7 @@ export class ExportAccountDataProcessorService {
let followersCursor: MiFollowing['id'] | null = null; let followersCursor: MiFollowing['id'] | null = null;
let exportedFollowersCount = 0; let exportedFollowersCount = 0;
while (true) { while (true) {
const followers = await this.followingsRepository.find({ const followers = await this.followingsRepository.find({
where: { where: {
@ -680,7 +680,6 @@ export class ExportAccountDataProcessorService {
localOnly: antenna.localOnly, localOnly: antenna.localOnly,
withReplies: antenna.withReplies, withReplies: antenna.withReplies,
withFile: antenna.withFile, withFile: antenna.withFile,
notify: antenna.notify,
})); }));
if (antennas.length - 1 !== index) { if (antennas.length - 1 !== index) {
@ -749,9 +748,9 @@ export class ExportAccountDataProcessorService {
cleanup(); cleanup();
archiveCleanup(); archiveCleanup();
if (profile.email) { if (profile.email) {
this.emailService.sendEmail(profile.email, this.emailService.sendEmail(profile.email,
'Your data archive is ready', 'Your data archive is ready',
`Click the following link to download the archive: ${driveFile.url}<br/>It is also available in your drive.`, `Click the following link to download the archive: ${driveFile.url}<br/>It is also available in your drive.`,
`Click the following link to download the archive: ${driveFile.url}\r\n\r\nIt is also available in your drive.`, `Click the following link to download the archive: ${driveFile.url}\r\n\r\nIt is also available in your drive.`,
); );
} }

1
packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts
View File

@ -55,7 +55,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
} }
await this.federatedInstanceService.update(instance.id, { await this.federatedInstanceService.update(instance.id, {
isSuspended: ps.isSuspended,
suspensionState, suspensionState,
isNSFW: ps.isNSFW, isNSFW: ps.isNSFW,
moderationNote: ps.moderationNote, moderationNote: ps.moderationNote,