From 627a71701ffc17215e3906f56322681a5ddb6bb5 Mon Sep 17 00:00:00 2001 From: Kaity A Date: Mon, 1 May 2023 02:29:50 +1000 Subject: [PATCH 01/30] Implement inbound note edit federation --- locales/en-US.yml | 3 + .../migration/1682753227899-NoteEdit.js | 53 ++++ packages/backend/src/db/postgre.ts | 2 + packages/backend/src/misc/schema.ts | 2 + .../backend/src/models/entities/note-edit.ts | 51 ++++ packages/backend/src/models/entities/note.ts | 6 + packages/backend/src/models/index.ts | 2 + .../backend/src/models/repositories/note.ts | 3 +- .../backend/src/models/schema/note-edit.ts | 49 ++++ .../remote/activitypub/kernel/update/index.ts | 24 +- .../src/remote/activitypub/models/note.ts | 226 +++++++++++++++++- .../backend/src/server/api/stream/types.ts | 3 + packages/backend/src/services/note/create.ts | 2 +- packages/calckey-js/src/streaming.types.ts | 9 +- .../client/src/components/MkNoteDetailed.vue | 91 +++++-- .../client/src/components/MkNoteHeader.vue | 11 +- packages/client/src/components/MkNoteSub.vue | 18 +- .../client/src/components/global/MkTime.vue | 3 +- packages/client/src/scripts/get-note-menu.ts | 18 +- 19 files changed, 513 insertions(+), 63 deletions(-) create mode 100644 packages/backend/migration/1682753227899-NoteEdit.js create mode 100644 packages/backend/src/models/entities/note-edit.ts create mode 100644 packages/backend/src/models/schema/note-edit.ts diff --git a/locales/en-US.yml b/locales/en-US.yml index f9d4d23f02..6385f464a7 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -46,9 +46,12 @@ unpin: "Unpin from profile" copyContent: "Copy contents" copyLink: "Copy link" delete: "Delete" +deleted: "Deleted" deleteAndEdit: "Delete and edit" deleteAndEditConfirm: "Are you sure you want to delete this post and edit it? You\ \ will lose all reactions, boosts and replies to it." +editNote: "Edit note" +edited: "Edited" addToList: "Add to list" sendMessage: "Send a message" copyUsername: "Copy username" diff --git a/packages/backend/migration/1682753227899-NoteEdit.js b/packages/backend/migration/1682753227899-NoteEdit.js new file mode 100644 index 0000000000..55a0de0206 --- /dev/null +++ b/packages/backend/migration/1682753227899-NoteEdit.js @@ -0,0 +1,53 @@ +export class NoteEdit1682753227899 { + name = "NoteEdit1682753227899"; + + async up(queryRunner) { + await queryRunner.query(` + CREATE TABLE "note_edit" ( + "id" character varying(32) NOT NULL, + "noteId" character varying(32) NOT NULL, + "text" text, + "cw" character varying(512), + "fileIds" character varying(32) array NOT NULL DEFAULT '{}', + "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL, + CONSTRAINT "PK_736fc6e0d4e222ecc6f82058e08" PRIMARY KEY ("id") + ) + `); + await queryRunner.query(` + COMMENT ON COLUMN "note_edit"."noteId" IS 'The ID of note.' + `); + await queryRunner.query(` + COMMENT ON COLUMN "note_edit"."updatedAt" IS 'The updated date of the Note.' + `); + await queryRunner.query(` + CREATE INDEX "IDX_702ad5ae993a672e4fbffbcd38" ON "note_edit" ("noteId") + `); + await queryRunner.query(` + ALTER TABLE "note" + ADD "updatedAt" TIMESTAMP WITH TIME ZONE + `); + await queryRunner.query(` + COMMENT ON COLUMN "note"."updatedAt" IS 'The updated date of the Note.' + `); + await queryRunner.query(` + ALTER TABLE "note_edit" + ADD CONSTRAINT "FK_702ad5ae993a672e4fbffbcd38c" + FOREIGN KEY ("noteId") + REFERENCES "note"("id") + ON DELETE CASCADE + ON UPDATE NO ACTION + `); + } + + async down(queryRunner) { + await queryRunner.query(` + ALTER TABLE "note_edit" DROP CONSTRAINT "FK_702ad5ae993a672e4fbffbcd38c" + `); + await queryRunner.query(` + ALTER TABLE "note" DROP COLUMN "updatedAt" + `); + await queryRunner.query(` + DROP TABLE "note_edit" + `); + } +} diff --git a/packages/backend/src/db/postgre.ts b/packages/backend/src/db/postgre.ts index bdeb910e84..dd202b3def 100644 --- a/packages/backend/src/db/postgre.ts +++ b/packages/backend/src/db/postgre.ts @@ -72,6 +72,7 @@ import { PasswordResetRequest } from "@/models/entities/password-reset-request.j import { UserPending } from "@/models/entities/user-pending.js"; import { Webhook } from "@/models/entities/webhook.js"; import { UserIp } from "@/models/entities/user-ip.js"; +import { NoteEdit } from "@/models/entities/note-edit.js"; import { entities as charts } from "@/services/chart/entities.js"; import { envOption } from "../env.js"; @@ -140,6 +141,7 @@ export const entities = [ RenoteMuting, Blocking, Note, + NoteEdit, NoteFavorite, NoteReaction, NoteWatching, diff --git a/packages/backend/src/misc/schema.ts b/packages/backend/src/misc/schema.ts index 7eaeb92e04..6e03d30d91 100644 --- a/packages/backend/src/misc/schema.ts +++ b/packages/backend/src/misc/schema.ts @@ -30,6 +30,7 @@ import { packedFederationInstanceSchema } from "@/models/schema/federation-insta import { packedQueueCountSchema } from "@/models/schema/queue.js"; import { packedGalleryPostSchema } from "@/models/schema/gallery-post.js"; import { packedEmojiSchema } from "@/models/schema/emoji.js"; +import { packedNoteEdit } from "@/models/schema/note-edit.js"; export const refs = { UserLite: packedUserLiteSchema, @@ -45,6 +46,7 @@ export const refs = { App: packedAppSchema, MessagingMessage: packedMessagingMessageSchema, Note: packedNoteSchema, + NoteEdit: packedNoteEdit, NoteReaction: packedNoteReactionSchema, NoteFavorite: packedNoteFavoriteSchema, Notification: packedNotificationSchema, diff --git a/packages/backend/src/models/entities/note-edit.ts b/packages/backend/src/models/entities/note-edit.ts new file mode 100644 index 0000000000..a65375efb5 --- /dev/null +++ b/packages/backend/src/models/entities/note-edit.ts @@ -0,0 +1,51 @@ +import { + Entity, + JoinColumn, + Column, + ManyToOne, + PrimaryColumn, + Index, +} from "typeorm"; +import { Note } from "./note.js"; +import { id } from "../id.js"; +import { DriveFile } from "./drive-file.js"; + +@Entity() +export class NoteEdit { + @PrimaryColumn(id()) + public id: string; + + @Index() + @Column({ + ...id(), + comment: 'The ID of note.', + }) + public noteId: Note["id"]; + + @ManyToOne(type => Note, { + onDelete: 'CASCADE', + }) + @JoinColumn() + public note: Note | null; + + @Column('text', { + nullable: true, + }) + public text: string | null; + + @Column('varchar', { + length: 512, nullable: true, + }) + public cw: string | null; + + @Column({ + ...id(), + array: true, default: '{}', + }) + public fileIds: DriveFile["id"][]; + + @Column('timestamp with time zone', { + comment: 'The updated date of the Note.', + }) + public updatedAt: Date; +} diff --git a/packages/backend/src/models/entities/note.ts b/packages/backend/src/models/entities/note.ts index fd6b170c0e..10449bb6d6 100644 --- a/packages/backend/src/models/entities/note.ts +++ b/packages/backend/src/models/entities/note.ts @@ -230,6 +230,12 @@ export class Note { comment: '[Denormalized]', }) public renoteUserHost: string | null; + + @Column('timestamp with time zone', { + nullable: true, + comment: 'The updated date of the Note.', + }) + public updatedAt: Date; //#endregion constructor(data: Partial) { diff --git a/packages/backend/src/models/index.ts b/packages/backend/src/models/index.ts index f68166c17f..cfc3b01c55 100644 --- a/packages/backend/src/models/index.ts +++ b/packages/backend/src/models/index.ts @@ -67,11 +67,13 @@ import { UserPending } from "./entities/user-pending.js"; import { InstanceRepository } from "./repositories/instance.js"; import { Webhook } from "./entities/webhook.js"; import { UserIp } from "./entities/user-ip.js"; +import { NoteEdit } from "./entities/note-edit.js"; export const Announcements = db.getRepository(Announcement); export const AnnouncementReads = db.getRepository(AnnouncementRead); export const Apps = AppRepository; export const Notes = NoteRepository; +export const NoteEdits = db.getRepository(NoteEdit); export const NoteFavorites = NoteFavoriteRepository; export const NoteWatchings = db.getRepository(NoteWatching); export const NoteThreadMutings = db.getRepository(NoteThreadMuting); diff --git a/packages/backend/src/models/repositories/note.ts b/packages/backend/src/models/repositories/note.ts index 5e56a817bc..74696f8517 100644 --- a/packages/backend/src/models/repositories/note.ts +++ b/packages/backend/src/models/repositories/note.ts @@ -235,10 +235,11 @@ export const NoteRepository = db.getRepository(Note).extend({ mentions: note.mentions.length > 0 ? note.mentions : undefined, uri: note.uri || undefined, url: note.url || undefined, + updatedAt: note.updatedAt?.toISOString() || undefined, ...(opts.detail ? { - reply: note.replyId + reply: note.replyId ? this.pack(note.reply || note.replyId, me, { detail: false, _hint_: options?._hint_, diff --git a/packages/backend/src/models/schema/note-edit.ts b/packages/backend/src/models/schema/note-edit.ts new file mode 100644 index 0000000000..e877f3f946 --- /dev/null +++ b/packages/backend/src/models/schema/note-edit.ts @@ -0,0 +1,49 @@ +export const packedNoteEdit = { + type: "object", + properties: { + id: { + type: "string", + optional: false, + nullable: false, + format: "id", + example: "xxxxxxxxxx", + }, + updatedAt: { + type: "string", + optional: false, + nullable: false, + format: "date-time", + }, + note: { + type: "object", + optional: false, + nullable: false, + ref: "Note", + }, + noteId: { + type: "string", + optional: false, + nullable: false, + format: "id", + }, + text: { + type: "string", + optional: true, + nullable: true, + }, + cw: { + type: "string", + optional: true, + nullable: true, + }, + fileIds: { + type: "array", + optional: true, + nullable: true, + items: { + type: "string", + format: "id", + }, + }, + }, +} as const; diff --git a/packages/backend/src/remote/activitypub/kernel/update/index.ts b/packages/backend/src/remote/activitypub/kernel/update/index.ts index 4f1514ddd1..558a20ce0f 100644 --- a/packages/backend/src/remote/activitypub/kernel/update/index.ts +++ b/packages/backend/src/remote/activitypub/kernel/update/index.ts @@ -2,7 +2,7 @@ import type { CacheableRemoteUser } from "@/models/entities/user.js"; import type { IUpdate } from "../../type.js"; import { getApType, isActor } from "../../type.js"; import { apLogger } from "../../logger.js"; -import { updateQuestion } from "../../models/question.js"; +import { updateNote } from "../../models/note.js"; import Resolver from "../../resolver.js"; import { updatePerson } from "../../models/person.js"; @@ -29,10 +29,22 @@ export default async ( if (isActor(object)) { await updatePerson(actor.uri!, resolver, object); return "ok: Person updated"; - } else if (getApType(object) === "Question") { - await updateQuestion(object, resolver).catch((e) => console.log(e)); - return "ok: Question updated"; - } else { - return `skip: Unknown type: ${getApType(object)}`; + } + + const objectType = getApType(object); + switch (objectType) { + case "Question": + case "Note": + case "Article": + case "Document": + case "Page": + let failed = false; + await updateNote(object, resolver).catch((e: Error) => { + failed = true; + }); + return failed ? "skip: Note update failed" : "ok: Note updated"; + + default: + return `skip: Unknown type: ${objectType}`; } }; diff --git a/packages/backend/src/remote/activitypub/models/note.ts b/packages/backend/src/remote/activitypub/models/note.ts index 033157b081..6508d01e90 100644 --- a/packages/backend/src/remote/activitypub/models/note.ts +++ b/packages/backend/src/remote/activitypub/models/note.ts @@ -1,22 +1,32 @@ import promiseLimit from "promise-limit"; - +import * as mfm from "mfm-js"; import config from "@/config/index.js"; import Resolver from "../resolver.js"; import post from "@/services/note/create.js"; +import { extractMentionedUsers } from "@/services/note/create.js"; import { resolvePerson } from "./person.js"; import { resolveImage } from "./image.js"; -import type { CacheableRemoteUser } from "@/models/entities/user.js"; +import type { + ILocalUser, + CacheableRemoteUser, +} from "@/models/entities/user.js"; import { htmlToMfm } from "../misc/html-to-mfm.js"; import { extractApHashtags } from "./tag.js"; import { unique, toArray, toSingle } from "@/prelude/array.js"; -import { extractPollFromQuestion } from "./question.js"; +import { extractPollFromQuestion, updateQuestion } from "./question.js"; import vote from "@/services/note/polls/vote.js"; import { apLogger } from "../logger.js"; import type { DriveFile } from "@/models/entities/drive-file.js"; import { deliverQuestionUpdate } from "@/services/note/polls/update.js"; import { extractDbHost, toPuny } from "@/misc/convert-host.js"; -import { Emojis, Polls, MessagingMessages } from "@/models/index.js"; -import type { Note } from "@/models/entities/note.js"; +import { + Emojis, + Polls, + MessagingMessages, + Notes, + NoteEdits, +} from "@/models/index.js"; +import type { IMentionedRemoteUsers, Note } from "@/models/entities/note.js"; import type { IObject, IPost } from "../type.js"; import { getOneApId, @@ -28,7 +38,6 @@ import { } from "../type.js"; import type { Emoji } from "@/models/entities/emoji.js"; import { genId } from "@/misc/gen-id.js"; -import { fetchMeta } from "@/misc/fetch-meta.js"; import { getApLock } from "@/misc/app-lock.js"; import { createMessage } from "@/services/messages/create.js"; import { parseAudience } from "../audience.js"; @@ -36,6 +45,10 @@ import { extractApMentions } from "./mention.js"; import DbResolver from "../db-resolver.js"; import { StatusError } from "@/misc/fetch.js"; import { shouldBlockInstance } from "@/misc/should-block-instance.js"; +import { publishNoteStream } from "@/services/stream.js"; +import { extractHashtags } from "@/misc/extract-hashtags.js"; +import { UserProfiles } from "@/models/index.js"; +import { In } from "typeorm"; const logger = apLogger; @@ -497,3 +510,204 @@ export async function extractEmojis( }), ); } + +type TagDetail = { + type: string; + name: string; +}; + +export async function updateNote(value: string | IObject, resolver?: Resolver) { + const uri = typeof value === "string" ? value : value.id; + if (!uri) throw new Error("Missing note uri"); + + // Skip if URI points to this server + if (uri.startsWith(`${config.url}/`)) throw new Error("uri points local"); + + // A new resolver is created if not specified + if (resolver == null) resolver = new Resolver(); + + // Resolve the updated Note object + const post = (await resolver.resolve(value)) as IPost; + + const actor = (await resolvePerson( + getOneApId(post.attributedTo), + resolver, + )) as CacheableRemoteUser; + + // Already registered with this server? + const note = await Notes.findOneBy({ uri }); + if (note == null) { + return await createNote(post, resolver); + } + + // Text parsing + let text: string | null = null; + if ( + post.source?.mediaType === "text/x.misskeymarkdown" && + typeof post.source?.content === "string" + ) { + text = post.source.content; + } else if (typeof post._misskey_content !== "undefined") { + text = post._misskey_content; + } else if (typeof post.content === "string") { + text = htmlToMfm(post.content, post.tag); + } + + const cw = post.sensitive && post.summary; + + // File parsing + const fileList = post.attachment + ? Array.isArray(post.attachment) + ? post.attachment + : [post.attachment] + : []; + const files = fileList.map((f) => (f.sensitive = post.sensitive)); + + // Fetch files + const limit = promiseLimit(2); + + const driveFiles = ( + await Promise.all( + fileList.map( + (x) => limit(() => resolveImage(actor, x)) as Promise, + ), + ) + ).filter((file) => file != null); + const fileIds = driveFiles.map((file) => file.id); + const fileTypes = driveFiles.map((file) => file.type); + + const apEmojis = ( + await extractEmojis(post.tag || [], actor.host).catch((e) => []) + ).map((emoji) => emoji.name); + const apMentions = await extractApMentions(post.tag); + const apHashtags = await extractApHashtags(post.tag); + + const poll = await extractPollFromQuestion(post, resolver).catch( + () => undefined, + ); + + const choices = poll?.choices.map((choice) => mfm.parse(choice)).flat() ?? []; + + const tokens = mfm + .parse(text || "") + .concat(mfm.parse(cw || "")) + .concat(choices); + + const hashTags: string[] = apHashtags || extractHashtags(tokens); + + const mentionUsers = + apMentions || (await extractMentionedUsers(actor, tokens)); + + const mentionUserIds = mentionUsers.map((user) => user.id); + const remoteUsers = mentionUsers.filter((user) => user.host != null); + const remoteUserIds = remoteUsers.map((user) => user.id); + const remoteProfiles = await UserProfiles.findBy({ + userId: In(remoteUserIds), + }); + const mentionedRemoteUsers = remoteUsers.map((user) => { + const profile = remoteProfiles.find( + (profile) => profile.userId === user.id, + ); + return { + username: user.username, + host: user.host ?? null, + uri: user.uri, + url: profile ? profile.url : undefined, + } as IMentionedRemoteUsers[0]; + }); + + let updating = false; + const update = {} as Partial; + if (text && text !== note.text) { + update.text = text; + updating = true; + } + if (cw !== note.cw) { + update.cw = cw ? cw : null; + updating = true; + } + if (fileIds.sort().join(",") !== note.fileIds.sort().join(",")) { + update.fileIds = fileIds; + update.attachedFileTypes = fileTypes; + updating = true; + } + + if (hashTags.sort().join(",") !== note.tags.sort().join(",")) { + update.tags = hashTags; + updating = true; + } + + if (mentionUserIds.sort().join(",") !== note.mentions.sort().join(",")) { + update.mentions = mentionUserIds; + update.mentionedRemoteUsers = JSON.stringify(mentionedRemoteUsers); + updating = true; + } + + if (apEmojis.sort().join(",") !== note.emojis.sort().join(",")) { + update.emojis = apEmojis; + updating = true; + } + + if (note.hasPoll !== !!poll) { + update.hasPoll = !!poll; + updating = true; + } + + if (poll) { + const dbPoll = await Polls.findOneBy({ noteId: note.id }); + if (dbPoll == null) { + await Polls.insert({ + noteId: note.id, + choices: poll?.choices, + multiple: poll?.multiple, + votes: poll?.votes, + expiresAt: poll?.expiresAt, + noteVisibility: note.visibility, + userId: actor.id, + userHost: actor.host, + }); + updating = true; + } else if ( + dbPoll.multiple !== poll.multiple || + dbPoll.expiresAt !== poll.expiresAt || + dbPoll.noteVisibility !== note.visibility || + dbPoll.votes.length !== poll.votes?.length || + JSON.stringify(dbPoll.choices) !== JSON.stringify(poll.choices) + ) { + await Polls.update( + { noteId: note.id }, + { + choices: poll?.choices, + multiple: poll?.multiple, + votes: poll?.votes, + expiresAt: poll?.expiresAt, + noteVisibility: note.visibility, + }, + ); + updating = true; + } + } + + // Update Note + if (updating) { + update.updatedAt = new Date(); + + // Save updated note to the database + await Notes.update({ uri }, update); + + // Save an edit history for the previous note + await NoteEdits.insert({ + id: genId(), + noteId: note.id, + text: note.text, + cw: note.cw, + fileIds: note.fileIds, + updatedAt: update.updatedAt, + }); + + // Publish update event for the updated note details + publishNoteStream(note.id, "updated", { + updatedAt: update.updatedAt, + }); + } +} diff --git a/packages/backend/src/server/api/stream/types.ts b/packages/backend/src/server/api/stream/types.ts index 9becf9f642..2c59d51d1f 100644 --- a/packages/backend/src/server/api/stream/types.ts +++ b/packages/backend/src/server/api/stream/types.ts @@ -145,6 +145,9 @@ export interface NoteStreamTypes { replied: { id: Note["id"]; }; + updated: { + updatedAt: Note["updatedAt"]; + }; } type NoteStreamEventTypes = { [key in keyof NoteStreamTypes]: { diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts index 5dd324d89a..a3d784cbac 100644 --- a/packages/backend/src/services/note/create.ts +++ b/packages/backend/src/services/note/create.ts @@ -846,7 +846,7 @@ function incNotesCountOfUser(user: { id: User["id"] }) { .execute(); } -async function extractMentionedUsers( +export async function extractMentionedUsers( user: { host: User["host"] }, tokens: mfm.MfmNode[], ): Promise { diff --git a/packages/calckey-js/src/streaming.types.ts b/packages/calckey-js/src/streaming.types.ts index 44ef647bcc..7f1edc87d6 100644 --- a/packages/calckey-js/src/streaming.types.ts +++ b/packages/calckey-js/src/streaming.types.ts @@ -1,4 +1,4 @@ -import { +import type { Antenna, CustomEmoji, DriveFile, @@ -171,6 +171,13 @@ export type NoteUpdatedEvent = body: { id: Note["id"]; }; + } + | { + id: Note["id"]; + type: "updated"; + body: { + updatedAt: string; + }; }; export type BroadcastEvents = { diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue index de9cfd0bcf..aed5c61ae2 100644 --- a/packages/client/src/components/MkNoteDetailed.vue +++ b/packages/client/src/components/MkNoteDetailed.vue @@ -108,7 +108,7 @@ const props = defineProps<{ const inChannel = inject("inChannel", null); -let note = $ref(deepClone(props.note)); +let note = $ref(props.note); const enableEmojiReactions = defaultStore.state.enableEmojiReactions; @@ -174,15 +174,12 @@ useNoteCapture({ function reply(viaKeyboard = false): void { pleaseLogin(); - os.post( - { - reply: appearNote, - animation: !viaKeyboard, - }, - () => { - focus(); - } - ); + os.post({ + reply: appearNote, + animation: !viaKeyboard, + }).then(() => { + focus(); + }); } function react(viaKeyboard = false): void { @@ -309,19 +306,65 @@ if (appearNote.replyId) { }); } -function onNoteReplied(noteData: NoteUpdatedEvent): void { +async function onNoteUpdated(noteData: NoteUpdatedEvent): Promise { const { type, id, body } = noteData; - if (type === "replied" && id === appearNote.id) { - const { id: createdId } = body; - os.api("notes/show", { - noteId: createdId, - }).then((note) => { - if (note.replyId === appearNote.id) { - replies.value.unshift(note); - directReplies.value.unshift(note); + let found = -1; + if (id === appearNote.id) { + found = 0; + } else { + for (let i = 0; i < replies.value.length; i++) { + const reply = replies.value[i]; + if (reply.id === id) { + found = i + 1; + break; } - }); + } + } + + if (found === -1) { + return; + } + + switch (type) { + case "replied": + const { id: createdId } = body; + const replyNote = await os.api("notes/show", { + noteId: createdId, + }); + + replies.value.splice(found, 0, replyNote); + if (found === 0) { + directReplies.value.unshift(replyNote); + } + break; + + case "updated": + let updatedNote = appearNote; + if (found > 0) { + updatedNote = replies.value[found - 1]; + } + + const editedNote = await os.api("notes/show", { + noteId: id, + }); + + const keys = new Set(); + Object.keys(editedNote) + .concat(Object.keys(updatedNote)) + .forEach((key) => keys.add(key)); + keys.forEach((key) => { + updatedNote[key] = editedNote[key]; + }); + break; + + case "deleted": + if (found === 0) { + isDeleted.value = true; + } else { + replies.value.splice(found - 1, 1); + } + break; } } @@ -330,19 +373,19 @@ document.addEventListener("wheel", () => { }); onMounted(() => { - stream.on("noteUpdated", onNoteReplied); + stream.on("noteUpdated", onNoteUpdated); isScrolling = false; - noteEl.scrollIntoView(); + noteEl?.scrollIntoView(); }); onUpdated(() => { if (!isScrolling) { - noteEl.scrollIntoView(); + noteEl?.scrollIntoView(); } }); onUnmounted(() => { - stream.off("noteUpdated", onNoteReplied); + stream.off("noteUpdated", onNoteUpdated); }); diff --git a/packages/client/src/components/MkNoteHeader.vue b/packages/client/src/components/MkNoteHeader.vue index c4443141b8..65f9a336f8 100644 --- a/packages/client/src/components/MkNoteHeader.vue +++ b/packages/client/src/components/MkNoteHeader.vue @@ -18,6 +18,13 @@
+ ({{ i18n.ts.edited }})
@@ -39,14 +46,14 @@ import MkVisibility from "@/components/MkVisibility.vue"; import MkInstanceTicker from "@/components/MkInstanceTicker.vue"; import { notePage } from "@/filters/note"; import { userPage } from "@/filters/user"; -import { deepClone } from "@/scripts/clone"; +import { i18n } from "@/i18n"; const props = defineProps<{ note: misskey.entities.Note; pinned?: boolean; }>(); -let note = $ref(deepClone(props.note)); +let note = $ref(props.note); const showTicker = defaultStore.state.instanceTicker === "always" || diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue index f5e70891fa..b124912b17 100644 --- a/packages/client/src/components/MkNoteSub.vue +++ b/packages/client/src/components/MkNoteSub.vue @@ -180,7 +180,6 @@ import { useRouter } from "@/router"; import * as os from "@/os"; import { reactionPicker } from "@/scripts/reaction-picker"; import { i18n } from "@/i18n"; -import { deepClone } from "@/scripts/clone"; import { useNoteCapture } from "@/scripts/use-note-capture"; import { defaultStore } from "@/store"; @@ -203,7 +202,7 @@ const props = withDefaults( } ); -let note = $ref(deepClone(props.note)); +let note = $ref(props.note); const isRenote = note.renote != null && @@ -239,15 +238,12 @@ useNoteCapture({ function reply(viaKeyboard = false): void { pleaseLogin(); - os.post( - { - reply: appearNote, - animation: !viaKeyboard, - }, - () => { - focus(); - } - ); + os.post({ + reply: appearNote, + animation: !viaKeyboard, + }).then(() => { + focus(); + }); } function react(viaKeyboard = false): void { diff --git a/packages/client/src/components/global/MkTime.vue b/packages/client/src/components/global/MkTime.vue index 66a6416e89..db53248bb4 100644 --- a/packages/client/src/components/global/MkTime.vue +++ b/packages/client/src/components/global/MkTime.vue @@ -5,6 +5,7 @@ + @@ -15,7 +16,7 @@ import { i18n } from "@/i18n"; const props = withDefaults( defineProps<{ time: Date | string; - mode?: "relative" | "absolute" | "detail"; + mode?: "relative" | "absolute" | "detail" | "none"; }>(), { mode: "relative", diff --git a/packages/client/src/scripts/get-note-menu.ts b/packages/client/src/scripts/get-note-menu.ts index 0c8d517e52..03c35e1322 100644 --- a/packages/client/src/scripts/get-note-menu.ts +++ b/packages/client/src/scripts/get-note-menu.ts @@ -105,16 +105,14 @@ export function getNoteMenu(props: { noteId: appearNote.id, }, undefined, - null, - (res) => { - if (res.id === "72dab508-c64d-498f-8740-a8eec1ba385a") { - os.alert({ - type: "error", - text: i18n.ts.pinLimitExceeded, - }); - } - }, - ); + ).catch((res) => { + if (res.id === "72dab508-c64d-498f-8740-a8eec1ba385a") { + os.alert({ + type: "error", + text: i18n.ts.pinLimitExceeded, + }); + } + }); } async function clip(): Promise { From 6eed0380280f7a89b4ef42c3bb587bffd5a89dc6 Mon Sep 17 00:00:00 2001 From: Kaity A Date: Mon, 1 May 2023 03:17:38 +1000 Subject: [PATCH 02/30] fix poll voting causing edit revisions. --- packages/backend/src/models/repositories/note.ts | 2 +- .../src/remote/activitypub/models/note.ts | 16 ++++++++++++++-- packages/backend/src/server/api/stream/types.ts | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/packages/backend/src/models/repositories/note.ts b/packages/backend/src/models/repositories/note.ts index 74696f8517..1310c14b02 100644 --- a/packages/backend/src/models/repositories/note.ts +++ b/packages/backend/src/models/repositories/note.ts @@ -239,7 +239,7 @@ export const NoteRepository = db.getRepository(Note).extend({ ...(opts.detail ? { - reply: note.replyId + reply: note.replyId ? this.pack(note.reply || note.replyId, me, { detail: false, _hint_: options?._hint_, diff --git a/packages/backend/src/remote/activitypub/models/note.ts b/packages/backend/src/remote/activitypub/models/note.ts index 6508d01e90..5464c8a896 100644 --- a/packages/backend/src/remote/activitypub/models/note.ts +++ b/packages/backend/src/remote/activitypub/models/note.ts @@ -586,7 +586,7 @@ export async function updateNote(value: string | IObject, resolver?: Resolver) { () => undefined, ); - const choices = poll?.choices.map((choice) => mfm.parse(choice)).flat() ?? []; + const choices = poll?.choices.flatMap((choice) => mfm.parse(choice)) ?? []; const tokens = mfm .parse(text || "") @@ -617,6 +617,7 @@ export async function updateNote(value: string | IObject, resolver?: Resolver) { }); let updating = false; + let publishing = false; const update = {} as Partial; if (text && text !== note.text) { update.text = text; @@ -671,7 +672,6 @@ export async function updateNote(value: string | IObject, resolver?: Resolver) { dbPoll.multiple !== poll.multiple || dbPoll.expiresAt !== poll.expiresAt || dbPoll.noteVisibility !== note.visibility || - dbPoll.votes.length !== poll.votes?.length || JSON.stringify(dbPoll.choices) !== JSON.stringify(poll.choices) ) { await Polls.update( @@ -685,6 +685,14 @@ export async function updateNote(value: string | IObject, resolver?: Resolver) { }, ); updating = true; + } else { + for (let i = 0; i < poll.choices.length; i++) { + if (dbPoll.votes[i] !== poll.votes?.[i]) { + await Polls.update({ noteId: note.id }, { votes: poll?.votes }); + publishing = true; + break; + } + } } } @@ -705,6 +713,10 @@ export async function updateNote(value: string | IObject, resolver?: Resolver) { updatedAt: update.updatedAt, }); + publishing = true; + } + + if (publishing) { // Publish update event for the updated note details publishNoteStream(note.id, "updated", { updatedAt: update.updatedAt, diff --git a/packages/backend/src/server/api/stream/types.ts b/packages/backend/src/server/api/stream/types.ts index 2c59d51d1f..91095a46d3 100644 --- a/packages/backend/src/server/api/stream/types.ts +++ b/packages/backend/src/server/api/stream/types.ts @@ -146,7 +146,7 @@ export interface NoteStreamTypes { id: Note["id"]; }; updated: { - updatedAt: Note["updatedAt"]; + updatedAt?: Note["updatedAt"]; }; } type NoteStreamEventTypes = { From 169d61f0ade9d981243a2726f1fb14c118b87aa9 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 1 May 2023 23:08:35 -0700 Subject: [PATCH 03/30] disable post imports for now --- packages/backend/src/server/api/endpoints.ts | 2 +- packages/client/src/pages/settings/import-export.vue | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts index 3f82eb7a73..c17b6844d5 100644 --- a/packages/backend/src/server/api/endpoints.ts +++ b/packages/backend/src/server/api/endpoints.ts @@ -533,7 +533,7 @@ const eps = [ ["i/export-following", ep___i_exportFollowing], ["i/export-mute", ep___i_exportMute], ["i/export-notes", ep___i_exportNotes], - ["i/import-posts", ep___i_importPosts], + // ["i/import-posts", ep___i_importPosts], ["i/export-user-lists", ep___i_exportUserLists], ["i/favorites", ep___i_favorites], ["i/gallery/likes", ep___i_gallery_likes], diff --git a/packages/client/src/pages/settings/import-export.vue b/packages/client/src/pages/settings/import-export.vue index fd0f795107..7186ec8950 100644 --- a/packages/client/src/pages/settings/import-export.vue +++ b/packages/client/src/pages/settings/import-export.vue @@ -16,23 +16,20 @@ {{ i18n.ts.export }} - + - + {{ i18n.ts.import }} - + --> {{ - self ? pathname.substr(1) : pathname + self ? pathname.substring(1) : pathname }} {{ query }} {{ hash }} From 8a69b48351c259a75ed944341e8000140f475e0c Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 2 May 2023 15:14:12 -0700 Subject: [PATCH 16/30] Revert "chore: theme refactor" This reverts commit 6953fceade5fe8a6e0cb83a10f977c0643663b91. --- packages/client/src/themes/d-astro.json5 | 2 +- packages/client/src/themes/d-botanical.json5 | 2 +- .../src/themes/d-catppuccin-frappe.json5 | 2 +- .../src/themes/d-catppuccin-mocha.json5 | 2 +- packages/client/src/themes/d-cherry.json5 | 2 +- packages/client/src/themes/d-future.json5 | 2 +- packages/client/src/themes/d-green-lime.json5 | 2 +- .../client/src/themes/d-green-orange.json5 | 24 +++++ packages/client/src/themes/d-ice.json5 | 2 +- packages/client/src/themes/d-persimmon.json5 | 2 +- packages/client/src/themes/d-u0.json5 | 2 +- packages/client/src/themes/l-apricot.json5 | 2 +- .../src/themes/l-catppuccin-latte.json5 | 94 ------------------- packages/client/src/themes/l-cherry.json5 | 2 +- packages/client/src/themes/l-coffee.json5 | 2 +- packages/client/src/themes/l-rainy.json5 | 2 +- packages/client/src/themes/l-sushi.json5 | 2 +- packages/client/src/themes/l-u0.json5 | 2 +- packages/client/src/themes/l-vivid.json5 | 2 +- 19 files changed, 41 insertions(+), 111 deletions(-) create mode 100644 packages/client/src/themes/d-green-orange.json5 delete mode 100644 packages/client/src/themes/l-catppuccin-latte.json5 diff --git a/packages/client/src/themes/d-astro.json5 b/packages/client/src/themes/d-astro.json5 index a51ee94ae8..c6a927ec3a 100644 --- a/packages/client/src/themes/d-astro.json5 +++ b/packages/client/src/themes/d-astro.json5 @@ -1,7 +1,7 @@ { id: '080a01c5-377d-4fbb-88cc-6bb5d04977ea', base: 'dark', - name: 'Astro Dark', + name: 'Mi Astro Dark', author: 'syuilo', props: { bg: '#232125', diff --git a/packages/client/src/themes/d-botanical.json5 b/packages/client/src/themes/d-botanical.json5 index 08fabf86a3..c03b95e2d7 100644 --- a/packages/client/src/themes/d-botanical.json5 +++ b/packages/client/src/themes/d-botanical.json5 @@ -1,7 +1,7 @@ { id: '504debaf-4912-6a4c-5059-1db08a76b737', - name: 'Botanical Dark', + name: 'Mi Botanical Dark', author: 'syuilo', base: 'dark', diff --git a/packages/client/src/themes/d-catppuccin-frappe.json5 b/packages/client/src/themes/d-catppuccin-frappe.json5 index ed3aac3c56..891fe18058 100644 --- a/packages/client/src/themes/d-catppuccin-frappe.json5 +++ b/packages/client/src/themes/d-catppuccin-frappe.json5 @@ -1,7 +1,7 @@ { id: 'ffcd3328-5c57-4ca3-9dac-4580cbf7742f', base: 'dark', - name: 'Catppuccin Frappe', + name: 'Catppuccin frappe', props: { X2: ':darken<2<@panel', X3: 'rgba(255, 255, 255, 0.05)', diff --git a/packages/client/src/themes/d-catppuccin-mocha.json5 b/packages/client/src/themes/d-catppuccin-mocha.json5 index 83d464f885..94e1381c71 100644 --- a/packages/client/src/themes/d-catppuccin-mocha.json5 +++ b/packages/client/src/themes/d-catppuccin-mocha.json5 @@ -1,7 +1,7 @@ { id: 'd413f41f-a489-48be-9e20-3532ffbb4363', base: 'dark', - name: 'Catppuccin Mocha', + name: 'Catppuccin mocha', props: { X2: ':darken<2<@panel', X3: 'rgba(255, 255, 255, 0.05)', diff --git a/packages/client/src/themes/d-cherry.json5 b/packages/client/src/themes/d-cherry.json5 index e39e9ce666..a7e1ad1c80 100644 --- a/packages/client/src/themes/d-cherry.json5 +++ b/packages/client/src/themes/d-cherry.json5 @@ -1,7 +1,7 @@ { id: '679b3b87-a4e9-4789-8696-b56c15cc33b0', - name: 'Cherry Dark', + name: 'Mi Cherry Dark', author: 'syuilo', base: 'dark', diff --git a/packages/client/src/themes/d-future.json5 b/packages/client/src/themes/d-future.json5 index 8b63457084..b6fa1ab0c1 100644 --- a/packages/client/src/themes/d-future.json5 +++ b/packages/client/src/themes/d-future.json5 @@ -1,7 +1,7 @@ { id: '32a637ef-b47a-4775-bb7b-bacbb823f865', - name: 'Future Dark', + name: 'Mi Future Dark', author: 'syuilo', base: 'dark', diff --git a/packages/client/src/themes/d-green-lime.json5 b/packages/client/src/themes/d-green-lime.json5 index c06e9af715..a6983b9ac2 100644 --- a/packages/client/src/themes/d-green-lime.json5 +++ b/packages/client/src/themes/d-green-lime.json5 @@ -1,7 +1,7 @@ { id: '02816013-8107-440f-877e-865083ffe194', - name: 'Mi Dark', + name: 'Mi Green+Lime Dark', author: 'syuilo', base: 'dark', diff --git a/packages/client/src/themes/d-green-orange.json5 b/packages/client/src/themes/d-green-orange.json5 new file mode 100644 index 0000000000..62adc39e29 --- /dev/null +++ b/packages/client/src/themes/d-green-orange.json5 @@ -0,0 +1,24 @@ +{ + id: 'dc489603-27b5-424a-9b25-1ff6aec9824a', + + name: 'Mi Green+Orange Dark', + author: 'syuilo', + + base: 'dark', + + props: { + accent: '#e97f00', + bg: '#0C1210', + fg: '#dee7e4', + fgHighlighted: '#fff', + fgOnAccent: '#192320', + divider: '#e7fffb24', + panel: '#192320', + panelHeaderBg: '@panel', + panelHeaderDivider: '@divider', + popup: '#293330', + renote: '@accent', + mentionMe: '#b4e900', + link: '#24d7ce', + }, +} diff --git a/packages/client/src/themes/d-ice.json5 b/packages/client/src/themes/d-ice.json5 index c095bf287b..179b060dcf 100644 --- a/packages/client/src/themes/d-ice.json5 +++ b/packages/client/src/themes/d-ice.json5 @@ -1,7 +1,7 @@ { id: '66e7e5a9-cd43-42cd-837d-12f47841fa34', - name: 'Ice Dark', + name: 'Mi Ice Dark', author: 'syuilo', base: 'dark', diff --git a/packages/client/src/themes/d-persimmon.json5 b/packages/client/src/themes/d-persimmon.json5 index ec1728d079..e36265ff10 100644 --- a/packages/client/src/themes/d-persimmon.json5 +++ b/packages/client/src/themes/d-persimmon.json5 @@ -1,7 +1,7 @@ { id: 'c503d768-7c70-4db2-a4e6-08264304bc8d', - name: 'Persimmon Dark', + name: 'Mi Persimmon Dark', author: 'syuilo', base: 'dark', diff --git a/packages/client/src/themes/d-u0.json5 b/packages/client/src/themes/d-u0.json5 index b5fe92cbc6..67c9235df0 100644 --- a/packages/client/src/themes/d-u0.json5 +++ b/packages/client/src/themes/d-u0.json5 @@ -1,7 +1,7 @@ { id: '7a5bc13b-df8f-4d44-8e94-4452f0c634bb', base: 'dark', - name: 'U0 Dark', + name: 'Mi U0 Dark', props: { X2: ':darken<2<@panel', X3: 'rgba(255, 255, 255, 0.05)', diff --git a/packages/client/src/themes/l-apricot.json5 b/packages/client/src/themes/l-apricot.json5 index c1a8b29c0e..1ed5525575 100644 --- a/packages/client/src/themes/l-apricot.json5 +++ b/packages/client/src/themes/l-apricot.json5 @@ -1,7 +1,7 @@ { id: '0ff48d43-aab3-46e7-ab12-8492110d2e2b', - name: 'Apricot Light', + name: 'Mi Apricot Light', author: 'syuilo', base: 'light', diff --git a/packages/client/src/themes/l-catppuccin-latte.json5 b/packages/client/src/themes/l-catppuccin-latte.json5 deleted file mode 100644 index 085e66df65..0000000000 --- a/packages/client/src/themes/l-catppuccin-latte.json5 +++ /dev/null @@ -1,94 +0,0 @@ -{ - id: "169661d2-5a17-4dfc-b71b-9938cbbbed3e", - base: "light", - name: "Catppuccin Latte", - props: { - X2: ":darken<2<@panel", - X3: "rgba(255, 255, 255, 0.05)", - X4: "rgba(255, 255, 255, 0.1)", - X5: "rgba(255, 255, 255, 0.05)", - X6: "rgba(255, 255, 255, 0.15)", - X7: "rgba(255, 255, 255, 0.05)", - X8: ":lighten<5<@accent", - X9: ":darken<5<@accent", - bg: "#dce0e8", - fg: "#4c4f69", - X10: ":alpha<0.4<@accent", - X11: "rgba(0, 0, 0, 0.3)", - X12: "rgba(255, 255, 255, 0.1)", - X13: "rgba(255, 255, 255, 0.15)", - X14: ":alpha<0.5<@navBg", - X15: ":alpha<0<@panel", - X16: ":alpha<0.7<@panel", - X17: ":alpha<0.8<@bg", - cwBg: "#bcc0cc", - cwFg: "#5c5f77", - link: "#1e66f5", - warn: "#fe640b", - badge: "#1e66f5", - error: "#d20f39", - focus: ":alpha<0.3<@accent", - navBg: "@panel", - navFg: "@fg", - panel: ":lighten<3<@bg", - popup: ":lighten<3<@panel", - accent: "#8839ef", - header: ":alpha<0.7<@panel", - infoBg: "#ccd0da", - infoFg: "#6c6f85", - renote: "#1e66f5", - shadow: "rgba(0, 0, 0, 0.3)", - divider: "rgba(255, 255, 255, 0.1)", - hashtag: "#209fb5", - mention: "@accent", - modalBg: "rgba(0, 0, 0, 0.5)", - success: "#40a02b", - buttonBg: "rgba(255, 255, 255, 0.05)", - switchBg: "rgba(255, 255, 255, 0.15)", - acrylicBg: ":alpha<0.5<@bg", - cwHoverBg: "#acb0be", - indicator: "@accent", - mentionMe: "@mention", - messageBg: "@bg", - navActive: "@accent", - accentedBg: ":alpha<0.15<@accent", - codeNumber: "#40a02b", - codeString: "#fe640b", - fgOnAccent: "#eff1f5", - infoWarnBg: "#ccd0da", - infoWarnFg: "#5c5f77", - navHoverFg: ":lighten<17<@fg", - swutchOnBg: "@accentedBg", - swutchOnFg: "@accent", - codeBoolean: "@accent", - dateLabelFg: "@fg", - deckDivider: "#9ca0b0", - inputBorder: "rgba(255, 255, 255, 0.1)", - panelBorder: "solid 1px var(--divider)", - swutchOffBg: "rgba(255, 255, 255, 0.1)", - swutchOffFg: "@fg", - accentDarken: ":darken<10<@accent", - acrylicPanel: ":alpha<0.5<@panel", - navIndicator: "@indicator", - windowHeader: ":alpha<0.85<@panel", - accentLighten: ":lighten<10<@accent", - buttonHoverBg: "rgba(255, 255, 255, 0.1)", - driveFolderBg: ":alpha<0.3<@accent", - fgHighlighted: ":lighten<3<@fg", - fgTransparent: ":alpha<0.5<@fg", - panelHeaderBg: ":lighten<3<@panel", - panelHeaderFg: "@fg", - buttonGradateA: "@accent", - buttonGradateB: ":hue<20<@accent", - htmlThemeColor: "@bg", - panelHighlight: ":lighten<3<@panel", - listItemHoverBg: "rgba(255, 255, 255, 0.03)", - scrollbarHandle: "rgba(255, 255, 255, 0.2)", - inputBorderHover: "rgba(255, 255, 255, 0.2)", - wallpaperOverlay: "rgba(0, 0, 0, 0.5)", - fgTransparentWeak: ":alpha<0.75<@fg", - panelHeaderDivider: "rgba(0, 0, 0, 0)", - scrollbarHandleHover: "rgba(255, 255, 255, 0.4)", - }, - author: "somebody ¯_(ツ)_/¯", -} diff --git a/packages/client/src/themes/l-cherry.json5 b/packages/client/src/themes/l-cherry.json5 index 9aab308fcd..5ad240241e 100644 --- a/packages/client/src/themes/l-cherry.json5 +++ b/packages/client/src/themes/l-cherry.json5 @@ -1,7 +1,7 @@ { id: 'ac168876-f737-4074-a3fc-a370c732ef48', - name: 'Cherry Light', + name: 'Mi Cherry Light', author: 'syuilo', base: 'light', diff --git a/packages/client/src/themes/l-coffee.json5 b/packages/client/src/themes/l-coffee.json5 index 252b5989cb..fbcd4fa9ef 100644 --- a/packages/client/src/themes/l-coffee.json5 +++ b/packages/client/src/themes/l-coffee.json5 @@ -1,7 +1,7 @@ { id: '6ed80faa-74f0-42c2-98e4-a64d9e138eab', - name: 'Coffee Light', + name: 'Mi Coffee Light', author: 'syuilo', base: 'light', diff --git a/packages/client/src/themes/l-rainy.json5 b/packages/client/src/themes/l-rainy.json5 index a7b8718067..283dd74c6c 100644 --- a/packages/client/src/themes/l-rainy.json5 +++ b/packages/client/src/themes/l-rainy.json5 @@ -1,7 +1,7 @@ { id: 'a58a0abb-ff8c-476a-8dec-0ad7837e7e96', - name: 'Rainy Light', + name: 'Mi Rainy Light', author: 'syuilo', base: 'light', diff --git a/packages/client/src/themes/l-sushi.json5 b/packages/client/src/themes/l-sushi.json5 index d14f322931..5846927d65 100644 --- a/packages/client/src/themes/l-sushi.json5 +++ b/packages/client/src/themes/l-sushi.json5 @@ -1,7 +1,7 @@ { id: '213273e5-7d20-d5f0-6e36-1b6a4f67115c', - name: 'Sushi Light', + name: 'Mi Sushi Light', author: 'syuilo', base: 'light', diff --git a/packages/client/src/themes/l-u0.json5 b/packages/client/src/themes/l-u0.json5 index 1d89e0543c..03b114ba39 100644 --- a/packages/client/src/themes/l-u0.json5 +++ b/packages/client/src/themes/l-u0.json5 @@ -1,7 +1,7 @@ { id: 'e2c940b5-6e9a-4c03-b738-261c720c426d', base: 'light', - name: 'U0 Light', + name: 'Mi U0 Light', props: { X2: ':darken<2<@panel', X3: 'rgba(255, 255, 255, 0.05)', diff --git a/packages/client/src/themes/l-vivid.json5 b/packages/client/src/themes/l-vivid.json5 index cd35626a14..b3c08f38ae 100644 --- a/packages/client/src/themes/l-vivid.json5 +++ b/packages/client/src/themes/l-vivid.json5 @@ -1,7 +1,7 @@ { id: '6128c2a9-5c54-43fe-a47d-17942356470b', - name: 'Vivid Light', + name: 'Mi Vivid Light', author: 'syuilo', base: 'light', From 4999b4f1a63c924bc005c4a075262cac77571a8f Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 2 May 2023 15:14:44 -0700 Subject: [PATCH 17/30] add catppuccin latte --- .../src/themes/l-catppuccin-latte.json5 | 94 +++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 packages/client/src/themes/l-catppuccin-latte.json5 diff --git a/packages/client/src/themes/l-catppuccin-latte.json5 b/packages/client/src/themes/l-catppuccin-latte.json5 new file mode 100644 index 0000000000..085e66df65 --- /dev/null +++ b/packages/client/src/themes/l-catppuccin-latte.json5 @@ -0,0 +1,94 @@ +{ + id: "169661d2-5a17-4dfc-b71b-9938cbbbed3e", + base: "light", + name: "Catppuccin Latte", + props: { + X2: ":darken<2<@panel", + X3: "rgba(255, 255, 255, 0.05)", + X4: "rgba(255, 255, 255, 0.1)", + X5: "rgba(255, 255, 255, 0.05)", + X6: "rgba(255, 255, 255, 0.15)", + X7: "rgba(255, 255, 255, 0.05)", + X8: ":lighten<5<@accent", + X9: ":darken<5<@accent", + bg: "#dce0e8", + fg: "#4c4f69", + X10: ":alpha<0.4<@accent", + X11: "rgba(0, 0, 0, 0.3)", + X12: "rgba(255, 255, 255, 0.1)", + X13: "rgba(255, 255, 255, 0.15)", + X14: ":alpha<0.5<@navBg", + X15: ":alpha<0<@panel", + X16: ":alpha<0.7<@panel", + X17: ":alpha<0.8<@bg", + cwBg: "#bcc0cc", + cwFg: "#5c5f77", + link: "#1e66f5", + warn: "#fe640b", + badge: "#1e66f5", + error: "#d20f39", + focus: ":alpha<0.3<@accent", + navBg: "@panel", + navFg: "@fg", + panel: ":lighten<3<@bg", + popup: ":lighten<3<@panel", + accent: "#8839ef", + header: ":alpha<0.7<@panel", + infoBg: "#ccd0da", + infoFg: "#6c6f85", + renote: "#1e66f5", + shadow: "rgba(0, 0, 0, 0.3)", + divider: "rgba(255, 255, 255, 0.1)", + hashtag: "#209fb5", + mention: "@accent", + modalBg: "rgba(0, 0, 0, 0.5)", + success: "#40a02b", + buttonBg: "rgba(255, 255, 255, 0.05)", + switchBg: "rgba(255, 255, 255, 0.15)", + acrylicBg: ":alpha<0.5<@bg", + cwHoverBg: "#acb0be", + indicator: "@accent", + mentionMe: "@mention", + messageBg: "@bg", + navActive: "@accent", + accentedBg: ":alpha<0.15<@accent", + codeNumber: "#40a02b", + codeString: "#fe640b", + fgOnAccent: "#eff1f5", + infoWarnBg: "#ccd0da", + infoWarnFg: "#5c5f77", + navHoverFg: ":lighten<17<@fg", + swutchOnBg: "@accentedBg", + swutchOnFg: "@accent", + codeBoolean: "@accent", + dateLabelFg: "@fg", + deckDivider: "#9ca0b0", + inputBorder: "rgba(255, 255, 255, 0.1)", + panelBorder: "solid 1px var(--divider)", + swutchOffBg: "rgba(255, 255, 255, 0.1)", + swutchOffFg: "@fg", + accentDarken: ":darken<10<@accent", + acrylicPanel: ":alpha<0.5<@panel", + navIndicator: "@indicator", + windowHeader: ":alpha<0.85<@panel", + accentLighten: ":lighten<10<@accent", + buttonHoverBg: "rgba(255, 255, 255, 0.1)", + driveFolderBg: ":alpha<0.3<@accent", + fgHighlighted: ":lighten<3<@fg", + fgTransparent: ":alpha<0.5<@fg", + panelHeaderBg: ":lighten<3<@panel", + panelHeaderFg: "@fg", + buttonGradateA: "@accent", + buttonGradateB: ":hue<20<@accent", + htmlThemeColor: "@bg", + panelHighlight: ":lighten<3<@panel", + listItemHoverBg: "rgba(255, 255, 255, 0.03)", + scrollbarHandle: "rgba(255, 255, 255, 0.2)", + inputBorderHover: "rgba(255, 255, 255, 0.2)", + wallpaperOverlay: "rgba(0, 0, 0, 0.5)", + fgTransparentWeak: ":alpha<0.75<@fg", + panelHeaderDivider: "rgba(0, 0, 0, 0)", + scrollbarHandleHover: "rgba(255, 255, 255, 0.4)", + }, + author: "somebody ¯_(ツ)_/¯", +} From 89325cacaf0a1116e53f73ead9792c8c4adc6685 Mon Sep 17 00:00:00 2001 From: Namekuji Date: Tue, 2 May 2023 19:53:57 -0400 Subject: [PATCH 18/30] add migration patches and fix commands --- docs/migrate.md | 41 ++++++++++--- docs/mkv13_restore.patch | 127 +++++++++++++++++++++++++++++++++++++++ docs/renote_muting.patch | 23 +++++++ 3 files changed, 181 insertions(+), 10 deletions(-) create mode 100644 docs/mkv13_restore.patch create mode 100644 docs/renote_muting.patch diff --git a/docs/migrate.md b/docs/migrate.md index 07a5fea07f..152a37a7ce 100644 --- a/docs/migrate.md +++ b/docs/migrate.md @@ -1,27 +1,44 @@ # 🚚 Migrating from Misskey to Calckey +The following process may not work depending on your environment and version of Misskey. + +**Make sure you** +- **stopped all master and worker processes of Misskey.** +- **have backups of the database before performing any commands.** + ## Misskey v13 and above +Tested with Misskey v13.11.3. + +If your Misskey v13 is older, we recommend updating your Misskey to v13.11.3. + ```sh wget -O mkv13.patch https://codeberg.org/calckey/calckey/raw/branch/develop/docs/mkv13.patch -git apply mkv13.patch +wget -O mkv13_restore.patch https://codeberg.org/calckey/calckey/raw/branch/develop/docs/mkv13_restore.patch +git apply mkv13.patch mkv13_restore.patch cd packages/backend -LINE_NUM="$(npx typeorm migration:show -d ormconfig.js | grep -n activeEmailValidation1657346559800 | cut -d ':' -f 1)" -NUM_MIGRATIONS="$(npx typeorm migration:show -d ormconfig.js | tail -n+"$LINE_NUM" | grep '\[X\]' | nl)" +LINE_NUM="$(pnpm typeorm migration:show -d ormconfig.js | grep -n activeEmailValidation1657346559800 | cut -d ':' -f 1)" +NUM_MIGRATIONS="$(pnpm typeorm migration:show -d ormconfig.js | tail -n+"$LINE_NUM" | grep '\[X\]' | wc -l)" -for i in $(seq 1 $NUM_MIGRAIONS); do - npx typeorm migration:revert -d ormconfig.js -done +for i in $(seq 1 $NUM_MIGRATIONS); do pnpm typeorm migration:revert -d ormconfig.js; done + +cd ../../ git remote set-url origin https://codeberg.org/calckey/calckey.git -git fetch -git checkout main # or beta or develop +git fetch origin +git stash push +rm -rf fluent-emojis misskey-assets +git switch main # or beta or develop git pull --ff +wget -O renote_muting.patch https://codeberg.org/calckey/calckey/raw/branch/develop/docs/renote_muting.patch +git apply renote_muting.patch -NODE_ENV=production pnpm run migrate -# build using prefered method +pnpm install +NODE_ENV=production pnpm run build +pnpm run migrate +git stash push ``` Depending on the version you're migrating from, you may have to open Postgres with `psql -d your_database` and run the following commands: @@ -44,6 +61,10 @@ ALTER TABLE "instance" ADD COLUMN "lastCommunicatedAt" date; then quit with `\q`, and restart Calckey. +Note: Ignore errors of `column "xxx" of relation "xxx" already exists`. + +If no other errors happened, your Calckey is ready to launch! + ## Misskey v12.119 and before ```sh diff --git a/docs/mkv13_restore.patch b/docs/mkv13_restore.patch new file mode 100644 index 0000000000..9ef9934edc --- /dev/null +++ b/docs/mkv13_restore.patch @@ -0,0 +1,127 @@ +diff --git a/packages/backend/migration/1680491187535-cleanup.js b/packages/backend/migration/1680491187535-cleanup.js +index 1e609ca06..0e6accf3e 100644 +--- a/packages/backend/migration/1680491187535-cleanup.js ++++ b/packages/backend/migration/1680491187535-cleanup.js +@@ -1,10 +1,40 @@ + export class cleanup1680491187535 { +- name = 'cleanup1680491187535' ++ name = "cleanup1680491187535"; + +- async up(queryRunner) { +- await queryRunner.query(`DROP TABLE "antenna_note" `); +- } ++ async up(queryRunner) { ++ await queryRunner.query(`DROP TABLE "antenna_note" `); ++ } + +- async down(queryRunner) { +- } ++ async down(queryRunner) { ++ await queryRunner.query( ++ `CREATE TABLE antenna_note ( id character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, "antennaId" character varying(32) NOT NULL, read boolean DEFAULT false NOT NULL)`, ++ ); ++ await queryRunner.query( ++ `COMMENT ON COLUMN antenna_note."noteId" IS 'The note ID.'`, ++ ); ++ await queryRunner.query( ++ `COMMENT ON COLUMN antenna_note."antennaId" IS 'The antenna ID.'`, ++ ); ++ await queryRunner.query( ++ `ALTER TABLE ONLY antenna_note ADD CONSTRAINT "PK_fb28d94d0989a3872df19fd6ef8" PRIMARY KEY (id)`, ++ ); ++ await queryRunner.query( ++ `CREATE INDEX "IDX_0d775946662d2575dfd2068a5f" ON antenna_note USING btree ("antennaId")`, ++ ); ++ await queryRunner.query( ++ `CREATE UNIQUE INDEX "IDX_335a0bf3f904406f9ef3dd51c2" ON antenna_note USING btree ("noteId", "antennaId")`, ++ ); ++ await queryRunner.query( ++ `CREATE INDEX "IDX_9937ea48d7ae97ffb4f3f063a4" ON antenna_note USING btree (read)`, ++ ); ++ await queryRunner.query( ++ `CREATE INDEX "IDX_bd0397be22147e17210940e125" ON antenna_note USING btree ("noteId")`, ++ ); ++ await queryRunner.query( ++ `ALTER TABLE ONLY antenna_note ADD CONSTRAINT "FK_0d775946662d2575dfd2068a5f5" FOREIGN KEY ("antennaId") REFERENCES antenna(id) ON DELETE CASCADE`, ++ ); ++ await queryRunner.query( ++ `ALTER TABLE ONLY antenna_note ADD CONSTRAINT "FK_bd0397be22147e17210940e125b" FOREIGN KEY ("noteId") REFERENCES note(id) ON DELETE CASCADE`, ++ ); ++ } + } +diff --git a/packages/backend/migration/1680582195041-cleanup.js b/packages/backend/migration/1680582195041-cleanup.js +index c587e456a..a91d6ff3c 100644 +--- a/packages/backend/migration/1680582195041-cleanup.js ++++ b/packages/backend/migration/1680582195041-cleanup.js +@@ -1,11 +1,64 @@ + export class cleanup1680582195041 { +- name = 'cleanup1680582195041' ++ name = "cleanup1680582195041"; + +- async up(queryRunner) { +- await queryRunner.query(`DROP TABLE "notification" `); +- } ++ async up(queryRunner) { ++ await queryRunner.query(`DROP TABLE "notification"`); ++ } + +- async down(queryRunner) { +- +- } ++ async down(queryRunner) { ++ await queryRunner.query( ++ `CREATE TABLE notification ( id character varying(32) NOT NULL, "createdAt" timestamp with time zone NOT NULL, "notifieeId" character varying(32) NOT NULL, "notifierId" character varying(32), "isRead" boolean DEFAULT false NOT NULL, "noteId" character varying(32), reaction character varying(128), choice integer, "followRequestId" character varying(32), type notification_type_enum NOT NULL, "customBody" character varying(2048), "customHeader" character varying(256), "customIcon" character varying(1024), "appAccessTokenId" character varying(32), achievement character varying(128))`, ++ ); ++ await queryRunner.query( ++ `COMMENT ON COLUMN notification."createdAt" IS 'The created date of the Notification.'`, ++ ); ++ await queryRunner.query( ++ `COMMENT ON COLUMN notification."notifieeId" IS 'The ID of recipient user of the Notification.'`, ++ ); ++ await queryRunner.query( ++ `COMMENT ON COLUMN notification."notifierId" IS 'The ID of sender user of the Notification.'`, ++ ); ++ await queryRunner.query( ++ `COMMENT ON COLUMN notification."isRead" IS 'Whether the Notification is read.'`, ++ ); ++ await queryRunner.query( ++ `COMMENT ON COLUMN notification.type IS 'The type of the Notification.'`, ++ ); ++ await queryRunner.query( ++ `ALTER TABLE ONLY notification ADD CONSTRAINT "PK_705b6c7cdf9b2c2ff7ac7872cb7" PRIMARY KEY (id)`, ++ ); ++ await queryRunner.query( ++ `CREATE INDEX "IDX_080ab397c379af09b9d2169e5b" ON notification USING btree ("isRead")`, ++ ); ++ await queryRunner.query( ++ `CREATE INDEX "IDX_33f33cc8ef29d805a97ff4628b" ON notification USING btree (type)`, ++ ); ++ await queryRunner.query( ++ `CREATE INDEX "IDX_3b4e96eec8d36a8bbb9d02aa71" ON notification USING btree ("notifierId")`, ++ ); ++ await queryRunner.query( ++ `CREATE INDEX "IDX_3c601b70a1066d2c8b517094cb" ON notification USING btree ("notifieeId")`, ++ ); ++ await queryRunner.query( ++ `CREATE INDEX "IDX_b11a5e627c41d4dc3170f1d370" ON notification USING btree ("createdAt")`, ++ ); ++ await queryRunner.query( ++ `CREATE INDEX "IDX_e22bf6bda77b6adc1fd9e75c8c" ON notification USING btree ("appAccessTokenId")`, ++ ); ++ await queryRunner.query( ++ `ALTER TABLE ONLY notification ADD CONSTRAINT "FK_3b4e96eec8d36a8bbb9d02aa710" FOREIGN KEY ("notifierId") REFERENCES "user"(id) ON DELETE CASCADE`, ++ ); ++ await queryRunner.query( ++ `ALTER TABLE ONLY notification ADD CONSTRAINT "FK_3c601b70a1066d2c8b517094cb9" FOREIGN KEY ("notifieeId") REFERENCES "user"(id) ON DELETE CASCADE`, ++ ); ++ await queryRunner.query( ++ `ALTER TABLE ONLY notification ADD CONSTRAINT "FK_769cb6b73a1efe22ddf733ac453" FOREIGN KEY ("noteId") REFERENCES note(id) ON DELETE CASCADE`, ++ ); ++ await queryRunner.query( ++ `ALTER TABLE ONLY notification ADD CONSTRAINT "FK_bd7fab507621e635b32cd31892c" FOREIGN KEY ("followRequestId") REFERENCES follow_request(id) ON DELETE CASCADE`, ++ ); ++ await queryRunner.query( ++ `ALTER TABLE ONLY notification ADD CONSTRAINT "FK_e22bf6bda77b6adc1fd9e75c8c9" FOREIGN KEY ("appAccessTokenId") REFERENCES access_token(id) ON DELETE CASCADE`, ++ ); ++ } + } diff --git a/docs/renote_muting.patch b/docs/renote_muting.patch new file mode 100644 index 0000000000..c5bd2818c6 --- /dev/null +++ b/docs/renote_muting.patch @@ -0,0 +1,23 @@ +diff --git a/packages/backend/migration/1665091090561-add-renote-muting.js b/packages/backend/migration/1665091090561-add-renote-muting.js +index 2c76aaff5..f8541c818 100644 +--- a/packages/backend/migration/1665091090561-add-renote-muting.js ++++ b/packages/backend/migration/1665091090561-add-renote-muting.js +@@ -4,18 +4,6 @@ export class addRenoteMuting1665091090561 { + } + + async up(queryRunner) { +- await queryRunner.query( +- `CREATE TABLE "renote_muting" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "muteeId" character varying(32) NOT NULL, "muterId" character varying(32) NOT NULL, CONSTRAINT "PK_renoteMuting_id" PRIMARY KEY ("id"))`, +- ); +- await queryRunner.query( +- `CREATE INDEX "IDX_renote_muting_createdAt" ON "muting" ("createdAt") `, +- ); +- await queryRunner.query( +- `CREATE INDEX "IDX_renote_muting_muteeId" ON "muting" ("muteeId") `, +- ); +- await queryRunner.query( +- `CREATE INDEX "IDX_renote_muting_muterId" ON "muting" ("muterId") `, +- ); + } + + async down(queryRunner) {} From a5581ad272bcf4247f8a58257964c7220152ffcb Mon Sep 17 00:00:00 2001 From: Namekuji Date: Tue, 2 May 2023 20:45:20 -0400 Subject: [PATCH 19/30] fix typo --- docs/migrate.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/migrate.md b/docs/migrate.md index 152a37a7ce..7e9653e70f 100644 --- a/docs/migrate.md +++ b/docs/migrate.md @@ -1,6 +1,6 @@ # 🚚 Migrating from Misskey to Calckey -The following process may not work depending on your environment and version of Misskey. +The following procedure may not work depending on your environment and version of Misskey. **Make sure you** - **stopped all master and worker processes of Misskey.** From 16f3a6716006f8055d9153418efaf4d81d02fc28 Mon Sep 17 00:00:00 2001 From: Jeff Date: Wed, 3 May 2023 00:36:21 +0000 Subject: [PATCH 20/30] chore: Translated using Weblate (English) Currently translated at 100.0% (1742 of 1742 strings) Translation: Calckey/locales Translate-URL: https://hosted.weblate.org/projects/calckey/locales/en/ --- locales/en-US.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index 1228da8fd6..24f3b7552c 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -71,8 +71,8 @@ import: "Import" export: "Export" files: "Files" download: "Download" -driveFileDeleteConfirm: "Are you sure you want to delete the file \"{name}\"? It\ - \ will be removed from all posts that contain it as an attachment." +driveFileDeleteConfirm: "Are you sure you want to delete the file \"{name}\"? It will\ + \ be removed from all posts that contain it as an attachment." unfollowConfirm: "Are you sure that you want to unfollow {name}?" exportRequested: "You've requested an export. This may take a while. It will be added\ \ to your Drive once completed." @@ -224,7 +224,9 @@ blockedInstancesDescription: "List the hostnames of the instances that you want \ block. Listed instances will no longer be able to communicate with this instance." silencedInstances: "Silenced Instances" silencedInstancesDescription: "List the hostnames of the instances that you want to\ - \ silence. Accounts in the listed instances are treated as \"Silenced\", can only make follow requests, and cannot mention local accounts if not followed. This will not affect the blocked instances." + \ silence. Accounts in the listed instances are treated as \"Silenced\", can only\ + \ make follow requests, and cannot mention local accounts if not followed. This\ + \ will not affect the blocked instances." hiddenTags: "Hidden Hashtags" hiddenTagsDescription: "List the hashtags (without the #) of the hashtags you wish\ \ to hide from trending and explore. Hidden hashtags are still discoverable via\ @@ -1405,12 +1407,12 @@ _tutorial: step2_1: "First, please fill out your profile." step2_2: "Providing some information about who you are will make it easier for others\ \ to tell if they want to see your posts or follow you." - step3_1: "Now time to follow some people!" + step3_1: "Now it's time to follow some people!" step3_2: "Your home and social timelines are based off of who you follow, so try\ \ following a couple accounts to get started.\nClick the plus circle on the top\ \ right of a profile to follow them." step4_1: "Let's get you out there." - step4_2: "For your first post, some people like to made a {introduction} post or\ + step4_2: "For your first post, some people like to make an {introduction} post or\ \ a simple \"Hello world!\"" step5_1: "Timelines, timelines everywhere!" step5_2: "Your instance has {timelines} different timelines enabled." From 792ccafb6398f0f9794b78497037e9264bb5c1c6 Mon Sep 17 00:00:00 2001 From: jolupa Date: Tue, 2 May 2023 17:11:59 +0000 Subject: [PATCH 21/30] chore: Translated using Weblate (Catalan) Currently translated at 100.0% (1742 of 1742 strings) Translation: Calckey/locales Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/ --- locales/ca-ES.yml | 137 +++++++++++++++++++++++----------------------- 1 file changed, 70 insertions(+), 67 deletions(-) diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml index a5e8cd859f..06a80c9231 100644 --- a/locales/ca-ES.yml +++ b/locales/ca-ES.yml @@ -119,14 +119,14 @@ reactionSettingDescription2: "Arrossega per reordenar, fes clic per suprimir, pr rememberNoteVisibility: "Recorda la configuració de visibilitat de les notes" attachCancel: "Eliminar el fitxer adjunt" markAsSensitive: "Marcar com a NSFW" -unmarkAsSensitive: "Deixar de marcar com a NSFW" +unmarkAsSensitive: "Desmarcar com a NSFW" enterFileName: "Introdueix un nom de fitxer" mute: "Silencia" unmute: "Deixa de silenciar" block: "Bloqueja" unblock: "Desbloqueja" suspend: "Suspèn" -unsuspend: "Deixa de suspendre" +unsuspend: "Treu la suspensió" instances: "Instàncies" remove: "Eliminar" nsfw: "NSFW" @@ -134,7 +134,7 @@ pinnedNotes: "Publicació fixada" userList: "Llistes" smtpUser: "Nom d'usuari" smtpPass: "Contrasenya" -user: "Usuaris" +user: "Usuari" searchByGoogle: "Cercar" file: "Fitxers" _email: @@ -151,10 +151,9 @@ _mfm: intro: MFM és un llenguatge de marques utilitzat a Misskey, Calckey, Akkoma i més que es pot utilitzar en molts llocs. Aquí podeu veure una llista de tota la sintaxi MFM disponible. - hashtagDescription: Podeu especificar un hashtag mitjançant un signe de coixinet - i un text. + hashtagDescription: Podeu especificar una etiqueta mitjançant un coixinet i un text. url: URL - urlDescription: Es poden mostrar URL. + urlDescription: Es poden mostrar URLS. link: Enllaç linkDescription: Parts específiques del text es poden mostrar com a URL. bold: Negreta @@ -299,7 +298,7 @@ _theme: lighten: Clar install: Instal·lar un tema _sfx: - note: "Posts" + note: "Nota nova" notification: "Notificacions" antenna: Antenes channel: Notificacions del canal @@ -766,7 +765,7 @@ general: General autoAcceptFollowed: Aprova automàticament les peticions de seguiment d'usuaris que segueixes accountMoved: "L'usuari s'ha mogut a un compte nou:" -addAccount: Afegir compte +addAccount: Afegir un compte loginFailed: No s'ha pogut iniciar sessió showOnRemote: Veure a l'instància remota wallpaper: Fons de pantalla @@ -857,14 +856,14 @@ agreeTo: Estic d'acord amb {0} activity: Activitat home: Inici remoteUserCaution: L'informació d'usuaris remots pot estar incompleta. -themeForDarkMode: En Mode Fosc fes servir el tema +themeForDarkMode: Tema a fer servir en mode fosc light: Clar registeredDate: Data de registre dark: Fosc lightThemes: Temes clars location: Lloc theme: Temes -themeForLightMode: En Mode Clar fes servir el tema +themeForLightMode: Tema a fer servir en mode clar drive: Disc selectFile: Tria un fitxer selectFiles: Tria fitxers @@ -1001,7 +1000,7 @@ pages: Pàgines disconnectService: Desconnectar connectService: Connectar enableLocalTimeline: Activa la línea de temps local -enableRecommendedTimeline: Activa la línea de temps de recomanats +enableRecommendedTimeline: Activa la línea de temps de recomanacions pinnedClipId: ID del clip que vols fixar hcaptcha: hCaptcha manageAntennas: Gestiona les Antenes @@ -1032,7 +1031,7 @@ notFoundDescription: No es pot trobar cap pàgina que correspongui a aquesta adr uploadFolder: Carpeta per defecte per pujar arxius cacheClear: Netejar la memòria cau markAsReadAllNotifications: Marca totes les notificacions com llegides -markAsReadAllUnreadNotes: Marca totes les publicacions com a llegides +markAsReadAllUnreadNotes: Marca totes les notes com a llegides markAsReadAllTalkMessages: Marca tots els missatges com llegits help: Ajuda inputMessageHere: Escriu aquí el missatge @@ -1051,7 +1050,7 @@ text: Text enable: Activar next: Següent retype: Torna a entrar -noteOf: Publicat per {user} +noteOf: Nota de {user} inviteToGroup: Invitar a un grup quoteAttached: Cita quoteQuestion: Adjuntar com a cita? @@ -1076,7 +1075,7 @@ groupInvited: T'han invitat a un grup aboutX: Sobre {x} youHaveNoGroups: No tens grups disableDrawer: No facis servir els menús amb estil de calaix -noHistory: No ha historial disponible +noHistory: No hi ha historial disponible signinHistory: Historial d'inicis de sessió disableAnimatedMfm: Desactiva les animacions amb MFM doing: Processant... @@ -1101,8 +1100,8 @@ promotion: Promogut promote: Promoure numberOfDays: Nombre de dies objectStorageBaseUrl: Adreça URL base -hideThisNote: Amaga aquest article -showFeaturedNotesInTimeline: Mostra els articles destacats a la línea de temps +hideThisNote: Amaga aquesta nota +showFeaturedNotesInTimeline: Mostra les notes destacades a les líneas de temps objectStorage: Emmagatzematge d'objectes useObjectStorage: Fes servir l'emmagatzema d'objectes expandTweet: Amplia el tuit @@ -1112,7 +1111,7 @@ leaveConfirm: Hi han canvis que no s'han desat. Els vols descartar? manage: Administració plugins: Afegits preferencesBackups: Preferències de còpies de seguretat -undeck: Treure el Deck +undeck: Treure el Taulell useBlurEffectForModal: Fes servir efectes de difuminació en les finestres modals useFullReactionPicker: Fes servir el selector de reaccions a tamany complert deck: Taulell @@ -1172,14 +1171,14 @@ large: Gran notificationSetting: Preferències de notificacions makeActive: Activar notificationSettingDesc: Tria el tipus de notificació que es veure. -notifyAntenna: Notificar noves articles -withFileAntenna: Només articles amb fitxers +notifyAntenna: Notificar noves notes +withFileAntenna: Només notes amb fitxers enableServiceworker: Activa les notificacions push per al teu navegador antennaUsersDescription: Escriu un nom d'usuari per línea antennaInstancesDescription: Escriu la adreça d'una instància per línea tags: Etiquetes antennaSource: Font de la antena -antennaKeywords: Paraules claus a escolta +antennaKeywords: Paraules claus a escoltar antennaExcludeKeywords: Paraules clau a excluir antennaKeywordsDescription: Separades amb espais per fer una condició AND i amb una línea nova per fer una condició OR. @@ -1198,8 +1197,8 @@ tapSecurityKey: Escriu la teva clau de seguretat nUsersMentioned: Esmentat per {n} usuari(s) securityKey: Clau de seguretat resetPassword: Restablir contrasenya -describeFile: Afegeix un subtítol -enterFileDescription: Entra un subtítol +describeFile: Afegeix una descripció +enterFileDescription: Entra una descripció author: Autor disableAll: Desactiva tots userSaysSomethingReason: '{name} va dir {reason}' @@ -1219,7 +1218,7 @@ inboxUrl: Adreça de la safata d'entrada addedRelays: Relés afegits serviceworkerInfo: Ha de estar activat per les notificacions push. poll: Enquesta -deletedNote: Article eliminat +deletedNote: Nota esborrada disablePlayer: Tancar el reproductor de vídeo fileIdOrUrl: ID o adreça URL del fitxer behavior: Comportament @@ -1227,7 +1226,7 @@ regenerateLoginTokenDescription: Regenera el token que es fa servir de manera in durant l'inici de sessió. Normalment això no és necessari. Si es torna a genera el token, es tancarà la sessió a tots els dispositius. setMultipleBySeparatingWithSpace: Separa diferents entrades amb espais. -reportAbuseOf: Informa sobre {name} +reportAbuseOf: Informa d'un abús de {name} sample: Exemple abuseReports: Informes reportAbuse: Informe @@ -1241,13 +1240,13 @@ abuseMarkAsResolved: Marcar l'informe com a resolt visibility: Visibilitat useCw: Amaga el contingut enablePlayer: Obre el reproductor de vídeo -yourAccountSuspendedDescription: Aquest compte ha sigut suspesa per no seguir els - termes de servei del servidor o quelcom similar. Contacte amb l'administrador si - vols conèixer la raó amb més detall. Si us plau no facis un compte nou. -invisibleNote: Article ocult +yourAccountSuspendedDescription: Aquest compte ha sigut suspès per no seguir els termes + de servei d'aquest servidor o quelcom similar. Contacte amb l'administrador si vols + conèixer la raó amb més detall. Si us plau no facis un compte nou. +invisibleNote: Nota oculta enableInfiniteScroll: Carregar més de forma automàtica fillAbuseReportDescription: Si us plau omple els detalls sobre aquest informe. Si - es sobre un article en concret, si us plau inclou l'adreça URL. + es sobre una nota en concret, si us plau, inclou l'adreça URL. forwardReportIsAnonymous: Com a informador a l'instància remota no es mostrarà el teu compte, si no un compte anònim. openInNewTab: Obrir en una pestanya nova @@ -1264,7 +1263,7 @@ switchUi: Interfície d'usuari createNewClip: Crear un clip nou unclip: Treure clip public: Públic -renotesCount: Nombre de re-notes fetes +renotesCount: Nombre de impulsos fets sentReactionsCount: Nombre de reaccions fetes receivedReactionsCount: Nombre de reaccions rebudes pollVotesCount: Nombre de vots fets en enquestes @@ -1276,14 +1275,14 @@ driveUsage: Espai fet servir al Disk noCrawleDescription: No permetre que els buscadors guardin la informació de les pàgines de perfil, notes, Pàgines, etc. alwaysMarkSensitive: Marcar per defecte com a NSFW -lockedAccountInfo: Només si has configurat la visibilitat del compte per "Només seguidors" - les teves notes no serem visibles per a ningú, inclús si has d'aprovar els teus - seguiments manualment. +lockedAccountInfo: Si has configurat la visibilitat del compte per "Només seguidors" + les teves notes no seren visibles per a ningú més, inclús si has d'aprovar els teus + seguidors manualment. disableShowingAnimatedImages: No reproduir les imatges animades verificationEmailSent: S'ha enviat correu electrònic de verificació. Si us plau segueix les instruccions per completar la verificació. notSet: Sense especificar -emailVerified: Correu electrònic enviat +emailVerified: El correu electrònic s'ha verificat loadRawImages: Carregar les imatges originals en comptes de mostrar les miniatures noteFavoritesCount: Nombre de notes afegides a favorits useSystemFont: Fes servir la font per defecte del sistema @@ -1325,7 +1324,7 @@ breakFollow: Suprimeix el seguidor makeReactionsPublicDescription: Això farà que la llista de totes les vostres reaccions passades sigui visible públicament. hide: Amagar -leaveGroupConfirm: Estàs segur que vols deixar "{nom}"? +leaveGroupConfirm: Estàs segur que vols deixar "{name}"? voteConfirm: Vols confirmar el teu vot per a "{choice}"? leaveGroup: Sortir del grup rateLimitExceeded: S'ha excedit el límit proporcionat @@ -1452,7 +1451,7 @@ _registry: silenced: Silenciat objectStorageUseSSL: Fes servir SSL yourAccountSuspendedTitle: Aquest compte està suspès -i18nInfo: Calckey està sent traduïts a diversos idiomes per voluntaris. Pots ajudar +i18nInfo: Calckey està sent traduït a diversos idiomes per voluntaris. Pots ajudar {link}. manageAccessTokens: Administrar tokens d'accés accountInfo: Informació del compte @@ -1496,15 +1495,15 @@ shareWithNote: Comparteix amb una nota expiration: Data límit memo: Memo priority: Prioritat -high: Alt +high: Alta middle: Mitjana low: Baixa emailNotConfiguredWarning: L'adreça de correu electrònic no està definida. instanceSecurity: Seguretat de la instància privateMode: Mode Privat allowedInstances: Instàncies a la llista blanca -allowedInstancesDescription: Amfitrions d'instàncies a la llista blanca per a la federació, - cadascuna separat per una línia nova (només s'aplica en mode privat). +allowedInstancesDescription: Llista blanca de Hosts amb qui federar, cadascún separat + per una línia nova (només s'aplica en mode privat). previewNoteText: Mostra la vista prèvia customCss: CSS personalitzat recommended: Recomanat @@ -1548,8 +1547,8 @@ remoteOnly: Només remotes failedToUpload: S'ha produït un error en la càrrega cannotUploadBecauseInappropriate: Aquest fitxer no s'ha pogut carregar perquè s'han detectat parts d'aquest com a potencialment NSFW. -cannotUploadBecauseNoFreeSpace: La pujada ha fallat a causa de la manca de capacitat - del Disc. +cannotUploadBecauseNoFreeSpace: La pujada ha fallat a causa de la manca d'espai al + Disc. enableAutoSensitive: Marcatge automàtic NSFW moveTo: Mou el compte actual al compte nou customKaTeXMacro: Macros KaTeX personalitzats @@ -1573,7 +1572,7 @@ desktop: Escritori notesCount: Nombre de notes confirmToUnclipAlreadyClippedNote: Aquesta nota ja és al clip "{name}". Vols treure'l d'aquest clip? -driveFilesCount: Nombre de fitxers el Disk +driveFilesCount: Nombre de fitxers al Disk silencedInstances: Instàncies silenciades silenceThisInstance: Silencia la instància silencedInstancesDescription: Llista amb els noms de les instàncies que vols silenciar. @@ -1585,7 +1584,7 @@ objectStorageEndpointDesc: Deixa això buit si fas servir AWS, S3, d'una altre m que facis servir. objectStorageRegionDesc: Especifica una regió com a 'xx-east-1'. Si el teu proveïdor no distingeix entre regions, deixa això en buit o pots escriure 'us-east-1'. -userPagePinTip: Pots mostrar notes aquí escollint "Pin al perfil" dintre del menú +userPagePinTip: Pots mostrar notes aquí escollint "Fixar al perfil" dintre del menú de cada nota. userInfo: Informació d'usuari hideOnlineStatusDescription: Amagant el teu estat en línea redueix la comoditat d'ús @@ -1597,10 +1596,10 @@ secureMode: Mode segur (Recuperació Autoritzada) customCssWarn: Aquesta configuració només s'ha d'utilitzar si sabeu què fa. La introducció de valors indeguts pot provocar que el client deixi de funcionar amb normalitat. squareAvatars: Mostra avatars quadrats -secureModeInfo: Quan sol·liciteu des d'altres instàncies, no envieu de tornada sense - prova. +secureModeInfo: Quan es faci una solicitut d'altres instàncies no contestar sense + una prova. privateModeInfo: Quan està activat, només les instàncies de la llista blanca es poden - federar amb les vostres instàncies. Totes les publicacions s'amagaran al públic. + federar amb les vostres instàncies. Totes les notes s'amagaran al públic. useBlurEffect: Utilitzeu efectes de desenfocament a la interfície d'usuari accountDeletionInProgress: La supressió del compte està en curs unmuteThread: Desfés el silenci al fil @@ -1631,7 +1630,8 @@ none: Res showInPage: Mostrar a la página popout: Apareixa volume: Volum -objectStorageUseSSLDesc: Desactiva això si no fas servir HTTP per les connexions API +objectStorageUseSSLDesc: Desactiva això si no fas servir HTTPS per les connexions + API objectStorageUseProxy: Conectarse mitjançant un Proxy objectStorageUseProxyDesc: Desactiva això si no faràs servir un servidor Proxy per conexions API @@ -1666,12 +1666,12 @@ disablePagesScript: Desactivar AiScript a les pàgines updateRemoteUser: Actualitzar la informació de l'usuari remot deleteAllFiles: Esborrar tots els fitxers deleteAllFilesConfirm: Segur que vols esborrar tots els fitxers? -removeAllFollowing: Deixar de seguir a tots els usuaris +removeAllFollowing: Deixar de seguir a tots els que segueixis accentColor: Color principal textColor: Color del text value: Valor -sendErrorReportsDescription: "Quant està activat, es compartirà amb els desenvolupadors\ - \ de Calckey quant aparegui un problema quan ajudarà a millorar la qualitat.\nAixò\ +sendErrorReportsDescription: "Quant està activat quant aparegui un error, es compartirà\ + \ amb els desenvolupadors de Calckey, que ajudarà a millorar la qualitat.\nAixò\ \ inclourà informació com la versió del teu sistema operatiu, el navegador que estiguis\ \ fent servir, la teva activitat a Calckey, etc." myTheme: El meu tema @@ -1679,7 +1679,7 @@ backgroundColor: Color de fons saveAs: Desa com... advanced: Avançat invalidValue: Valor invàlid. -createdAt: Dada de creació +createdAt: Data de creació updatedAt: Data d'actualització saveConfirm: Desa canvis? deleteConfirm: De veritat ho vols esborrar? @@ -1713,15 +1713,15 @@ sendPushNotificationReadMessageCaption: Es mostrarà una notificació amb el tex showAds: Mostrar anuncis enterSendsMessage: Pren retorn al formulari del missatge per enviar (quant no s'activa es Ctrl + Return) -customMOTD: MOTD personalitzat (missatges de la pantalla d'inici) -customMOTDDescription: Missatges personalitzats per al MOTD (pantalla de presentació) - separats per salts de línia es mostraran aleatòriament cada vegada que un usuari +customMOTD: MOTD personalitzat (missatges de la pantalla de benvinguda) +customMOTDDescription: Missatges personalitzats per al MOTD (pantalla de benvinguda) + separats per salts de línia, es mostraran aleatòriament cada vegada que un usuari carrega/recarrega la pàgina. -customSplashIcons: Icones personalitzades de la pantalla d'inici (urls) -customSplashIconsDescription: La URL de les icones de pantalla de presentació personalitzades - separades per salts de línia es mostraran aleatòriament cada vegada que un usuari - carrega/recarrega la pàgina. Si us plau, assegureu-vos que les imatges estiguin - en una URL estàtica, preferiblement totes a la mida de 192 x 192. +customSplashIcons: Icones personalitzades de la pantalla de benvinguda (urls) +customSplashIconsDescription: Les URLS de les icones personalitzades a la pantalla + de benvinguda separades per salts de línia. Es mostraran aleatòriament cada vegada + que un usuari carrega/recarrega la pàgina. Si us plau, assegureu-vos que les imatges + estiguin en una URL estàtica, preferiblement amb imatges amb la de 192 x 192. moveFrom: Mou a aquest compte des d'un compte anterior moveFromLabel: 'Compte des del qual us moveu:' migrationConfirm: "Esteu absolutament segur que voleu migrar el vostre compte a {account}?\ @@ -1751,7 +1751,7 @@ showingPastTimeline: Ara es mostra un línea de temps antiga clear: Tornar markAllAsRead: Marcar tot com a llegit recentPosts: Pàgines recents -noMaintainerInformationWarning: La informació del responsable no està configurada. +noMaintainerInformationWarning: La informació de l'administrador no està configurada. resolved: Resolt unresolved: Sense resoldre filter: Filtre @@ -1767,7 +1767,7 @@ size: Mida numberOfColumn: Nombre de columnes numberOfPageCache: Nombre de pàgines emmagatzemades a la memòria cau numberOfPageCacheDescription: L'augment d'aquest nombre millorarà la comoditat dels - usuaris, però provocarà més càrrega del servidor i més memòria per utilitzar-la. + usuaris, però provocarà més càrrega del servidor i utilitzarà més memòria. logoutConfirm: Vols tancar la sessió? lastActiveDate: Data d'últim ús statusbar: Barra d'estat @@ -1789,7 +1789,7 @@ subscribePushNotification: Activar les notificacions push unsubscribePushNotification: Desactivar les notificacions push pushNotificationAlreadySubscribed: Les notificacions push ja estan activades pushNotificationNotSupported: El vostre navegador o instància no admet notificacions - automàtiques + push license: Llicència indexPosts: Índex de notes indexFrom: Índex a partir de l'identificador de notes (deixeu en blanc per indexar @@ -1867,8 +1867,8 @@ _tutorial: step3_2: "Les teves líneas de temps domèstiques i socials es basen en qui seguiu,\ \ així que proveu de seguir un parell de comptes per començar.\nFeu clic al cercle\ \ més situat a la part superior dreta d'un perfil per seguir-los." - step4_2: Per a la vostra primera nota, a algunes persones els agrada fer una nota - de {introduction} o un senzill "Hola món!" + step4_2: A algunes persones els agrada fer una nota de {introduction} o un senzill + "Hola món!" step5_1: Línies de temps, línies de temps a tot arreu! step6_2: Bé, no només t'has unit a Calckey. T'has unit a un portal al Fediverse, una xarxa interconnectada de milers de servidors, anomenats "instàncies". @@ -1886,7 +1886,7 @@ _permissions: "write:blocks": Editar la llista d'usuaris bloquejats "write:notes": Redactar o suprimir notes "write:channels": Editar els teus canals - "read:gallery-likes": Consulta la llista de notes de la galeria que t'agraden + "read:gallery-likes": Consulta la llista de notes que t'agraden de la galeria "write:drive": Editar o suprimir fitxers i carpetes del Disc "read:favorites": Consulta la teva llista d'adreces d'interès "write:favorites": Editeu la teva llista d'adreces d'interès @@ -1894,13 +1894,13 @@ _permissions: "read:mutes": Consulta la teva llista d'usuaris silenciats "write:reactions": Edita les teves reaccions "write:votes": Vota en una enquesta - "write:pages": Editeu o suprimeix la teva pàgina + "write:pages": Edita o suprimeix la teva pàgina "write:page-likes": Editar les pàgines que t'agraden "read:user-groups": Consulta els teus grups d'usuaris "read:channels": Consulta els teus canals "read:gallery": Consulta la teva galeria "write:gallery": Edita la teva galeria - "write:gallery-likes": Edita la llista de notes de la galeria que t'agraden + "write:gallery-likes": Edita la llista de notes que t'agraden de la galeria "read:following": Consulta la informació sobre a qui segueixes "read:reactions": Consulta les teves reaccions "read:pages": Consulta la teva pàgina @@ -2037,3 +2037,6 @@ _apps: paid: Pagament theDesk: TheDesk apps: Aplicacions +deleted: Esborrat +editNote: Editar nota +edited: Editat From bb7f25c59b81d44fc4e8197a017f84a5beb517fd Mon Sep 17 00:00:00 2001 From: spla Date: Wed, 3 May 2023 17:52:06 +0000 Subject: [PATCH 22/30] chore: Translated using Weblate (Catalan) Currently translated at 100.0% (1742 of 1742 strings) Translation: Calckey/locales Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/ --- locales/ca-ES.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml index 06a80c9231..ab2a326332 100644 --- a/locales/ca-ES.yml +++ b/locales/ca-ES.yml @@ -100,12 +100,12 @@ followRequests: "Sol·licituds de seguiment" unfollow: "Deixar de seguir" followRequestPending: "Sol·licituds de seguiment pendents" enterEmoji: "Introduir un emoji" -renote: "Impulsà" +renote: "Impuls" unrenote: "Anul·lar impuls" renoted: "Impulsat." cantRenote: "Aquesta publicació no pot ser impulsada." cantReRenote: "No es pot impulsar un impuls." -quote: "Citar" +quote: "Cita" pinnedNote: "Publicació fixada" pinned: "Fixar al perfil" you: "Tu" From 91af3319286ec4fc43e2b758321e35d895dca4d6 Mon Sep 17 00:00:00 2001 From: JPlexer Date: Wed, 3 May 2023 17:00:33 +0000 Subject: [PATCH 23/30] chore: Translated using Weblate (German) Currently translated at 94.0% (1639 of 1742 strings) Translation: Calckey/locales Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/ --- locales/de-DE.yml | 91 +++++++++++++++++++++++++---------------------- 1 file changed, 49 insertions(+), 42 deletions(-) diff --git a/locales/de-DE.yml b/locales/de-DE.yml index 81098fe3f5..9f299e0759 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -1,10 +1,8 @@ _lang_: "Deutsch" -headlineMisskey: "Ein durch Posts verbundenes Netzwerk" -introMisskey: "Willkommen! Calckey ist eine dezentralisierte Open-Source Microblogging-Platform.\n\ - Verfasse „Posts“ um mitzuteilen, was gerade passiert oder um Ereignisse mit anderen\ - \ zu teilen. \U0001F4E1\nMit „Reaktionen“ kannst du außerdem schnell deine Gefühle\ - \ über Posts anderer Benutzer zum Ausdruck bringen. \U0001F44D\nEine neue Welt wartet\ - \ auf dich! \U0001F680" +headlineMisskey: "Eine dezentralisierte Open-Source Social Media Plattform, die für\ + \ immer gratis bleibt! \U0001F680" +introMisskey: "Willkommen! Calckey ist eine dezentralisierte Open-Source Social Media\ + \ Plattform, die für immer gratis bleibt!\U0001F680" monthAndDay: "{day}.{month}." search: "Suchen" notifications: "Benachrichtigungen" @@ -26,9 +24,9 @@ otherSettings: "Weitere Einstellungen" openInWindow: "In einem Fenster öffnen" profile: "Profil" timeline: "Chronik" -noAccountDescription: "Dieser Nutzer hat seine Profilbeschreibung noch nicht ausgefüllt" +noAccountDescription: "Dieser Nutzer hat seine Profilbeschreibung noch nicht ausgefüllt." login: "Anmelden" -loggingIn: "Du wirst angemeldet …" +loggingIn: "Du wirst angemeldet" logout: "Abmelden" signup: "Registrieren" uploading: "Wird hochgeladen …" @@ -57,7 +55,7 @@ reply: "Antworten" loadMore: "Mehr laden" showMore: "Mehr anzeigen" showLess: "Schließen" -youGotNewFollower: "ist dir gefolgt" +youGotNewFollower: "folgt dir nun" receiveFollowRequest: "Follow-Anfrage erhalten" followRequestAccepted: "Follow-Anfrage akzeptiert" mention: "Erwähnung" @@ -68,8 +66,8 @@ import: "Import" export: "Export" files: "Dateien" download: "Herunterladen" -driveFileDeleteConfirm: "Möchtest du die Datei „{name}“ wirklich löschen? Notizen\ - \ mit dieser Datei werden ebenso verschwinden." +driveFileDeleteConfirm: "Möchtest du die Datei „{name}“ wirklich löschen? Es wird\ + \ aus allen Notizen entfernt, die es als Anhang enthalten." unfollowConfirm: "Möchtest du {name} nicht mehr folgen?" exportRequested: "Du hast einen Export angefragt. Dies kann etwas Zeit in Anspruch\ \ nehmen. Sobald der Export abgeschlossen ist, wird er deiner Drive hinzugefügt." @@ -120,11 +118,11 @@ add: "Hinzufügen" reaction: "Reaktionen" reactionSetting: "In der Reaktionsauswahl anzuzeigende Reaktionen" reactionSettingDescription2: "Ziehe um Anzuordnen, klicke um zu löschen, drücke „+“\ - \ um hinzuzufügen" + \ um hinzuzufügen." rememberNoteVisibility: "Notizsichtbarkeit merken" attachCancel: "Anhang entfernen" markAsSensitive: "Als NSFW markieren" -accountMoved: "Benutzer hat zu einem anderen Account gewechselt." +accountMoved: "Benutzer hat zu einem anderen Account gewechselt:" unmarkAsSensitive: "Als nicht NSFW markieren" enterFileName: "Dateinamen eingeben" mute: "Stummschalten" @@ -157,7 +155,7 @@ cacheRemoteFilesDescription: "Ist diese Einstellung deaktiviert, so werden Datei flagAsBot: "Als Bot markieren" flagAsBotDescription: "Aktiviere diese Option, falls dieses Benutzerkonto durch ein\ \ Programm gesteuert wird. Falls aktiviert, agiert es als Flag für andere Entwickler\ - \ zur Verhinderung von endlosen Kettenreaktionen mit anderen Bots und lässt Misskeys\ + \ zur Verhinderung von endlosen Kettenreaktionen mit anderen Bots und lässt Calckeys\ \ interne Systeme dieses Benutzerkonto als Bot behandeln." flagAsCat: "Als Katze markieren" flagAsCatDescription: "Aktiviere diese Option, um dieses Benutzerkonto als Katze zu\ @@ -228,8 +226,8 @@ blockedUsers: "Blockierte Benutzer" noUsers: "Keine Benutzer gefunden" editProfile: "Profil bearbeiten" noteDeleteConfirm: "Möchtest du diese Notiz wirklich löschen?" -pinLimitExceeded: "Du kannst nicht noch mehr Notizen anheften." -intro: "Misskey ist installiert! Lass uns nun ein Administratorkonto einrichten." +pinLimitExceeded: "Du kannst nicht noch mehr Notizen anheften" +intro: "Calckey ist installiert! Lass uns nun ein Administratorkonto einrichten." done: "Fertig" processing: "In Bearbeitung …" preview: "Vorschau" @@ -374,7 +372,7 @@ pinnedUsersDescription: "Gib durch Leerzeichen getrennte Benutzer an, die an die Erkunden\"-Seite angeheftet werden sollen." pinnedPages: "Angeheftete Seiten" pinnedPagesDescription: "Gib durch Leerzeilen getrennte Pfäde zu Seiten an, die an\ - \ die Startseite dieser Instanz angeheftet werden sollen.\n" + \ die Startseite dieser Instanz angeheftet werden sollen." pinnedClipId: "ID des anzuheftenden Clips" pinnedNotes: "Angeheftete Notizen" hcaptcha: "hCaptcha" @@ -396,7 +394,7 @@ antennaKeywords: "Zu beobachtende Schlüsselwörter" antennaExcludeKeywords: "Zu ignorierende Schlüsselwörter" antennaKeywordsDescription: "Zum Nutzen einer \"UND\"-Verknüpfung Einträge mit Leerzeichen\ \ trennen, zum Nutzen einer \"ODER\"-Verknüpfung Einträge mit einem Zeilenumbruch\ - \ trennen" + \ trennen." notifyAntenna: "Über neue Notizen benachrichtigen" withFileAntenna: "Nur Notizen mit Dateien" enableServiceworker: "Push-Benachrichtigungen im Browser aktivieren" @@ -420,7 +418,7 @@ exploreFediverse: "Das Fediverse erkunden" popularTags: "Beliebte Schlagwörter" userList: "Liste" about: "Über" -aboutMisskey: "Über Misskey" +aboutMisskey: "Über Calckey" administrator: "Administrator" token: "Token" twoStepAuthentication: "Zwei-Faktor-Authentifizierung" @@ -477,7 +475,7 @@ checking: "Wird überprüft …" available: "Verfügbar" unavailable: "Unverfügbar" usernameInvalidFormat: "Du kannst Klein- und Großbuchstaben, Zahlen sowie Unterstriche\ - \ verwenden" + \ verwenden." tooShort: "Zu kurz" tooLong: "Zu lang" weakPassword: "Schwaches Passwort" @@ -528,7 +526,7 @@ objectStorage: "Object Storage" useObjectStorage: "Object Storage verwenden" objectStorageBaseUrl: "Basis-URL" objectStorageBaseUrlDesc: "Die als Referenz verwendete URL. Verwendest du einen CDN\ - \ oder Proxy, gib dessen URL an. Für S3 verwende 'https://.s3.amazonaws.com'.\ + \ oder Proxy, gib dessen URL an. \nFür S3 verwende 'https://.s3.amazonaws.com'.\ \ Für GCS o.ä. verwende 'https://storage.googleapis.com/'." objectStorageBucket: "Bucket" objectStorageBucketDesc: "Bitte gib den Namen des Buckets an, der bei deinem Anbieter\ @@ -576,7 +574,7 @@ ascendingOrder: "Aufsteigende Reihenfolge" descendingOrder: "Absteigende Reihenfolge" scratchpad: "Testumgebung" scratchpadDescription: "Die Testumgebung bietet einen Bereich für AiScript-Experimente.\ - \ Dort kannst du AiScript schreiben, ausführen sowie dessen Auswirkungen auf Misskey\ + \ Dort kannst du AiScript schreiben, ausführen sowie dessen Auswirkungen auf Calckey\ \ überprüfen." output: "Ausgabe" script: "Skript" @@ -652,7 +650,7 @@ smtpPass: "Passwort" emptyToDisableSmtpAuth: "Benutzername und Passwort leer lassen, um SMTP-Verifizierung\ \ zu deaktivieren" smtpSecure: "Für SMTP-Verbindungen implizit SSL/TLS verwenden" -smtpSecureInfo: "Schalte dies aus, falls du STARTTLS verwendest." +smtpSecureInfo: "Schalte dies aus, falls du STARTTLS verwendest" testEmail: "Emailversand testen" wordMute: "Wortstummschaltung" regexpError: "Fehler in einem regulären Ausdruck" @@ -705,7 +703,7 @@ defaultNavigationBehaviour: "Standardnavigationsverhalten" editTheseSettingsMayBreakAccount: "Bei Bearbeitung dieser Einstellungen besteht die\ \ Gefahr, dein Benutzerkonto zu beschädigen." instanceTicker: "Instanz-Informationen von Notizen" -waitingFor: "Warte auf {x} …" +waitingFor: "Warte auf {x}" random: "Zufällig" system: "System" switchUi: "Layout" @@ -810,7 +808,7 @@ emailNotification: "Email-Benachrichtigungen" publish: "Veröffentlichen" inChannelSearch: "In Kanal suchen" useReactionPickerForContextMenu: "Reaktionsauswahl durch Rechtsklick öffnen" -typingUsers: "{users} ist/sind am schreiben …" +typingUsers: "{users} ist/sind am schreiben" jumpToSpecifiedDate: "Zu bestimmtem Datum springen" showingPastTimeline: "Es wird eine alte Chronik angezeigt" clear: "Zurückkehren" @@ -876,11 +874,11 @@ hashtags: "Hashtags" troubleshooting: "Problembehandlung" useBlurEffect: "Weichzeichnungseffekt in der Benutzeroberfläche verwenden" learnMore: "Mehr erfahren" -misskeyUpdated: "Misskey wurde aktualisiert!" +misskeyUpdated: "Calckey wurde aktualisiert!" whatIsNew: "Änderungen anzeigen" translate: "Übersetzen" translatedFrom: "Aus {x} übersetzt" -accountDeletionInProgress: "Die Löschung deines Benutzerkontos ist momentan in Bearbeitung." +accountDeletionInProgress: "Die Löschung deines Benutzerkontos ist momentan in Bearbeitung" usernameInfo: "Ein Name, durch den dein Benutzerkonto auf diesem Server identifiziert\ \ werden kann. Du kannst das Alphabet (a~z, A~Z), Ziffern (0~9) oder Unterstriche\ \ (_) verwenden. Benutzernamen können später nicht geändert werden." @@ -967,7 +965,7 @@ statusbar: "Statusleiste" pleaseSelect: "Wähle eine Option" reverse: "Umkehren" colored: "Farbig" -refreshInterval: "Aktualisierungsrate" +refreshInterval: "Aktualisierungsrate " label: "Beschriftung" type: "Art" speed: "Geschwindigkeit" @@ -1079,7 +1077,7 @@ _preferencesBackups: createdAt: "Erstellt am: {date} {time}" updatedAt: "Aktualisiert am: {date} {time}" cannotLoad: "Laden fehlgeschlagen" - invalidFile: "Ungültiges Dateiformat." + invalidFile: "Ungültiges Dateiformat" _registry: scope: "Scope" key: "Schlüssel" @@ -1087,13 +1085,13 @@ _registry: domain: "Domain" createKey: "Schlüssel erstellen" _aboutMisskey: - about: "Misskey ist Open-Source-Software, welche von syuilo seit 2014 entwickelt\ + about: "Calckey ist ein Fork von Misskey, der seit 2022 von ThatOneCalculator entwickelt\ \ wird." contributors: "Hauptmitwirkende" allContributors: "Alle Mitwirkenden" source: "Quellcode" - translation: "Misskey übersetzen" - donate: "An Misskey spenden" + translation: "Calckey übersetzen" + donate: "An Calckey spenden" morePatrons: "Wir schätzen ebenso die Unterstützung vieler anderer hier nicht gelisteter\ \ Personen sehr. Danke! \U0001F970" patrons: "UnterstützerInnen" @@ -1106,7 +1104,7 @@ _mfm: intro: "MFM ist eine Misskey-exklusive Markup-Sprache, die in Misskey an vielen\ \ Stellen verwendet werden kann. Hier kannst du eine Liste von verfügbarer MFM-Syntax\ \ einsehen." - dummy: "Misskey erweitert die Welt des Fediverse" + dummy: "Calckey erweitert die Welt des Fediverse" mention: "Erwähnung" mentionDescription: "Mit At-Zeichen und Benutzername kann ein individueller Nutzer\ \ angegeben werden." @@ -1128,9 +1126,9 @@ _mfm: blockCodeDescription: "Syntax-Hervorhebung für mehrzeiligen (Programm-)Code als\ \ Block anzeigen." inlineMath: "Mathe (Eingebettet)" - inlineMathDescription: "Mathematische Formeln (KaTeX) eingebettet anzeigen." + inlineMathDescription: "Mathematische Formeln (KaTeX) eingebettet anzeigen" blockMath: "Mathe (Block)" - blockMathDescription: "Mehrzeilige mathematische Formeln (KaTeX) als Block einbetten." + blockMathDescription: "Mathematische Formeln (KaTeX) als Block einbetten" quote: "Zitationen" quoteDescription: "Inhalt als Zitat anzeigen." emoji: "Benutzerdefinierte Emojis" @@ -1143,7 +1141,7 @@ _mfm: jelly: "Animation (Dehnen)" jellyDescription: "Verleiht Inhalt eine sich dehnende Animation." tada: "Animation (Tada)" - tadaDescription: "Verleiht Inhalt eine Animation mit \"Tada!\"-Gefühl" + tadaDescription: "Verleiht Inhalt eine Animation mit \"Tada!\"-Gefühl." jump: "Animation (Sprung)" jumpDescription: "Verleiht Inhalt eine springende Animation." bounce: "Animation (Federn)" @@ -1325,14 +1323,18 @@ _tutorial: \ erkennen, ob sie deine Notizen sehen oder dir folgen wollen." step3_1: "Jetzt ist es Zeit, einigen Leuten zu folgen!" step3_2: "Deine Home- und Social-Timeline basiert darauf, wem du folgst, also folge\ - \ für den Anfang ein paar Accounts." + \ für den Anfang ein paar Accounts.\nKlicke das Plus Symbol oben links in einem\ + \ Profil um es zu folgen." step4_1: "Wir bringen dich nach draußen." step4_2: "Für deinen ersten Beitrag machen manche Leute gerne einen {introduction}\ \ Beitrag oder ein einfaches \"Hallo Welt!\"" step5_1: "Timelines, Timelines überall!" step5_2: "Deine Instanz hat {Zeitleisten} verschiedene Zeitleisten aktiviert." step5_3: "Die Zeitleiste Home {icon} ist die Zeitleiste, in der du die Beiträge\ - \ deiner Follower sehen kannst." + \ der Accounts sehen kannst, denen du folgst und von jedem anderen auf dieser\ + \ Instanz. Solltest du bevorzugen, dass deine Home Zeitleiste nur Beiträge von\ + \ den Accounts enthält, denen du folgst, kannst du das ganz einfach in den Einstellungen\ + \ ändern!" step5_4: "In der lokalen {Icon} Zeitleiste kannst du die Beiträge aller anderen\ \ Mitglieder dieser Instanz sehen." step5_5: "In der Zeitleiste Empfohlen {icon} kannst du Beiträge von Instanzen sehen,\ @@ -1486,7 +1488,7 @@ _visibility: _postForm: replyPlaceholder: "Dieser Notiz antworten …" quotePlaceholder: "Diese Notiz zitieren …" - channelPlaceholder: "In einen Kanal senden" + channelPlaceholder: "In einen Kanal senden..." _placeholders: a: "Was machst du momentan?" b: "Was ist um dich herum los?" @@ -1535,7 +1537,7 @@ _instanceCharts: usersTotal: "Gesamtanzahl an Benutzern" notes: "Unterschied in der Anzahl an Notizen" notesTotal: "Gesamtanzahl an Notizen" - ff: "Unterschied in der Anzahl an gefolgten Benutzern und Followern" + ff: "Unterschied in der Anzahl an gefolgten Benutzern und Followern " ffTotal: "Gesamtanzahl an gefolgten Benutzern und Followern" cacheSize: "Unterschied in der Größe des Caches" cacheSizeTotal: "Gesamtgröße des Caches" @@ -1851,7 +1853,7 @@ _notification: youGotMessagingMessageFromUser: "{name} hat dir eine Chatnachricht gesendet" youGotMessagingMessageFromGroup: "In die Gruppe {name} wurde eine Chatnachricht\ \ gesendet" - youWereFollowed: "ist dir gefolgt" + youWereFollowed: "folgt dir nun" youReceivedFollowRequest: "Du hast eine Follow-Anfrage erhalten" yourFollowRequestAccepted: "Deine Follow-Anfrage wurde akzeptiert" youWereInvitedToGroup: "{userName} hat dich in eine Gruppe eingeladen" @@ -1914,7 +1916,8 @@ flagSpeakAsCat: Wie eine Katze sprechen showEmojisInReactionNotifications: Emojis in Reaktionsbenachrichtigungen anzeigen userSaysSomethingReason: '{name} sagte {reason}' hiddenTagsDescription: 'Liste die Hashtags (ohne #) welche du von Trending und Explore - verstecken möchtest. Versteckte Hashtags sind durch andere Wege weiterhin auffindbar.' + verstecken möchtest. Versteckte Hashtags sind durch andere Wege weiterhin auffindbar. + Blockierte Instanzen sind nicht betroffen, auch wenn sie hier aufgeführt sind.' addInstance: Instanz hinzufügen flagSpeakAsCatDescription: Deine Posts werden im Katzenmodus "nya-ifiziert" hiddenTags: Versteckte Hashtags @@ -1927,3 +1930,7 @@ privateModeInfo: Wenn diese Option aktiviert ist, können nur Instanzen auf der mit Deinen Instanzen föderieren. Alle Beiträge werden für die Öffentlichkeit verborgen. allowedInstances: Instanzen auf der Whitelist selectInstance: Wähle eine Instanz +silencedInstancesDescription: Liste die Hostnamen der Instanzen auf, die du stummschalten + möchtest. Konten in den aufgelisteten Instanzen werden als "Stumm" behandelt, können + nur Follow-Anfragen stellen und können keine lokalen Konten erwähnen, wenn sie nicht + gefolgt werden. Dies wirkt sich nicht auf die blockierten Instanzen aus. From 4768ea640fe2d5b3a0e17bac8a612a71d89b4604 Mon Sep 17 00:00:00 2001 From: Ettore Atalan Date: Wed, 3 May 2023 09:54:47 +0000 Subject: [PATCH 24/30] chore: Translated using Weblate (German) Currently translated at 94.0% (1639 of 1742 strings) Translation: Calckey/locales Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/ --- locales/de-DE.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/locales/de-DE.yml b/locales/de-DE.yml index 9f299e0759..75ce918643 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -1934,3 +1934,9 @@ silencedInstancesDescription: Liste die Hostnamen der Instanzen auf, die du stum möchtest. Konten in den aufgelisteten Instanzen werden als "Stumm" behandelt, können nur Follow-Anfragen stellen und können keine lokalen Konten erwähnen, wenn sie nicht gefolgt werden. Dies wirkt sich nicht auf die blockierten Instanzen aus. +editNote: Notiz bearbeiten +edited: Bearbeitet +silenceThisInstance: Diese Instanz stummschalten +silencedInstances: Stummgeschaltete Instanzen +silenced: Stummgeschaltet +deleted: Gelöscht From fecee558c32e8e323c8717565964c365eb784f7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Lepist=C3=B6?= Date: Tue, 2 May 2023 16:32:30 +0000 Subject: [PATCH 25/30] chore: Translated using Weblate (Finnish) Currently translated at 43.4% (757 of 1742 strings) Translation: Calckey/locales Translate-URL: https://hosted.weblate.org/projects/calckey/locales/fi/ --- locales/fi.yml | 429 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 424 insertions(+), 5 deletions(-) diff --git a/locales/fi.yml b/locales/fi.yml index 25cf5a613d..9cac9d7129 100644 --- a/locales/fi.yml +++ b/locales/fi.yml @@ -290,7 +290,7 @@ fromUrl: URL:stä uploadFromUrl: Ylöslataa URL:stä uploadFromUrlRequested: Ylöslataus pyydetty uploadFromUrlMayTakeTime: Voi viedä hetki, kun ylöslataus on valmis. -explore: Selaa +explore: Tutustu messageRead: Lue noMoreHistory: Ei lisää historiaa startMessaging: Aloita uusi juttelu @@ -364,9 +364,9 @@ silencedInstancesDescription: Lista isäntänimistä, joka haluat hiljentää. T kohdellaan "hiljennettynä", ne voivat tehdä seuraajapyyntöjä ja eivät voi tehdä mainintoja paikallistileistä jossei seurattu. Tämä ei vaikuta estettyihin instansseihin. hiddenTagsDescription: 'Listaa aihetunnisteet (ilman #-merkkiä) aihetunnisteet, jotka - haluat piilottaa trendauksesta ja etsinnästä. Piilotetut aihetunnisteet ovat kuitenkin - löydettävissä muilla keinoilla. Estetyt instanssit eivät vaikuta, vaikka listattu - tähän.' + haluat piilottaa trendaavista ja Tutustu-osiosta. Piilotetut aihetunnisteet ovat + kuitenkin löydettävissä muilla keinoilla. Estetyt instanssit eivät vaikuta, vaikka + listattu tähän.' currentPassword: Nykyinen salasana newPassword: Uusi salasana attachFile: Liitetyt tiedostot @@ -391,6 +391,425 @@ instanceDescription: Instanssin kuvaus invite: Kutsu iconUrl: Ikoni URL-linkki pinnedUsersDescription: Listaa käyttäjänimet eroteltuna rivivaihdoin kiinnittääksesi - ne "Selaa" välilehteen. + ne "Tutustu" välilehteen. pinnedNotes: Kiinnitetyt viestit hcaptcha: hCaptcha-tunnistus +antennaSource: Antennin lähde +invitationCode: Kutsukoodi +checking: Tarkistetaan... +passwordNotMatched: Ei vastaa +doing: Käsittelee... +category: Kategoria +tags: Tagit +disableAnimatedMfm: Poista MFM -animaatiot käytöstä +openImageInNewTab: Avaa kuvat uuteen välilehteen +dashboard: Kojelauta +local: Paikallinen +remote: Etä +total: Yhteensä +weekOverWeekChanges: Muutokset viime viikkoon +objectStorageRegion: Alue +popout: Ulosvedettävä +volume: Äänenvoimakkuus +masterVolume: Master äänenvoimakkuus +details: Yksityiskohdat +chooseEmoji: Valitse emoji +descendingOrder: Laskevasti +scratchpad: Raaputusalusta +output: Ulostulo +invisibleNote: Näkymätön viesti +enableInfiniteScroll: Lataa enemmän automaattisesti +visibility: Näkyvyys +useCw: Piilota sisältö +poll: Kysely +enablePlayer: Avaa videotoistimeen +enterFileDescription: Syötä tiedostokuvaus +author: Kirjoittaja +manage: Hallinta +description: Kuvaus +describeFile: Lisää tiedostokuvaus +height: Korkeus +large: Suuri +medium: Keskikokoinen +small: Pieni +other: Muu +create: Luo +regenerateLoginTokenDescription: Luo uudelleen kirjautumisen aikana sisäisesti käytettävän + tunnuksen. Normaalisti tämä toiminto ei ole tarpeen. Jos tunniste luodaan uudelleen, + kaikki laitteet kirjautuvat ulos. +setMultipleBySeparatingWithSpace: Erottele useat merkinnät välilyönneillä. +fileIdOrUrl: Tiedosto ID tai URL-linkki +behavior: Käytös +instanceTicker: Viestejä koskevat instanssitiedot +waitingFor: Odottaa {x} +random: Satunnainen +system: Järjestelmä +switchUi: Ulkoasu +createNew: Luo uusi +followersCount: Seuraajien määrä +renotedCount: Saatujen buustausten määrä +followingCount: Seurattujen tilien määrä +notSet: Ei asetettu +nUsers: '{n} Käyttäjää' +nNotes: '{n} Viestiä' +sendErrorReports: Lähetä virheraportteja +backgroundColor: Taustaväri +accentColor: Korostusväri +textColor: Tekstin väri +advanced: Edistynyt +saveAs: Tallenna nimellä... +invalidValue: Epäkelpo arvo. +registry: Rekisteri +closeAccount: Sulje tili +currentVersion: Nykyinen versio +capacity: Kapasiteetti +clear: Palaa +_theme: + explore: Tutustu teemoihin +silenceConfirm: Oletko varma, että haluat hiljentää tämän käyttäjän? +notesAndReplies: Viestit ja vastaukset +withFiles: Tiedostot sisältyvät +silence: Hiljennä +popularTags: Suositut tagit +userList: Listat +about: Tietoja +aboutMisskey: Tietoja Calckeystä +exploreFediverse: Tutustu fediverseen +recentlyUpdatedUsers: Vastikään lisätyt käyttäjät +recentlyRegisteredUsers: Uudet liittyneet jäyttäjät +recentlyDiscoveredUsers: Vastikään löydetyt käyttäjät +exploreUsersCount: Täällä on {count} käyttäjää +share: Jaa +moderation: Sisällön valvonta +nUsersMentioned: Mainittu {n} käyttäjältä +securityKey: Turva-avain +securityKeyName: Avainnimi +registerSecurityKey: Rekisteröi turva-avain +lastUsed: Viimeksi käytetty +unregister: Poista rekisteröinti +passwordLessLogin: Salasanaton sisäänkirjautuminen +cacheClear: Tyhjennä välimuisti +markAsReadAllNotifications: Merkitse kaikki ilmoitukset luetuksi +markAsReadAllUnreadNotes: Merkitse kaikki viestit luetuiksi +uploadFolder: Oletuskansio ylöslatauksille +createGroup: Luo ryhmä +group: Ryhmä +groups: Ryhmät +ownedGroups: Omistetut ryhmät +help: Apua +inputMessageHere: Syötä viesti tähän +close: Sulje +joinedGroups: Liittyneet ryhmät +invites: Kutsut +groupName: Ryhmänimi +members: Jäsenet +language: Kieli +signinHistory: Kirjautumishistoria +docSource: Tämän dokumentin lähde +createAccount: Luo tili +existingAccount: Olemassa oleva tili +promotion: Edistetty +promote: Edistää +numberOfDays: Päivien määrä +accountSettings: Tilin asetukset +objectStorage: Objektitallennus +useObjectStorage: Käytä objektitallennusta +objectStorageBaseUrl: Perus URL-linkki +objectStorageBaseUrlDesc: "Viitteenä käytetty URL-linkki. Määritä CDN:n tai välityspalvelimen\ + \ URL-linkki, jos käytät kumpaakin.\nKäytä S3:lle 'https://.s3.amazonaws.com'\ + \ ja GCS:lle tai vastaaville palveluille 'https://storage.googleapis.com/'\ + \ jne." +objectStorageBucket: Kauha +newNoteRecived: Uusia viestejä +smtpPort: Portti +instanceMute: Instanssin mykistys +repliesCount: Lähetettyjen vastausten määrä +updatedAt: Päivitetty +notFound: Ei löydy +useOsNativeEmojis: Käytä käyttöjärjestelmän natiivi-Emojia +joinOrCreateGroup: Tule kutsutuksi ryhmään tai luo oma ryhmä. +text: Teksti +usernameInvalidFormat: Käytä isoja ja pieniä kirjaimia, numeroita ja erikoismerkkejä. +unsilenceConfirm: Oletko varma, että haluat poistaa käyttäjän hiljennyksen? +popularUsers: Suositut käyttäjät +moderator: Moderaattori +twoStepAuthentication: Kaksivaiheinen tunnistus +notFoundDescription: URL-linkkiin liittyvää sivua ei löytynyt. +antennaKeywords: Kuunneltavat avainsanat +antennaExcludeKeywords: Poislasketut avainsanat +antennaKeywordsDescription: Erottele välilyönneillä AND-ehtoa varten tai rivinvaihdolla + OR-ehtoa varten. +notifyAntenna: Ilmoita uusista viesteistä +withFileAntenna: Vain viestit tiedoston kanssa +enableServiceworker: Ota käyttöön Push-notifikaatiot selaimessasi +antennaUsersDescription: Luettele yksi käyttäjänimi rivi kohti +antennaInstancesDescription: Luettele yksi instanssi riviä kohti +caseSensitive: Isot ja pienet kirjaimet +withReplies: Sisällytä vastaukset +connectedTo: Seuraavat tili(t) on yhdistetty +unsilence: Poista hiljennys +administrator: Järjestelmänvalvoja +token: Merkki +resetPassword: Resetoi salasana +reduceUiAnimation: Vähennä käyttöliittymän animaatioita +transfer: Siirrä +messagingWithUser: Yksityisjuttelu +title: Otsikko +enable: Ota käyttöön +next: Seuraava +retype: Syötä uudelleen +noteOf: Lähettänyt {user} +inviteToGroup: Kutsu ryhmään +quoteAttached: Lainaus +quoteQuestion: Liitä lainauksena? +noMessagesYet: Ei vielä viestejä +newMessageExists: Uusia viestejä +onlyOneFileCanBeAttached: Voit liittää vain yhden tiedoston viestiin +signinRequired: Ole hyvä ja rekisteröidy tai kirjaudu sisään jatkaaksesi +invitations: Kutsut +available: Saatavilla +unavailable: Ei saatavissa +tooShort: Liian lyhyt +tooLong: Liian pitkä +weakPassword: Heikko salasana +normalPassword: Kohtalainen salasana +strongPassword: Vahva salasana +passwordMatched: Vastaa +signinWith: Kirjaudu sisään {x} +signinFailed: Ei voitu kirjautua sisään. Annettu käyttäjänimi tai salasana virheellinen. +tapSecurityKey: Napsauta turva-avaintasi +or: Tai +uiLanguage: Anna käyttöliittymän kieli +groupInvited: Sinut on kutsuttu ryhmään +aboutX: Tietoja {x} +disableDrawer: Älä käytä laatikkotyyppisiä valikoita +youHaveNoGroups: Sinulla ei ole ryhmiä +noHistory: Ei historiaa saatavilla +regenerate: Uudelleenluo +fontSize: Kirjasinkoko +dayOverDayChanges: Muutokset eiliseen +clientSettings: Asiakkaan asetukset +hideThisNote: Piilota tämä viesti +showFeaturedNotesInTimeline: Näytä esillä olevat viestit aikajanalla +objectStorageBucketDesc: Määritä palveluntarjoajasi käyttämä kauhan nimi. +objectStoragePrefix: Etuliite +objectStorageEndpoint: Päätepiste +objectStorageRegionDesc: Määritä alue, kuten "xx-east-1". Jos palvelusi ei tee eroa + alueiden välillä, jätä tämä kohta tyhjäksi tai kirjoita "us-east-1". +objectStorageUseSSL: Käytä SSL-salausta +objectStorageUseSSLDesc: Poista tämä käytöstä, jos et aio käyttää HTTPS:ää API-yhteyksissä +objectStorageUseProxy: Yhdistä välityspalvelimen kautta +objectStorageUseProxyDesc: Poista tämä käytöstä, jos et aio käyttää välityspalvelinta + API-yhteyksiä varten +objectStorageSetPublicRead: Aseta "public-read" ylöslataukseen +serverLogs: Palvelimen lokit +deleteAll: Poista kaikki +showFixedPostForm: Näytä viesti-ikkuna aikajanan yläpuolella +sounds: Äänet +listen: Kuuntele +none: Ei mitään +showInPage: Näytä sivulla +recentUsed: Vastikään käytetty +install: Asenna +uninstall: Poista asennus +installedApps: Hyväksytyt sovellukset +nothing: Ei nähtävää täällä +state: Tila +sort: Järjestä +ascendingOrder: Nousevasti +scratchpadDescription: Raaputusalusta tarjoaa ympäristön AiScript-kokeiluja varten. + Voit kirjoittaa, suorittaa ja tarkistaa sen tulokset vuorovaikutuksessa siinä olevan + Calckeyn kanssa. +script: Skripti +disablePagesScript: Poista AiScript käytöstä sivuilla +updateRemoteUser: Päivitä etäkäyttäjän tiedot +deleteAllFiles: Poista kaikki tiedostot +deleteAllFilesConfirm: Oletko varma, että haluat poistaa kaikki tiedostot? +removeAllFollowing: Poista seuraaminen kaikista seuratuista käyttäjistä +removeAllFollowingDescription: Tämän suorittaminen poistaa kaikki {host}:n tilit. + Suorita tämä, jos instanssia ei esimerkiksi enää ole olemassa. +userSuspended: Tämä käyttäjä on hyllytetty. +userSilenced: Tämä käyttäjä on hiljennetty. +yourAccountSuspendedTitle: Tämä tili on hyllytetty +yourAccountSuspendedDescription: Tämä tili on hyllytetty palvelimen palveluehtojen + tai vastaavien rikkomisen vuoksi. Ota yhteyttä ylläpitäjään, jos haluat tietää tarkemman + syyn. Älä luo uutta tiliä. +menu: Valikko +divider: Jakaja +addItem: Lisää kohde +relays: Releet +addRelay: Lisää rele +inboxUrl: Saavuneen postin URL +addedRelays: Lisätyt releet +serviceworkerInfo: Pitää ottaa käyttöön Push-notifikaatioissa. +deletedNote: Poistetut viestit +disablePlayer: Sulje videotoistin +expandTweet: Laajenna twiittiä +themeEditor: Teemaeditori +leaveConfirm: Tallentamattomia muutoksia olemassa. Hylätäänkö ne? +plugins: Liitännäiset +preferencesBackups: Asetusten varmuuskopiot +deck: Kansi +undeck: Jätä kansi +useBlurEffectForModal: Käytä blur-efektiä modaaleissa +useFullReactionPicker: Käytä täysikokoista reaktiovalitsinta +width: Leveys +generateAccessToken: Luo käyttöoikeustunniste +enableAll: Ota käyttöön kaikki +disableAll: Poista käytöstä kaikki +tokenRequested: Myönnä oikeus tiliin +notificationType: Ilmoituksen tyyppi +edit: Muokkaa +emailServer: Sähköpostipalvelin +enableEmail: Ota sähköpostin jakelu käyttöön +emailConfigInfo: Käytetään vahvistamaan sähköpostiosoitteesi rekisteröitymisen yhteydessä + tai jos unohdat salasanasi +email: Sähköposti +smtpHost: Isäntä +smtpUser: Käyttäjänimi +smtpPass: Salasana +emptyToDisableSmtpAuth: Jätä käyttäjänimi ja salasana tyhjäksi ohittaaksesi SMTP verifioinnin +smtpSecureInfo: Kytke tämä päältä kun käytät STARTTLS +testEmail: Kokeile email-lähetystä +wordMute: Sanan hiljennys +regexpError: Säännöllinen lausekevirhe +userSaysSomething: '{name} sanoi jotakin' +userSaysSomethingReason: '{name} sanoi {reason}' +makeActive: Aktivoi +display: Näyttö +copy: Kopioi +metrics: Mittarit +overview: Yleiskatsaus +logs: Lokit +delayed: Viivästynyt +database: Tietokanta +channel: Kanavat +notificationSetting: Ilmoitusasetukset +notificationSettingDesc: Valitse näytettävät ilmoitustyypit. +useGlobalSetting: Käytä globaaleja asetuksia +regenerateLoginToken: Luo kirjautumistunniste uudelleen +sample: Näyte +abuseReports: Raportit +reportAbuse: Raportti +reportAbuseOf: Raportti {name} +fillAbuseReportDescription: Täytä tätä raporttia koskevat tiedot. Jos se koskee tiettyä + viestiä, ilmoita sen URL-linkki. +abuseReported: Raporttisi on lähetetty. Kiitoksia paljon. +reporter: Raportoija +reporteeOrigin: Ilmoittajan alkuperä +reporterOrigin: Raportoijan alkuperä +forwardReport: Välitä raportti etäinstanssille +forwardReportIsAnonymous: Tilisi sijasta anonyymi järjestelmätili näytetään toimittajana + etäinstanssissa. +send: Lähetä +abuseMarkAsResolved: Merkitse raportti ratkaistuksi +openInNewTab: Avaa uuteen välilehteen +openInSideView: Avaa sivunäkymään +defaultNavigationBehaviour: Navigoinnin oletuskäyttäytyminen +editTheseSettingsMayBreakAccount: Näiden asetusten muuttaminen voi vahingoittaa tiliäsi. +desktop: Työpöytä +clip: Leike +optional: Vaihtoehtoinen +createNewClip: Luo uusi leike +unclip: Poista leike +confirmToUnclipAlreadyClippedNote: Tämä viesti on jo osa "{name}"-leikettä. Haluatko + sen sijaan poistaa sen tästä leikkeestä? +manageAccessTokens: Hallitse käyttöoikeuskoodeja +accountInfo: Tilin tiedot +notesCount: Viestien määrä +renotesCount: Lähetettyjen buustausten määrä +repliedCount: Saatujen vastausten määrä +sentReactionsCount: Lähetettyjen reaktioiden määrä +receivedReactionsCount: Saatujen reaktioiden määrä +pollVotesCount: Lähetettyjen kyselyäänien määrä +pollVotedCount: Saatujen kyselyäänien määrä +yes: Kyllä +no: Ei +driveFilesCount: Tiedostojen määrä asemalla +driveUsage: Aseman tilankäyttö +noCrawle: Hylkää hakukoneindeksointi +noCrawleDescription: Pyydä hakukoneita olemaan indeksoimatta profiilisivuasi, viestejäsi, + sivujasi jne. +alwaysMarkSensitive: Merkitse oletusarvoisesti herkäksi sisällöksi (NSFW) +loadRawImages: Alkuperäisten kuvien lataaminen pikkukuvien näyttämisen sijaan +disableShowingAnimatedImages: Älä näytä animoituja kuvia +verificationEmailSent: Vahvistussähköposti on lähetetty. Seuraa mukana olevaa linkkiä + suorittaaksesi vahvistuksen loppuun. +emailVerified: Sähköposti on vahvistettu +noteFavoritesCount: Kirjanmerkittyjen viestien määrä +pageLikedCount: Saatujen Sivu-tykkäysten määrä +pageLikesCount: Sivut-tykkäysten määrä +contact: Yhteystieto +useSystemFont: Käytä järjestelmän oletuskirjasinta +clips: Leikkeet +experimentalFeatures: Kokeiluluontoiset ominaisuudet +developer: Kehittäjä +makeExplorable: Tee tili näkyväksi osiossa "Tutustu" +makeExplorableDescription: Jos otat tämän pois käytöstä, tilisi ei näy "Tutustu"-osiossa. +showGapBetweenNotesInTimeline: Näytä väli viestien välissä aikajanalla +duplicate: Monista +left: Vasen +center: Keskellä +wide: Leveä +narrow: Kapea +reloadToApplySetting: Asetus otetaan käyttöön vain uudelleenladattaessa. Ladataanko + uudelleen nyt? +showTitlebar: Näytä otsikkorivi +clearCache: Tyhjennä välimuisti +onlineUsersCount: '{n} käyttäjää online-tilassa' +myTheme: Minun teemani +value: Arvo +saveConfirm: Tallenna muutokset? +deleteConfirm: Poistetaanko tosiaan? +latestVersion: Uusin versio +newVersionOfClientAvailable: Asiakasohjelmiston uudempi versio saatavilla. +usageAmount: Käyttö +inUse: Käytetty +editCode: Muokkaa koodia +apply: Käytä +receiveAnnouncementFromInstance: Vastaanota ilmoituksia tästä instanssista +emailNotification: Sähköposti-ilmoitukset +publish: Julkaise +inChannelSearch: Etsi kanavalta +useReactionPickerForContextMenu: Avaa reaktiovalitsin napsauttamalla oikeaa +typingUsers: '{users} kirjoittaa' +jumpToSpecifiedDate: Hyppää tiettyyn päivään +markAllAsRead: Merkitse kaikki luetuksi +goBack: Takaisin +unlikeConfirm: Poistatko todella tykkäyksesi? +fullView: Täysi koko +quitFullView: Poistu täydestä koosta +addDescription: Lisää kuvaus +markAsReadAllTalkMessages: Merkitse kaikki yksityisviestit luetuiksi +appearance: Ulkonäkö +messagingWithGroup: Ryhmäjuttelu +newPasswordIs: Uusi salasana on "{password}" +noFollowRequests: Sinulla ei ole odottavia seuraajapyyntöjä +objectStoragePrefixDesc: Tiedostot tallennetaan hakemistoihin tällä etuliitteellä. +objectStorageEndpointDesc: Jätä tämä tyhjäksi, jos käytät AWS S3:a. Muuten määritä + päätepisteeksi '' tai ':' käyttämästäsi palvelusta riippuen. +unableToProcess: Toimenpidettä ei voida suorittaa loppuun +installedDate: Hyväksynyt +lastUsedDate: Viimeksi käytetty +pluginTokenRequestedDescription: Tämä litännäinen voi käyttää tässä asetettuja käyttöoikeuksia. +permission: Oikeudet +smtpConfig: Lähtevän sähköpostin palvelimen (SMTP) asetukset +regexpErrorDescription: 'Säännöllisessä lausekkeessa tapahtui virhe rivillä {line} + sanan {tab} sanan mykistäminen rivillä {line}:' +emailAddress: Sähköpostiosoite +smtpSecure: Käytä implisiittistä SSL/TLS:ää SMTP-yhteyksissä +useGlobalSettingDesc: Jos se on päällä, käytetään tilisi ilmoitusasetuksia. Jos se + on pois päältä, voit tehdä yksilöllisiä asetuksia. +public: Julkinen +i18nInfo: Vapaaehtoiset kääntävät Calckeyta eri kielille. Voit auttaa osoitteessa + {link}. +lockedAccountInfo: Ellet aseta postauksen näkyvyydeksi "Vain seuraajille", postauksesi + näkyvät kaikille, vaikka vaatisitkin seuraajilta manuaalista hyväksyntää. +sendErrorReportsDescription: "Kun tämä on päällä, yksityiskohtaiset virhetiedot jaetaan\ + \ Calckeyn kanssa ongelman ilmetessä, mikä auttaa parantamaan Calckeyn laatua.\n\ + Näihin tietoihin sisältyy esimerkiksi käyttöjärjestelmäversio, käyttämäsi selain,\ + \ toimintasi Calckeyssä jne." +createdAt: Luotu +youAreRunningUpToDateClient: Käytössäsi on asiakasohjelman uusin versio. +needReloadToApply: Uudelleenlataus vaaditaan, jotta tämä näkyy. +showingPastTimeline: Näytetään parhaillaan vanhaa aikajanaa From 85ef06d9f4422871921905a5e90f5e39c5e3da9f Mon Sep 17 00:00:00 2001 From: spla Date: Wed, 3 May 2023 17:57:20 +0000 Subject: [PATCH 26/30] chore: Translated using Weblate (Catalan) Currently translated at 100.0% (1742 of 1742 strings) Translation: Calckey/locales Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/ --- locales/ca-ES.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml index ab2a326332..e59601148a 100644 --- a/locales/ca-ES.yml +++ b/locales/ca-ES.yml @@ -1263,7 +1263,7 @@ switchUi: Interfície d'usuari createNewClip: Crear un clip nou unclip: Treure clip public: Públic -renotesCount: Nombre de impulsos fets +renotesCount: Nombre d'impulsos fets sentReactionsCount: Nombre de reaccions fetes receivedReactionsCount: Nombre de reaccions rebudes pollVotesCount: Nombre de vots fets en enquestes From db4388d0c993cb8de3b3e410bceb74d8aa7d2af5 Mon Sep 17 00:00:00 2001 From: jolupa Date: Wed, 3 May 2023 18:05:28 +0000 Subject: [PATCH 27/30] chore: Translated using Weblate (Catalan) Currently translated at 100.0% (1742 of 1742 strings) Translation: Calckey/locales Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/ --- locales/ca-ES.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml index e59601148a..6d23905639 100644 --- a/locales/ca-ES.yml +++ b/locales/ca-ES.yml @@ -103,7 +103,7 @@ enterEmoji: "Introduir un emoji" renote: "Impuls" unrenote: "Anul·lar impuls" renoted: "Impulsat." -cantRenote: "Aquesta publicació no pot ser impulsada." +cantRenote: "Aquesta nota no pot ser impulsada." cantReRenote: "No es pot impulsar un impuls." quote: "Cita" pinnedNote: "Publicació fixada" From a758af15131212e7b9cf1ba4bdc06d0e654ccfb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Lepist=C3=B6?= Date: Wed, 3 May 2023 18:20:05 +0000 Subject: [PATCH 28/30] chore: Translated using Weblate (Finnish) Currently translated at 43.5% (759 of 1742 strings) Translation: Calckey/locales Translate-URL: https://hosted.weblate.org/projects/calckey/locales/fi/ --- locales/fi.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/locales/fi.yml b/locales/fi.yml index 9cac9d7129..90872d8550 100644 --- a/locales/fi.yml +++ b/locales/fi.yml @@ -813,3 +813,7 @@ createdAt: Luotu youAreRunningUpToDateClient: Käytössäsi on asiakasohjelman uusin versio. needReloadToApply: Uudelleenlataus vaaditaan, jotta tämä näkyy. showingPastTimeline: Näytetään parhaillaan vanhaa aikajanaa +userPagePinTip: Voit näyttää viestit täällä valitsemalla yksittäisten viestien valikosta + "Kiinnitä profiiliin". +notSpecifiedMentionWarning: Tämä viesti sisältää mainintoja käyttäjistä, joita ei + ole mainittu vastaanottajina From 49e9fb9001c25378aa396d2a1ccdac1e18456e14 Mon Sep 17 00:00:00 2001 From: Namekuji Date: Wed, 3 May 2023 15:50:43 -0400 Subject: [PATCH 29/30] don't update if renoted by bot --- packages/backend/src/remote/activitypub/models/person.ts | 4 ++-- packages/backend/src/services/chart/charts/notes.ts | 8 ++++++-- .../backend/src/services/chart/charts/per-user-notes.ts | 4 +++- packages/backend/src/services/note/create.ts | 6 ++++-- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/packages/backend/src/remote/activitypub/models/person.ts b/packages/backend/src/remote/activitypub/models/person.ts index 877f5f3323..9e21fa9ff5 100644 --- a/packages/backend/src/remote/activitypub/models/person.ts +++ b/packages/backend/src/remote/activitypub/models/person.ts @@ -191,7 +191,7 @@ export async function createPerson( .map((tag) => normalizeForSearch(tag)) .splice(0, 32); - const isBot = getApType(object) === "Service"; + const isBot = getApType(object) !== "Person"; const bday = person["vcard:bday"]?.match(/^\d{4}-\d{2}-\d{2}/); @@ -502,7 +502,7 @@ export async function updatePerson( emojis: emojiNames, name: truncate(person.name, nameLength), tags, - isBot: getApType(object) === "Service", + isBot: getApType(object) !== "Person", isCat: (person as any).isCat === true, isLocked: !!person.manuallyApprovesFollowers, movedToUri: person.movedTo || null, diff --git a/packages/backend/src/services/chart/charts/notes.ts b/packages/backend/src/services/chart/charts/notes.ts index 9ec347b470..42db60d0cf 100644 --- a/packages/backend/src/services/chart/charts/notes.ts +++ b/packages/backend/src/services/chart/charts/notes.ts @@ -30,7 +30,11 @@ export default class NotesChart extends Chart { return {}; } - public async update(note: Note, isAdditional: boolean): Promise { + public async update( + note: Note, + isAdditional: boolean, + byBot = false, + ): Promise { const prefix = note.userHost === null ? "local" : "remote"; await this.commit({ @@ -44,7 +48,7 @@ export default class NotesChart extends Chart { : -1 : 0, [`${prefix}.diffs.renote`]: - note.renoteId != null ? (isAdditional ? 1 : -1) : 0, + note.renoteId != null && !byBot ? (isAdditional ? 1 : -1) : 0, [`${prefix}.diffs.reply`]: note.replyId != null ? (isAdditional ? 1 : -1) : 0, [`${prefix}.diffs.withFile`]: diff --git a/packages/backend/src/services/chart/charts/per-user-notes.ts b/packages/backend/src/services/chart/charts/per-user-notes.ts index d0190cefd0..22f3fddb77 100644 --- a/packages/backend/src/services/chart/charts/per-user-notes.ts +++ b/packages/backend/src/services/chart/charts/per-user-notes.ts @@ -32,6 +32,7 @@ export default class PerUserNotesChart extends Chart { user: { id: User["id"] }, note: Note, isAdditional: boolean, + byBot = false, ): Promise { await this.commit( { @@ -44,7 +45,8 @@ export default class PerUserNotesChart extends Chart { ? 1 : -1 : 0, - "diffs.renote": note.renoteId != null ? (isAdditional ? 1 : -1) : 0, + "diffs.renote": + note.renoteId != null && !byBot ? (isAdditional ? 1 : -1) : 0, "diffs.reply": note.replyId != null ? (isAdditional ? 1 : -1) : 0, "diffs.withFile": note.fileIds.length > 0 ? (isAdditional ? 1 : -1) : 0, }, diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts index f4697b0193..0c06b55cec 100644 --- a/packages/backend/src/services/note/create.ts +++ b/packages/backend/src/services/note/create.ts @@ -163,6 +163,7 @@ export default async ( host: User["host"]; isSilenced: User["isSilenced"]; createdAt: User["createdAt"]; + isBot: User["isBot"]; }, data: Option, silent = false, @@ -323,8 +324,8 @@ export default async ( res(note); // 統計を更新 - notesChart.update(note, true); - perUserNotesChart.update(user, note, true); + notesChart.update(note, true, user.isBot); + perUserNotesChart.update(user, note, true, user.isBot); // Register host if (Users.isRemoteUser(user)) { @@ -399,6 +400,7 @@ export default async ( // この投稿を除く指定したユーザーによる指定したノートのリノートが存在しないとき if ( data.renote && + !user.isBot && (await countSameRenotes(user.id, data.renote.id, note.id)) === 0 ) { incRenoteCount(data.renote); From eb7ccfed71dad41c7ce1b220189f90bbe6ffdecd Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 3 May 2023 13:51:49 -0700 Subject: [PATCH 30/30] panos --- packages/client/src/pages/about-calckey.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/client/src/pages/about-calckey.vue b/packages/client/src/pages/about-calckey.vue index fa0eeff0be..af5e0975c7 100644 --- a/packages/client/src/pages/about-calckey.vue +++ b/packages/client/src/pages/about-calckey.vue @@ -100,9 +100,9 @@ -