Merge branch 'develop' of https://github.com/transfem-org/Sharkey into develop

.github/workflows/welcome.yml

@@ -8,7 +8,7 @@ jobs:
   run:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/first-interaction@v1.2.0
+      - uses: actions/first-interaction@v1.3.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           issue-message: |

locales/en-US.yml

@@ -988,6 +988,7 @@ cannotLoad: "Unable to load"
 numberOfProfileView: "Profile views"
 like: "Like"
 unlike: "Unlike"
+defaultLike: "Default like emoji"
 numberOfLikes: "Likes"
 show: "Show"
 neverShow: "Don't show again"
@@ -1856,6 +1857,14 @@ _ago:
   monthsAgo: "{n}mo ago"
   yearsAgo: "{n}y ago"
   invalid: "None"
+_timeIn:
+  seconds: "in {n} seconds"
+  minutes: "in {n} minutes"
+  hours: "in {n} hours"
+  days: "in {n} days"
+  weeks: "in {n} weeks"
+  months: "in {n} months"
+  years: "in {n} years"
 _time:
   second: "Second(s)"
   minute: "Minute(s)"

locales/index.d.ts

@@ -991,6 +991,7 @@ export interface Locale {
     "numberOfProfileView": string;
     "like": string;
     "unlike": string;
+    "defaultLike": string;
     "numberOfLikes": string;
     "show": string;
     "neverShow": string;

locales/it-IT.yml

@@ -54,6 +54,7 @@ addToAntenna: "Aggiungi all'antenna"
 sendMessage: "Invia messaggio"
 copyRSS: "Copia RSS"
 copyUsername: "Copia nome utente"
+openRemoteProfile: "Apri profilo remoto"
 copyUserId: "Copia ID del profilo"
 copyNoteId: "Copia ID della Nota"
 copyFileId: "Copia ID del file"
@@ -731,6 +732,8 @@ thisIsExperimentalFeature: "Questa è una funzionalità sperimentale. Potrebbe e
 developer: "Sviluppatore"
 makeExplorable: "Profilo visibile pubblicamente nella pagina \"Esplora\""
 makeExplorableDescription: "Disabilitando questa opzione, il tuo profilo non verrà elencato nella pagina \"Esplora\"."
+makeIndexable: "Non indicizzare le note pubbliche"
+makeIndexableDescription: "Le tue note pubbliche non saranno cercabili"
 showGapBetweenNotesInTimeline: "Mostrare un intervallo tra le note sulla timeline"
 duplicate: "Duplica"
 left: "Sinistra"
@@ -964,6 +967,7 @@ cannotLoad: "Caricamento impossibile"
 numberOfProfileView: "Visualizzazioni profilo"
 like: "Mi piace!"
 unlike: "Non mi piace"
+defaultLike: "Emoji predefinita per \"mi piace\""
 numberOfLikes: "Numero di Like"
 show: "Visualizza"
 neverShow: "Non mostrare più"
@@ -1266,6 +1270,8 @@ _serverSettings:
   shortName: "Abbreviazione"
   shortNameDescription: "Un'abbreviazione o un nome comune che può essere visualizzato al posto del nome ufficiale lungo del server."
   fanoutTimelineDescription: "Attivando questa funzionalità migliori notevolmente la capacità delle Timeline di collezionare Note, riducendo il carico sul database. Tuttavia, aumenterà l'impiego di memoria RAM per Redis. Disattiva se il tuo server ha poca RAM o la funzionalità è irregolare."
+  fanoutTimelineDbFallback: "Ripiega sul database"
+  fanoutTimelineDbFallbackDescription: "Attivando questa funzionalità, nel caso che il contenuto di una Timeline non sia presente nella cache, verrà consultato il database. Disattivandola, il carico sul database sarà ulteriormente ridotto, ma le Timeline saranno limitate"
 _accountMigration:
   moveFrom: "Migra un altro profilo dentro a questo"
   moveFromSub: "Crea un alias verso un altro profilo remoto"
@@ -1702,6 +1708,7 @@ _serverDisconnectedBehavior:
   reload: "Ricarica automaticamente"
   dialog: "Apri avviso in finestra"
   quiet: "Visualizza avviso in modo discreto"
+  disabled: "Non visualizzare l'avviso"
 _channel:
   create: "Nuovo canale"
   edit: "Gerisci canale"
@@ -1817,6 +1824,14 @@ _ago:
   monthsAgo: "{n} mesi fa"
   yearsAgo: "{n} anni fa"
   invalid: "Niente da visualizzare"
+_timeIn:
+  seconds: "fra {n} secondi"
+  minutes: "fra {n} minuti"
+  hours: "fra {n} ore"
+  days: "fra {n} giorni"
+  weeks: "fra {n} settimane"
+  months: "fra {n} mesi"
+  years: "fra {n} anni"
 _time:
   second: "s"
   minute: "min"

locales/ja-JP.yml

@@ -988,6 +988,7 @@ cannotLoad: "読み込めません"
 numberOfProfileView: "プロフィール表示回数"
 like: "いいね！"
 unlike: "いいねを解除"
+defaultLike: "絵文字のようなデフォルト"
 numberOfLikes: "いいね数"
 show: "表示"
 neverShow: "今後表示しない"
@@ -2406,7 +2407,7 @@ _externalResourceInstaller:
     _themeInstallFailed:
       title: "テーマのインストールに失敗しました"
       description: "テーマのインストール中に問題が発生しました。もう一度お試しください。エラーの詳細はJavascriptコンソールをご覧ください。"
-      
+
 _animatedMFM:
   play: "MFMアニメーションを再生"
   stop: "MFMアニメーション停止"

packages/backend/src/core/QueueService.ts

@@ -278,14 +278,14 @@ export class QueueService {
 	}
 
 	@bindThis
-	public createImportMastoToDbJob(user: ThinUser, targets: string[]) {
-		const jobs = targets.map(rel => this.generateToDbJobData('importMastoToDb', { user, target: rel }));
+	public createImportMastoToDbJob(user: ThinUser, targets: string[], note: MiNote['id'] | null) {
+		const jobs = targets.map(rel => this.generateToDbJobData('importMastoToDb', { user, target: rel, note }));
 		return this.dbQueue.addBulk(jobs);
 	}
 
 	@bindThis
-	public createImportPleroToDbJob(user: ThinUser, targets: string[]) {
-		const jobs = targets.map(rel => this.generateToDbJobData('importPleroToDb', { user, target: rel }));
+	public createImportPleroToDbJob(user: ThinUser, targets: string[], note: MiNote['id'] | null) {
+		const jobs = targets.map(rel => this.generateToDbJobData('importPleroToDb', { user, target: rel, note }));
 		return this.dbQueue.addBulk(jobs);
 	}
 

packages/backend/src/queue/processors/ImportNotesProcessorService.ts

@@ -17,7 +17,7 @@ import { extractApHashtagObjects } from '@/core/activitypub/models/tag.js';
 import { IdService } from '@/core/IdService.js';
 import { QueueLoggerService } from '../QueueLoggerService.js';
 import type * as Bull from 'bullmq';
-import type { DbNoteImportToDbJobData, DbNoteImportJobData, DbKeyNoteImportToDbJobData } from '../types.js';
+import type { DbNoteImportToDbJobData, DbNoteImportJobData, DbNoteWithParentImportToDbJobData } from '../types.js';
 
 @Injectable()
 export class ImportNotesProcessorService {
@@ -74,7 +74,7 @@ export class ImportNotesProcessorService {
 
 	// Function was taken from Firefish and modified for our needs
 	@bindThis
-	private async recreateChain(idField: string, replyField: string, arr: any[]): Promise<any[]> {
+	private async recreateChain(idFieldPath: string[], replyFieldPath: string[], arr: any[], includeOrphans: boolean): Promise<any[]> {
 		type NotesMap = {
 			[id: string]: any;
 		};
@@ -83,28 +83,42 @@ export class ImportNotesProcessorService {
 		const notesWaitingForParent: NotesMap = {};
 
 		for await (const note of arr) {
-			noteById[note[idField]] = note;
+			const noteId = idFieldPath.reduce(
+				(obj, step) => obj[step],
+				note,
+			);
+
+			noteById[noteId] = note;
 			note.childNotes = [];
 
-			const children = notesWaitingForParent[note[idField]];
+			const children = notesWaitingForParent[noteId];
 			if (children) {
 				note.childNotes.push(...children);
+				delete notesWaitingForParent[noteId];
 			}
 
-			if (note[replyField] == null) {
+			const noteReplyId = replyFieldPath.reduce(
+				(obj, step) => obj[step],
+				note,
+			);
+			if (noteReplyId == null) {
 				notesTree.push(note);
 				continue;
 			}
 
-			const parent = noteById[note[replyField]];
+			const parent = noteById[noteReplyId];
 			if (parent) {
 				parent.childNotes.push(note);
 			} else {
-				notesWaitingForParent[note[replyField]] ||= [];
-				notesWaitingForParent[note[replyField]].push(note);
+				notesWaitingForParent[noteReplyId] ||= [];
+				notesWaitingForParent[noteReplyId].push(note);
 			}
 		}
 
+		if (includeOrphans) {
+			notesTree.push(...Object.values(notesWaitingForParent).flat(1));
+		}
+
 		return notesTree;
 	}
 
@@ -176,7 +190,7 @@ export class ImportNotesProcessorService {
 				const tweets = Object.keys(fakeWindow.window.YTD.tweets.part0).reduce((m, key, i, obj) => {
 					return m.concat(fakeWindow.window.YTD.tweets.part0[key].tweet);
 				}, []);
-				const processedTweets = await this.recreateChain('id_str', 'in_reply_to_status_id_str', tweets);
+				const processedTweets = await this.recreateChain(['id_str'], ['in_reply_to_status_id_str'], tweets, false);
 				this.queueService.createImportTweetsToDbJob(job.data.user, processedTweets, null);
 			} finally {
 				cleanup();
@@ -254,7 +268,8 @@ export class ImportNotesProcessorService {
 					if (isPleroma) {
 						const outboxJson = fs.readFileSync(outputPath + '/outbox.json', 'utf-8');
 						const outbox = JSON.parse(outboxJson);
-						this.queueService.createImportPleroToDbJob(job.data.user, outbox.orderedItems.filter((x: any) => x.type === 'Create' && x.object.type === 'Note'));
+						const processedToots = await this.recreateChain(['object', 'id'], ['object', 'inReplyTo'], outbox.orderedItems.filter((x: any) => x.type === 'Create' && x.object.type === 'Note'), true);
+						this.queueService.createImportPleroToDbJob(job.data.user, processedToots, null);
 					} else {
 						const outboxJson = fs.readFileSync(outputPath + '/outbox.json', 'utf-8');
 						const outbox = JSON.parse(outboxJson);
@@ -266,7 +281,8 @@ export class ImportNotesProcessorService {
 						if (fs.existsSync(outputPath + '/media_attachments/files') && mastoFolder) {
 							await this.uploadFiles(outputPath + '/media_attachments/files', user, mastoFolder.id);
 						}
-						this.queueService.createImportMastoToDbJob(job.data.user, outbox.orderedItems.filter((x: any) => x.type === 'Create' && x.object.type === 'Note'));
+						const processedToots = await this.recreateChain(['object', 'id'], ['object', 'inReplyTo'], outbox.orderedItems.filter((x: any) => x.type === 'Create' && x.object.type === 'Note'), true);
+						this.queueService.createImportMastoToDbJob(job.data.user, processedToots, null);
 					}
 				}
 			} finally {
@@ -289,7 +305,7 @@ export class ImportNotesProcessorService {
 
 			const notesJson = fs.readFileSync(path, 'utf-8');
 			const notes = JSON.parse(notesJson);
-			const processedNotes = await this.recreateChain('id', 'replyId', notes);
+			const processedNotes = await this.recreateChain(['id'], ['replyId'], notes, false);
 			this.queueService.createImportKeyNotesToDbJob(job.data.user, processedNotes, null);
 			cleanup();
 		}
@@ -298,7 +314,7 @@ export class ImportNotesProcessorService {
 	}
 
 	@bindThis
-	public async processKeyNotesToDb(job: Bull.Job<DbKeyNoteImportToDbJobData>): Promise<void> {
+	public async processKeyNotesToDb(job: Bull.Job<DbNoteWithParentImportToDbJobData>): Promise<void> {
 		const note = job.data.target;
 		const user = await this.usersRepository.findOneBy({ id: job.data.user.id });
 		if (user == null) {
@@ -355,28 +371,33 @@ export class ImportNotesProcessorService {
 	}
 
 	@bindThis
-	public async processMastoToDb(job: Bull.Job<DbNoteImportToDbJobData>): Promise<void> {
+	public async processMastoToDb(job: Bull.Job<DbNoteWithParentImportToDbJobData>): Promise<void> {
 		const toot = job.data.target;
 		const user = await this.usersRepository.findOneBy({ id: job.data.user.id });
 		if (user == null) {
 			return;
 		}
 
+		if (toot.directMessage) return;
+
 		const date = new Date(toot.object.published);
 		let text = undefined;
 		const files: MiDriveFile[] = [];
 		let reply: MiNote | null = null;
 
 		if (toot.object.inReplyTo != null) {
-			try {
-				reply = await this.apNoteService.resolveNote(toot.object.inReplyTo);
-			} catch (error) {
-				reply = null;
+			const parentNote = job.data.note ? await this.notesRepository.findOneBy({ id: job.data.note }) : null;
+			if (parentNote) {
+				reply = parentNote;
+			} else {
+				try {
+					reply = await this.apNoteService.resolveNote(toot.object.inReplyTo);
+				} catch (error) {
+					reply = null;
+				}
 			}
 		}
 
-		if (toot.directMessage) return;
-
 		const hashtags = extractApHashtagObjects(toot.object.tag).map((x) => x.name).filter((x): x is string => x != null);
 
 		try {
@@ -396,17 +417,20 @@ export class ImportNotesProcessorService {
 			}
 		}
 
-		await this.noteCreateService.import(user, { createdAt: date, text: text, files: files, apMentions: new Array(0), cw: toot.object.sensitive ? toot.object.summary : null, reply: reply });
+		const createdNote = await this.noteCreateService.import(user, { createdAt: date, text: text, files: files, apMentions: new Array(0), cw: toot.object.sensitive ? toot.object.summary : null, reply: reply });
+		if (toot.childNotes) this.queueService.createImportMastoToDbJob(user, toot.childNotes, createdNote.id);
 	}
 
 	@bindThis
-	public async processPleroToDb(job: Bull.Job<DbNoteImportToDbJobData>): Promise<void> {
+	public async processPleroToDb(job: Bull.Job<DbNoteWithParentImportToDbJobData>): Promise<void> {
 		const post = job.data.target;
 		const user = await this.usersRepository.findOneBy({ id: job.data.user.id });
 		if (user == null) {
 			return;
 		}
 
+		if (post.directMessage) return;
+
 		const date = new Date(post.object.published);
 		let text = undefined;
 		const files: MiDriveFile[] = [];
@@ -416,15 +440,18 @@ export class ImportNotesProcessorService {
 		if (folder == null) return;
 
 		if (post.object.inReplyTo != null) {
-			try {
-				reply = await this.apNoteService.resolveNote(post.object.inReplyTo);
-			} catch (error) {
-				reply = null;
+			const parentNote = job.data.note ? await this.notesRepository.findOneBy({ id: job.data.note }) : null;
+			if (parentNote) {
+				reply = parentNote;
+			} else {
+				try {
+					reply = await this.apNoteService.resolveNote(post.object.inReplyTo);
+				} catch (error) {
+					reply = null;
+				}
 			}
 		}
 
-		if (post.directMessage) return;
-
 		const hashtags = extractApHashtagObjects(post.object.tag).map((x) => x.name).filter((x): x is string => x != null);
 
 		try {
@@ -468,7 +495,8 @@ export class ImportNotesProcessorService {
 			}
 		}
 
-		await this.noteCreateService.import(user, { createdAt: date, text: text, files: files, apMentions: new Array(0), cw: post.object.sensitive ? post.object.summary : null, reply: reply });
+		const createdNote = await this.noteCreateService.import(user, { createdAt: date, text: text, files: files, apMentions: new Array(0), cw: post.object.sensitive ? post.object.summary : null, reply: reply });
+		if (post.childNotes) this.queueService.createImportPleroToDbJob(user, post.childNotes, createdNote.id);
 	}
 
 	@bindThis
@@ -517,7 +545,7 @@ export class ImportNotesProcessorService {
 	}
 
 	@bindThis
-	public async processTwitterDb(job: Bull.Job<DbKeyNoteImportToDbJobData>): Promise<void> {
+	public async processTwitterDb(job: Bull.Job<DbNoteWithParentImportToDbJobData>): Promise<void> {
 		const tweet = job.data.target;
 		const user = await this.usersRepository.findOneBy({ id: job.data.user.id });
 		if (user == null) {

packages/backend/src/queue/types.ts

@@ -50,12 +50,12 @@ export type DbJobMap = {
 	exportUserLists: DbJobDataWithUser;
 	importAntennas: DBAntennaImportJobData;
 	importNotes: DbNoteImportJobData;
-	importTweetsToDb: DbKeyNoteImportToDbJobData;
+	importTweetsToDb: DbNoteWithParentImportToDbJobData;
 	importIGToDb: DbNoteImportToDbJobData;
 	importFBToDb: DbNoteImportToDbJobData;
-	importMastoToDb: DbNoteImportToDbJobData;
-	importPleroToDb: DbNoteImportToDbJobData;
-	importKeyNotesToDb: DbKeyNoteImportToDbJobData;
+	importMastoToDb: DbNoteWithParentImportToDbJobData;
+	importPleroToDb: DbNoteWithParentImportToDbJobData;
+	importKeyNotesToDb: DbNoteWithParentImportToDbJobData;
 	importFollowing: DbUserImportJobData;
 	importFollowingToDb: DbUserImportToDbJobData;
 	importMuting: DbUserImportJobData;
@@ -113,7 +113,7 @@ export type DbNoteImportToDbJobData = {
 	target: any;
 };
 
-export type DbKeyNoteImportToDbJobData = {
+export type DbNoteWithParentImportToDbJobData = {
 	user: ThinUser;
 	target: any;
 	note: MiNote['id'] | null;

packages/frontend/src/pages/admin/branding.vue

@@ -48,7 +48,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</MkInput>
 
 					<FromSlot>
-						<template #label>Default like emoji</template>
+						<template #label>{{ i18n.ts.defaultLike }}</template>
 						<MkCustomEmoji v-if="defaultLike.startsWith(':')" style="max-height: 3em; font-size: 1.1em;" :useOriginalSize="false" :class="$style.reaction" :name="defaultLike" :normal="true" :noStyle="true"/>
 						<MkEmoji v-else :emoji="defaultLike" style="max-height: 3em; font-size: 1.1em;" :normal="true" :noStyle="true"/>
 						<MkButton rounded :small="true" @click="chooseNewLike"><i class="ph-smiley ph-bold ph-lg"></i> Change</MkButton>

packages/frontend/src/pages/settings/reaction.vue

@@ -24,7 +24,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	</FromSlot>
 
 	<FromSlot>
-		<template #label>Default like emoji</template>
+		<template #label>{{ i18n.ts.defaultLike }}</template>
 		<MkCustomEmoji v-if="like && like.startsWith(':')" style="max-height: 3em; font-size: 1.1em;" :useOriginalSize="false" :class="$style.reaction" :name="like" :normal="true" :noStyle="true"/>
 		<MkEmoji v-else-if="like && !like.startsWith(':')" :emoji="like" style="max-height: 3em; font-size: 1.1em;" :normal="true" :noStyle="true"/>
 		<span v-else-if="!like">{{ i18n.ts.notSet }}</span>