From e7812a816b67d8f69251987aef44781d852a7210 Mon Sep 17 00:00:00 2001 From: Natty Date: Sun, 5 Nov 2023 20:31:50 +0100 Subject: [PATCH] Note fetching from Magnetar! --- Cargo.lock | 24 +- Cargo.toml | 2 +- .../client/src/components/MagNote.vue | 937 ++++++++++++++++++ ...MkNoteDetailed.vue => MagNoteDetailed.vue} | 69 +- .../client/src/components/MkAvatars.vue | 2 +- .../client/src/components/MkCwButton.vue | 13 +- .../client/src/components/MkFollowButton.vue | 60 +- .../src/components/MkInstanceTicker.vue | 46 +- .../client/src/components/MkMediaBanner.vue | 10 +- .../client/src/components/MkMediaCaption.vue | 9 +- .../client/src/components/MkMediaImage.vue | 31 +- .../client/src/components/MkMediaList.vue | 74 +- .../client/src/components/MkMediaVideo.vue | 16 +- .../frontend/client/src/components/MkNote.vue | 16 +- .../client/src/components/MkNoteHeader.vue | 49 +- .../client/src/components/MkNoteSimple.vue | 4 +- .../client/src/components/MkNoteSub.vue | 95 +- .../frontend/client/src/components/MkPoll.vue | 75 +- .../client/src/components/MkPostForm.vue | 77 +- .../src/components/MkPostFormAttaches.vue | 22 +- .../src/components/MkPostFormDialog.vue | 8 +- .../components/MkReactionsViewer.reaction.vue | 8 +- .../src/components/MkReactionsViewer.vue | 18 +- .../client/src/components/MkRenoteButton.vue | 47 +- .../client/src/components/MkStarButton.vue | 3 +- .../src/components/MkStarButtonNoEmoji.vue | 4 +- .../src/components/MkSubNoteContent.vue | 89 +- .../src/components/MkUserOnlineIndicator.vue | 49 - .../client/src/components/global/MkAcct.vue | 3 +- .../client/src/components/global/MkAvatar.vue | 53 +- .../src/components/global/MkUserName.vue | 7 +- .../client/src/components/page/page.note.vue | 21 +- fe_calckey/frontend/client/src/config.ts | 2 +- .../frontend/client/src/filters/note.ts | 7 +- fe_calckey/frontend/client/src/init.ts | 29 +- fe_calckey/frontend/client/src/os.ts | 2 +- fe_calckey/frontend/client/src/pages/note.vue | 40 +- .../page-editor/els/page-editor.el.note.vue | 28 +- .../client/src/pages/settings/reaction.vue | 6 +- .../pages/settings/statusbar.statusbar.vue | 12 +- fe_calckey/frontend/client/src/plugin.ts | 10 +- .../client/src/scripts-mag/mag-util.ts | 240 +++++ .../client/src/scripts/check-word-mute.ts | 37 +- .../frontend/client/src/scripts/clone.ts | 24 - .../extract-avg-color-from-blurhash.ts | 4 +- .../client/src/scripts/get-note-menu.ts | 53 +- .../client/src/scripts/get-note-summary.ts | 12 +- .../client/src/scripts/page-metadata.ts | 3 +- .../frontend/client/src/scripts/theme.ts | 8 +- .../client/src/scripts/use-note-capture.ts | 238 +++-- fe_calckey/frontend/client/src/store.ts | 15 +- .../frontend/client/src/ui/deck/deck-store.ts | 41 +- .../frontend/client/src/widgets/job-queue.vue | 16 +- .../frontend/client/src/widgets/widget.ts | 7 +- fe_calckey/frontend/client/tsconfig.json | 3 +- .../frontend/magnetar-common/src/be-api.ts | 3 +- .../src/types/DriveFileBase.ts | 2 +- .../src/types/DriveFolderBase.ts | 2 +- .../magnetar-common/src/types/ImageMeta.ts | 2 +- .../magnetar-common/src/types/NoteBase.ts | 2 +- .../src/types/NoteSelfContextExt.ts | 2 +- .../magnetar-common/src/types/PollChoice.ts | 2 +- .../magnetar-common/src/types/ReactionPair.ts | 2 +- .../src/types/UserProfileExt.ts | 2 +- fe_calckey/frontend/package.json | 2 +- fe_calckey/frontend/pnpm-lock.yaml | 10 +- magnetar_sdk/src/types/drive.rs | 12 +- magnetar_sdk/src/types/note.rs | 12 +- magnetar_sdk/src/types/user.rs | 6 +- src/model/data/drive.rs | 2 +- src/model/data/note.rs | 6 +- src/model/data/poll.rs | 2 +- src/model/data/user.rs | 6 +- src/model/processing/note.rs | 2 +- 74 files changed, 2217 insertions(+), 640 deletions(-) create mode 100644 fe_calckey/frontend/client/src/components/MagNote.vue rename fe_calckey/frontend/client/src/components/{MkNoteDetailed.vue => MagNoteDetailed.vue} (91%) delete mode 100644 fe_calckey/frontend/client/src/components/MkUserOnlineIndicator.vue create mode 100644 fe_calckey/frontend/client/src/scripts-mag/mag-util.ts delete mode 100644 fe_calckey/frontend/client/src/scripts/clone.ts diff --git a/Cargo.lock b/Cargo.lock index 295c786..1ff71a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -535,7 +535,7 @@ dependencies = [ [[package]] name = "ck" -version = "0.2.1-alpha" +version = "0.3.0-alpha" dependencies = [ "sea-orm", "serde", @@ -835,7 +835,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "ext_calckey_model_migration" -version = "0.2.1-alpha" +version = "0.3.0-alpha" dependencies = [ "sea-orm-migration", "tokio", @@ -1446,7 +1446,7 @@ dependencies = [ [[package]] name = "magnetar" -version = "0.2.1-alpha" +version = "0.3.0-alpha" dependencies = [ "axum", "cached", @@ -1487,7 +1487,7 @@ dependencies = [ [[package]] name = "magnetar_calckey_fe" -version = "0.2.1-alpha" +version = "0.3.0-alpha" dependencies = [ "axum", "chrono", @@ -1511,7 +1511,7 @@ dependencies = [ [[package]] name = "magnetar_calckey_model" -version = "0.2.1-alpha" +version = "0.3.0-alpha" dependencies = [ "chrono", "ck", @@ -1536,7 +1536,7 @@ dependencies = [ [[package]] name = "magnetar_common" -version = "0.2.1-alpha" +version = "0.3.0-alpha" dependencies = [ "idna", "magnetar_core", @@ -1550,7 +1550,7 @@ dependencies = [ [[package]] name = "magnetar_core" -version = "0.2.1-alpha" +version = "0.3.0-alpha" dependencies = [ "serde", "serde_json", @@ -1558,7 +1558,7 @@ dependencies = [ [[package]] name = "magnetar_mmm_parser" -version = "0.2.1-alpha" +version = "0.3.0-alpha" dependencies = [ "compact_str", "either", @@ -1574,7 +1574,7 @@ dependencies = [ [[package]] name = "magnetar_nodeinfo" -version = "0.2.1-alpha" +version = "0.3.0-alpha" dependencies = [ "serde", "serde_json", @@ -1582,7 +1582,7 @@ dependencies = [ [[package]] name = "magnetar_sdk" -version = "0.2.1-alpha" +version = "0.3.0-alpha" dependencies = [ "chrono", "http", @@ -1596,7 +1596,7 @@ dependencies = [ [[package]] name = "magnetar_sdk_macros" -version = "0.2.1-alpha" +version = "0.3.0-alpha" dependencies = [ "quote", "syn 2.0.28", @@ -1604,7 +1604,7 @@ dependencies = [ [[package]] name = "magnetar_webfinger" -version = "0.2.1-alpha" +version = "0.3.0-alpha" dependencies = [ "magnetar_core", "serde", diff --git a/Cargo.toml b/Cargo.toml index 2af3aae..f13447f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ members = [ ] [workspace.package] -version = "0.2.1-alpha" +version = "0.3.0-alpha" edition = "2021" [workspace.dependencies] diff --git a/fe_calckey/frontend/client/src/components/MagNote.vue b/fe_calckey/frontend/client/src/components/MagNote.vue new file mode 100644 index 0000000..5c4791a --- /dev/null +++ b/fe_calckey/frontend/client/src/components/MagNote.vue @@ -0,0 +1,937 @@ + + + + + diff --git a/fe_calckey/frontend/client/src/components/MkNoteDetailed.vue b/fe_calckey/frontend/client/src/components/MagNoteDetailed.vue similarity index 91% rename from fe_calckey/frontend/client/src/components/MkNoteDetailed.vue rename to fe_calckey/frontend/client/src/components/MagNoteDetailed.vue index 443ac7b..d16f097 100644 --- a/fe_calckey/frontend/client/src/components/MkNoteDetailed.vue +++ b/fe_calckey/frontend/client/src/components/MagNoteDetailed.vue @@ -7,7 +7,7 @@ v-size="{ max: [500, 350, 300] }" class="lxwezrsl _block" :tabindex="!isDeleted ? '-1' : null" - :class="{ renote: isRenote }" + :class="{ renote: magIsRenote(note) }" > - + - + > - -