diff --git a/packages/nicolium/.oxlintrc.json b/packages/nicolium/.oxlintrc.json
index 4bedefd5d..bff1bf1e5 100644
--- a/packages/nicolium/.oxlintrc.json
+++ b/packages/nicolium/.oxlintrc.json
@@ -79,7 +79,8 @@
"typescript/consistent-type-exports": [
"error",
{ "fixMixedExportsWithInlineTypeSpecifier": true }
- ]
+ ],
+ "typescript/no-import-type-side-effects": "error"
},
"settings": {
"jsx-a11y": {
diff --git a/packages/nicolium/favicon.svg b/packages/nicolium/favicon.svg
new file mode 100644
index 000000000..f086c3800
--- /dev/null
+++ b/packages/nicolium/favicon.svg
@@ -0,0 +1,9 @@
+
diff --git a/packages/nicolium/package.json b/packages/nicolium/package.json
index 8f7016f82..523b21e9e 100644
--- a/packages/nicolium/package.json
+++ b/packages/nicolium/package.json
@@ -36,7 +36,7 @@
},
"dependencies": {
"@emoji-mart/data": "^1.2.1",
- "@floating-ui/react": "^0.27.18",
+ "@floating-ui/react": "^0.27.19",
"@fontsource/inter": "^5.2.8",
"@fontsource/noto-sans-javanese": "^5.2.8",
"@fontsource/roboto-mono": "^5.2.8",
@@ -57,21 +57,20 @@
"@reach/tabs": "^0.18.0",
"@react-spring/web": "^10.0.3",
"@reduxjs/toolkit": "^2.11.2",
- "@sentry/browser": "^10.40.0",
- "@sentry/core": "^10.40.0",
- "@sentry/react": "^10.40.0",
+ "@sentry/browser": "^10.42.0",
+ "@sentry/core": "^10.42.0",
+ "@sentry/react": "^10.42.0",
"@tailwindcss/aspect-ratio": "^0.4.2",
"@tailwindcss/forms": "^0.5.11",
"@tailwindcss/typography": "^0.5.19",
"@tanstack/react-pacer": "^0.20.0",
"@tanstack/react-query": "^5.90.21",
- "@tanstack/react-router": "^1.163.3",
+ "@tanstack/react-router": "^1.166.2",
"@transfem-org/sfm-js": "^0.26.1",
"@twemoji/svg": "^15.0.0",
"@uidotdev/usehooks": "^2.4.1",
"@use-gesture/react": "^10.3.1",
"@yornaath/batshit": "^0.14.0",
- "abortcontroller-polyfill": "^1.7.8",
"autoprefixer": "^10.4.27",
"blurhash": "^2.0.5",
"bowser": "^2.14.1",
@@ -82,6 +81,7 @@
"cryptocurrency-icons": "^0.18.1",
"cssnano": "^7.1.2",
"detect-passive-events": "^2.0.3",
+ "dompurify": "^3.3.2",
"emoji-datasource": "15.0.1",
"emoji-mart": "^5.6.0",
"exifr": "^7.1.3",
@@ -90,10 +90,8 @@
"fuzzysort": "^3.1.0",
"graphemesplit": "^2.6.0",
"html-react-parser": "^5.2.17",
- "intersection-observer": "^0.12.2",
"intl-messageformat": "^11.1.2",
"intl-pluralrules": "^2.0.1",
- "isomorphic-dompurify": "^3.0.0",
"leaflet": "^1.9.4",
"lexical": "^0.41.0",
"line-awesome": "^1.3.0",
@@ -104,7 +102,7 @@
"object-to-formdata": "^4.5.1",
"path-browserify": "^1.0.1",
"pl-api": "workspace:*",
- "postcss": "^8.5.6",
+ "postcss": "^8.5.8",
"process": "^0.11.10",
"punycode": "^2.3.1",
"qrcode.react": "^4.2.0",
@@ -113,7 +111,7 @@
"react-color": "^2.19.3",
"react-datepicker": "^9.1.0",
"react-dom": "^19.2.4",
- "react-helmet-async": "^2.0.5",
+ "react-helmet-async": "^3.0.0",
"react-hot-toast": "^2.6.0",
"react-inlinesvg": "^4.2.0",
"react-intl": "^8.1.3",
@@ -121,11 +119,10 @@
"react-sparklines": "^1.7.0",
"react-sticky-box": "^2.0.5",
"react-swipeable-views": "^0.14.1",
- "react-virtuoso": "^4.18.1",
+ "react-virtuoso": "^4.18.3",
"redux": "^5.0.1",
"redux-thunk": "^3.1.0",
"reselect": "^5.1.1",
- "resize-observer": "^1.0.4",
"sass-embedded": "^1.97.3",
"stringz": "^2.1.0",
"tabbable": "^6.4.0",
@@ -150,7 +147,7 @@
"@types/react-dom": "^19.2.3",
"@types/react-sparklines": "^1.7.5",
"@types/react-swipeable-views": "^0.13.6",
- "@typescript/native-preview": "7.0.0-dev.20260301.1",
+ "@typescript/native-preview": "7.0.0-dev.20260306.1",
"@vitejs/plugin-react": "^5.1.4",
"@vitest/coverage-v8": "4.0.18",
"eslint-plugin-formatjs": "^6.2.0",
diff --git a/packages/nicolium/src/__fixtures__/pleroma-quote-of-quote-post.json b/packages/nicolium/src/__fixtures__/pleroma-quote-of-quote-post.json
deleted file mode 100644
index 1156cdb3a..000000000
--- a/packages/nicolium/src/__fixtures__/pleroma-quote-of-quote-post.json
+++ /dev/null
@@ -1,371 +0,0 @@
-{
- "account": {
- "acct": "alex",
- "avatar": "https://media.gleasonator.com/6d64aecb17348b23aaff78db4687b9476cb0da1c07cc6a819c2e6ec7144c18b1.png",
- "avatar_static": "https://media.gleasonator.com/6d64aecb17348b23aaff78db4687b9476cb0da1c07cc6a819c2e6ec7144c18b1.png",
- "bot": false,
- "created_at": "2020-01-08T01:25:43.000Z",
- "display_name": "Alex Gleason",
- "emojis": [],
- "fields": [
- {
- "name": "Website",
- "value": "https://alexgleason.me"
- },
- {
- "name": "Pleroma+Soapbox",
- "value": "https://soapbox.pub"
- },
- {
- "name": "Email",
- "value": "alex@alexgleason.me"
- },
- {
- "name": "Gender identity",
- "value": "Soyboy"
- },
- {
- "name": "Donate (PayPal)",
- "value": "https://paypal.me/gleasonator"
- },
- {
- "name": "$BTC",
- "value": "bc1q9cx35adpm73aq2fw40ye6ts8hfxqzjr5unwg0n"
- },
- {
- "name": "$ETH",
- "value": "0xAc9aB5Fc04Dc1cB1789Af75b523Bd23C70B2D717"
- },
- {
- "name": "$DOGE",
- "value": "D5zVZs6jrRakaPVGiErkQiHt9sayzm6V5D"
- },
- {
- "name": "$XMR",
- "value": "45JDCLrjJ4bgVUSbbs2yjy9m5Mf4VLPW8fG7jw9sq5u69rXZZopQogZNeyYkMBnXpkaip4p4QwaaJNhdTotPa9g44DBCzdK"
- }
- ],
- "followers_count": 2220,
- "following_count": 1544,
- "fqn": "alex@gleasonator.com",
- "header": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png",
- "header_static": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png",
- "id": "9v5bmRalQvjOy0ECcC",
- "last_status_at": "2022-01-24T21:02:44",
- "locked": false,
- "note": "I create Fediverse software that empowers people online.
I'm vegan btw
Note: If you have a question for me, please tag me publicly. This gives the opportunity for others to chime in, and bystanders to learn.",
- "pleroma": {
- "accepts_chat_messages": true,
- "also_known_as": [],
- "ap_id": "https://gleasonator.com/users/alex",
- "background_image": null,
- "favicon": "https://gleasonator.com/favicon.png",
- "hide_favorites": true,
- "hide_followers": false,
- "hide_followers_count": false,
- "hide_follows": false,
- "hide_follows_count": false,
- "is_admin": true,
- "is_confirmed": true,
- "is_moderator": false,
- "is_suggested": true,
- "relationship": {},
- "skip_thread_containment": false,
- "tags": []
- },
- "source": {
- "fields": [
- {
- "name": "Website",
- "value": "https://alexgleason.me"
- },
- {
- "name": "Pleroma+Soapbox",
- "value": "https://soapbox.pub"
- },
- {
- "name": "Email",
- "value": "alex@alexgleason.me"
- },
- {
- "name": "Gender identity",
- "value": "Soyboy"
- },
- {
- "name": "Donate (PayPal)",
- "value": "https://paypal.me/gleasonator"
- },
- {
- "name": "$BTC",
- "value": "bc1q9cx35adpm73aq2fw40ye6ts8hfxqzjr5unwg0n"
- },
- {
- "name": "$ETH",
- "value": "0xAc9aB5Fc04Dc1cB1789Af75b523Bd23C70B2D717"
- },
- {
- "name": "$DOGE",
- "value": "D5zVZs6jrRakaPVGiErkQiHt9sayzm6V5D"
- },
- {
- "name": "$XMR",
- "value": "45JDCLrjJ4bgVUSbbs2yjy9m5Mf4VLPW8fG7jw9sq5u69rXZZopQogZNeyYkMBnXpkaip4p4QwaaJNhdTotPa9g44DBCzdK"
- }
- ],
- "note": "I create Fediverse software that empowers people online.\r\n\r\nI'm vegan btw\r\n\r\nNote: If you have a question for me, please tag me publicly. This gives the opportunity for others to chime in, and bystanders to learn.",
- "pleroma": {
- "actor_type": "Person",
- "discoverable": false
- },
- "sensitive": false
- },
- "statuses_count": 23004,
- "url": "https://gleasonator.com/users/alex",
- "username": "alex"
- },
- "application": {
- "name": "Soapbox FE",
- "website": "https://soapbox.pub/"
- },
- "bookmarked": false,
- "card": null,
- "content": "
Quote of quote post
", - "created_at": "2022-01-24T21:02:43.000Z", - "emojis": [], - "favourited": false, - "favourites_count": 0, - "id": "AFmFNKmfrR9CxtV01g", - "in_reply_to_account_id": null, - "in_reply_to_id": null, - "language": null, - "media_attachments": [], - "mentions": [ - { - "acct": "alex", - "id": "9v5bmRalQvjOy0ECcC", - "url": "https://gleasonator.com/users/alex", - "username": "alex" - } - ], - "muted": false, - "pinned": false, - "pleroma": { - "content": { - "text/plain": "Quote of quote post" - }, - "conversation_id": "AFmFNKkXzLRirIVIi8", - "direct_conversation_id": null, - "emoji_reactions": [], - "expires_at": null, - "in_reply_to_account_acct": null, - "local": true, - "parent_visible": false, - "pinned_at": null, - "quote": { - "account": { - "acct": "alex", - "avatar": "https://media.gleasonator.com/6d64aecb17348b23aaff78db4687b9476cb0da1c07cc6a819c2e6ec7144c18b1.png", - "avatar_static": "https://media.gleasonator.com/6d64aecb17348b23aaff78db4687b9476cb0da1c07cc6a819c2e6ec7144c18b1.png", - "bot": false, - "created_at": "2020-01-08T01:25:43.000Z", - "display_name": "Alex Gleason", - "emojis": [], - "fields": [ - { - "name": "Website", - "value": "https://alexgleason.me" - }, - { - "name": "Pleroma+Soapbox", - "value": "https://soapbox.pub" - }, - { - "name": "Email", - "value": "alex@alexgleason.me" - }, - { - "name": "Gender identity", - "value": "Soyboy" - }, - { - "name": "Donate (PayPal)", - "value": "https://paypal.me/gleasonator" - }, - { - "name": "$BTC", - "value": "bc1q9cx35adpm73aq2fw40ye6ts8hfxqzjr5unwg0n" - }, - { - "name": "$ETH", - "value": "0xAc9aB5Fc04Dc1cB1789Af75b523Bd23C70B2D717" - }, - { - "name": "$DOGE", - "value": "D5zVZs6jrRakaPVGiErkQiHt9sayzm6V5D" - }, - { - "name": "$XMR", - "value": "45JDCLrjJ4bgVUSbbs2yjy9m5Mf4VLPW8fG7jw9sq5u69rXZZopQogZNeyYkMBnXpkaip4p4QwaaJNhdTotPa9g44DBCzdK" - } - ], - "followers_count": 2220, - "following_count": 1544, - "fqn": "alex@gleasonator.com", - "header": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "header_static": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "id": "9v5bmRalQvjOy0ECcC", - "last_status_at": "2022-01-24T21:02:44", - "locked": false, - "note": "I create Fediverse software that empowers people online.Quote post
", - "created_at": "2022-01-24T21:02:34.000Z", - "emojis": [], - "favourited": false, - "favourites_count": 0, - "id": "AFmFMSpITT9xcOJKcK", - "in_reply_to_account_id": null, - "in_reply_to_id": null, - "language": null, - "media_attachments": [], - "mentions": [ - { - "acct": "alex", - "id": "9v5bmRalQvjOy0ECcC", - "url": "https://gleasonator.com/users/alex", - "username": "alex" - } - ], - "muted": false, - "pinned": false, - "pleroma": { - "content": { - "text/plain": "Quote post" - }, - "conversation_id": "AFmFMSnWa3k3WtTur2", - "direct_conversation_id": null, - "emoji_reactions": [ - { - "count": 1, - "me": false, - "name": "👍" - } - ], - "expires_at": null, - "in_reply_to_account_acct": null, - "local": true, - "parent_visible": false, - "pinned_at": null, - "quote": null, - "quote_url": "https://gleasonator.com/objects/4f35159c-3794-4037-9269-a7c84f7137c7", - "spoiler_text": { - "text/plain": "" - }, - "thread_muted": false - }, - "poll": null, - "reblog": null, - "reblogged": false, - "reblogs_count": 0, - "replies_count": 0, - "sensitive": false, - "spoiler_text": "", - "tags": [], - "text": null, - "uri": "https://gleasonator.com/objects/54d93075-7d04-4016-a128-81f3843bca79", - "url": "https://gleasonator.com/notice/AFmFMSpITT9xcOJKcK", - "visibility": "public" - }, - "quote_url": "https://gleasonator.com/objects/54d93075-7d04-4016-a128-81f3843bca79", - "spoiler_text": { - "text/plain": "" - }, - "thread_muted": false - }, - "poll": null, - "reblog": null, - "reblogged": false, - "reblogs_count": 0, - "replies_count": 1, - "sensitive": false, - "spoiler_text": "", - "tags": [], - "text": null, - "uri": "https://gleasonator.com/objects/1e2cfb5a-ece5-42df-9ec1-13e5de6d9f5b", - "url": "https://gleasonator.com/notice/AFmFNKmfrR9CxtV01g", - "visibility": "public" -} diff --git a/packages/nicolium/src/__fixtures__/pleroma-status-vertical-video-without-metadata.json b/packages/nicolium/src/__fixtures__/pleroma-status-vertical-video-without-metadata.json deleted file mode 100644 index edb24b9ef..000000000 --- a/packages/nicolium/src/__fixtures__/pleroma-status-vertical-video-without-metadata.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "account": { - "acct": "alex", - "avatar": "https://freespeechextremist.com/images/avi.png", - "avatar_static": "https://freespeechextremist.com/images/avi.png", - "bot": false, - "created_at": "2022-02-28T01:55:05.000Z", - "display_name": "Alex Gleason", - "emojis": [], - "fields": [], - "followers_count": 1, - "following_count": 0, - "header": "https://freespeechextremist.com/images/banner.png", - "header_static": "https://freespeechextremist.com/images/banner.png", - "id": "AGv8wCadU7DqWgMqNk", - "locked": false, - "note": "I'm testing out compatibility with an older Pleroma version", - "pleroma": { - "accepts_chat_messages": true, - "ap_id": "https://freespeechextremist.com/users/alex", - "background_image": null, - "confirmation_pending": false, - "favicon": null, - "hide_favorites": true, - "hide_followers": false, - "hide_followers_count": false, - "hide_follows": false, - "hide_follows_count": false, - "is_admin": false, - "is_moderator": false, - "relationship": {}, - "skip_thread_containment": false, - "tags": [] - }, - "source": { - "fields": [], - "note": "I'm testing out compatibility with an older Pleroma version", - "pleroma": { - "actor_type": "Person", - "discoverable": true - }, - "sensitive": false - }, - "statuses_count": 1, - "url": "https://freespeechextremist.com/users/alex", - "username": "alex" - }, - "application": { - "name": "Web", - "website": null - }, - "bookmarked": false, - "card": null, - "content": "Test poll
", - "created_at": "2022-03-11T01:33:18.000Z", - "emojis": [ - { - "shortcode": "gleason_excited", - "static_url": "https://gleasonator.com/emoji/gleason_emojis/gleason_excited.png", - "url": "https://gleasonator.com/emoji/gleason_emojis/gleason_excited.png", - "visible_in_picker": false - }, - { - "shortcode": "soapbox", - "static_url": "https://gleasonator.com/emoji/Gleasonator/soapbox.png", - "url": "https://gleasonator.com/emoji/Gleasonator/soapbox.png", - "visible_in_picker": false - } - ], - "favourited": false, - "favourites_count": 1, - "id": "AHHue68kB59xtUv7MO", - "in_reply_to_account_id": null, - "in_reply_to_id": null, - "language": null, - "media_attachments": [], - "mentions": [], - "muted": false, - "pinned": false, - "pleroma": { - "content": { - "text/plain": "Test poll" - }, - "conversation_id": "AHHue65YMwbjjbQZO4", - "direct_conversation_id": null, - "emoji_reactions": [], - "expires_at": null, - "in_reply_to_account_acct": null, - "local": true, - "parent_visible": false, - "pinned_at": null, - "quote": null, - "quote_url": null, - "quote_visible": false, - "spoiler_text": { - "text/plain": "" - }, - "thread_muted": false - }, - "poll": { - "emojis": [ - { - "shortcode": "gleason_excited", - "static_url": "https://gleasonator.com/emoji/gleason_emojis/gleason_excited.png", - "url": "https://gleasonator.com/emoji/gleason_emojis/gleason_excited.png", - "visible_in_picker": false - }, - { - "shortcode": "soapbox", - "static_url": "https://gleasonator.com/emoji/Gleasonator/soapbox.png", - "url": "https://gleasonator.com/emoji/Gleasonator/soapbox.png", - "visible_in_picker": false - } - ], - "expired": false, - "expires_at": "2022-03-12T01:33:18.000Z", - "id": "AHHue67gF2JDqCQGhc", - "multiple": false, - "options": [ - { - "title": "Regular emoji 😍 ", - "votes_count": 0 - }, - { - "title": "Custom emoji :gleason_excited: ", - "votes_count": 1 - }, - { - "title": "No emoji", - "votes_count": 0 - }, - { - "title": "🤔 😮 😠 ", - "votes_count": 1 - }, - { - "title": ":soapbox:", - "votes_count": 1 - } - ], - "voters_count": 3, - "votes_count": 3 - }, - "reblog": null, - "reblogged": false, - "reblogs_count": 1, - "replies_count": 1, - "sensitive": false, - "spoiler_text": "", - "tags": [], - "text": null, - "uri": "https://gleasonator.com/objects/46d2ab26-3497-442b-999f-612fe717b0a3", - "url": "https://gleasonator.com/notice/AHHue68kB59xtUv7MO", - "visibility": "public" -} diff --git a/packages/nicolium/src/__fixtures__/pleroma-status-with-poll.json b/packages/nicolium/src/__fixtures__/pleroma-status-with-poll.json deleted file mode 100644 index 74e464df4..000000000 --- a/packages/nicolium/src/__fixtures__/pleroma-status-with-poll.json +++ /dev/null @@ -1,199 +0,0 @@ -{ - "account": { - "acct": "alex", - "avatar": "https://media.gleasonator.com/6d64aecb17348b23aaff78db4687b9476cb0da1c07cc6a819c2e6ec7144c18b1.png", - "avatar_static": "https://media.gleasonator.com/6d64aecb17348b23aaff78db4687b9476cb0da1c07cc6a819c2e6ec7144c18b1.png", - "bot": false, - "created_at": "2020-01-08T01:25:43.000Z", - "display_name": "Alex Gleason", - "emojis": [], - "fields": [ - { - "name": "Website", - "value": "https://alexgleason.me" - }, - { - "name": "Soapbox", - "value": "https://soapbox.pub" - }, - { - "name": "Email", - "value": "alex@alexgleason.me" - }, - { - "name": "Gender identity", - "value": "Soyboy" - }, - { - "name": "Donate (PayPal)", - "value": "https://paypal.me/gleasonator" - }, - { - "name": "$BTC", - "value": "bc1q9cx35adpm73aq2fw40ye6ts8hfxqzjr5unwg0n" - }, - { - "name": "$ETH", - "value": "0xAc9aB5Fc04Dc1cB1789Af75b523Bd23C70B2D717" - }, - { - "name": "$DOGE", - "value": "D5zVZs6jrRakaPVGiErkQiHt9sayzm6V5D" - }, - { - "name": "$XMR", - "value": "45JDCLrjJ4bgVUSbbs2yjy9m5Mf4VLPW8fG7jw9sq5u69rXZZopQogZNeyYkMBnXpkaip4p4QwaaJNhdTotPa9g44DBCzdK" - } - ], - "followers_count": 2465, - "following_count": 1581, - "fqn": "alex@gleasonator.com", - "header": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "header_static": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "id": "9v5bmRalQvjOy0ECcC", - "last_status_at": "2022-03-10T18:19:50", - "locked": false, - "note": "I create Fediverse software that empowers people online.What is tolerance?
", - "created_at": "2020-03-23T19:33:06.000Z", - "emojis": [], - "favourited": false, - "favourites_count": 49, - "id": "103874034847713213", - "in_reply_to_account_id": null, - "in_reply_to_id": null, - "language": null, - "media_attachments": [], - "mentions": [], - "muted": false, - "pinned": true, - "pleroma": { - "content": { - "text/plain": "What is tolerance?" - }, - "conversation_id": "3023268", - "direct_conversation_id": null, - "emoji_reactions": [ - { - "count": 3, - "me": false, - "name": "❤️" - } - ], - "expires_at": null, - "in_reply_to_account_acct": null, - "local": true, - "parent_visible": false, - "pinned_at": "2021-11-23T01:38:44.000Z", - "quote": null, - "quote_url": null, - "quote_visible": false, - "spoiler_text": { - "text/plain": "" - }, - "thread_muted": false - }, - "poll": { - "emojis": [], - "expired": true, - "expires_at": "2020-03-24T19:33:06.000Z", - "id": "4930", - "multiple": false, - "options": [ - { - "title": "Banning, censoring, and deplatforming anyone you disagree with", - "votes_count": 2 - }, - { - "title": "Promoting free speech, even for people and ideas you dislike", - "votes_count": 36 - } - ], - "voters_count": 2, - "votes_count": 38 - }, - "reblog": null, - "reblogged": false, - "reblogs_count": 27, - "replies_count": 15, - "sensitive": false, - "spoiler_text": "", - "tags": [], - "text": null, - "uri": "https://gleasonator.com/users/alex/statuses/103874034847713213", - "url": "https://gleasonator.com/notice/103874034847713213", - "visibility": "public" -} diff --git a/packages/nicolium/src/__fixtures__/pleroma-status.json b/packages/nicolium/src/__fixtures__/pleroma-status.json deleted file mode 100644 index bf795f5e4..000000000 --- a/packages/nicolium/src/__fixtures__/pleroma-status.json +++ /dev/null @@ -1,181 +0,0 @@ -{ - "account": { - "acct": "alex", - "avatar": "https://media.gleasonator.com/6d64aecb17348b23aaff78db4687b9476cb0da1c07cc6a819c2e6ec7144c18b1.png", - "avatar_static": "https://media.gleasonator.com/6d64aecb17348b23aaff78db4687b9476cb0da1c07cc6a819c2e6ec7144c18b1.png", - "bot": false, - "created_at": "2020-01-08T01:25:43.000Z", - "display_name": "Alex Gleason", - "emojis": [], - "fields": [ - { - "name": "Website", - "value": "https://alexgleason.me" - }, - { - "name": "Soapbox", - "value": "https://soapbox.pub" - }, - { - "name": "Email", - "value": "alex@alexgleason.me" - }, - { - "name": "Gender identity", - "value": "Soyboy" - }, - { - "name": "Donate (PayPal)", - "value": "https://paypal.me/gleasonator" - }, - { - "name": "$BTC", - "value": "bc1q9cx35adpm73aq2fw40ye6ts8hfxqzjr5unwg0n" - }, - { - "name": "$ETH", - "value": "0xAc9aB5Fc04Dc1cB1789Af75b523Bd23C70B2D717" - }, - { - "name": "$DOGE", - "value": "D5zVZs6jrRakaPVGiErkQiHt9sayzm6V5D" - }, - { - "name": "$XMR", - "value": "45JDCLrjJ4bgVUSbbs2yjy9m5Mf4VLPW8fG7jw9sq5u69rXZZopQogZNeyYkMBnXpkaip4p4QwaaJNhdTotPa9g44DBCzdK" - } - ], - "followers_count": 2465, - "following_count": 1581, - "fqn": "alex@gleasonator.com", - "header": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "header_static": "https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png", - "id": "9v5bmRalQvjOy0ECcC", - "last_status_at": "2022-03-10T18:19:50", - "locked": false, - "note": "I create Fediverse software that empowers people online.Good morning! Hope you have a wonderful day.
", - "created_at": "2020-03-23T19:33:06.000Z", - "emojis": [], - "favourited": false, - "favourites_count": 49, - "id": "103874034845713213", - "in_reply_to_account_id": null, - "in_reply_to_id": null, - "language": null, - "media_attachments": [], - "mentions": [], - "muted": false, - "pinned": true, - "pleroma": { - "content": { - "text/plain": "What is tolerance?" - }, - "conversation_id": "3023268", - "direct_conversation_id": null, - "emoji_reactions": [ - { - "count": 3, - "me": false, - "name": "❤️" - } - ], - "expires_at": null, - "in_reply_to_account_acct": null, - "local": true, - "parent_visible": false, - "pinned_at": "2021-11-23T01:38:44.000Z", - "quote": null, - "quote_url": null, - "quote_visible": false, - "spoiler_text": { - "text/plain": "" - }, - "thread_muted": false - }, - "poll": null, - "reblog": null, - "reblogged": false, - "reblogs_count": 27, - "replies_count": 15, - "sensitive": false, - "spoiler_text": "", - "tags": [], - "text": null, - "uri": "https://gleasonator.com/users/alex/statuses/103874034847713213", - "url": "https://gleasonator.com/notice/103874034847713213", - "visibility": "public" -} diff --git a/packages/nicolium/src/actions/accounts.ts b/packages/nicolium/src/actions/accounts.ts index 00c7aa1de..0b3f5adc4 100644 --- a/packages/nicolium/src/actions/accounts.ts +++ b/packages/nicolium/src/actions/accounts.ts @@ -1,11 +1,7 @@ import { getClient } from '@/api'; import type { AppDispatch, RootState } from '@/store'; -import type { CreateAccountParams, Relationship } from 'pl-api'; - -const ACCOUNT_BLOCK_SUCCESS = 'ACCOUNT_BLOCK_SUCCESS' as const; -const ACCOUNT_MUTE_SUCCESS = 'ACCOUNT_MUTE_SUCCESS' as const; -const ACCOUNT_UNFOLLOW_SUCCESS = 'ACCOUNT_UNFOLLOW_SUCCESS' as const; +import type { CreateAccountParams } from 'pl-api'; const createAccount = (params: CreateAccountParams) => (_dispatch: AppDispatch, getState: () => RootState) => @@ -13,18 +9,4 @@ const createAccount = .settings.createAccount(params) .then((response) => ({ params, response })); -type AccountsAction = { - type: - | typeof ACCOUNT_BLOCK_SUCCESS - | typeof ACCOUNT_MUTE_SUCCESS - | typeof ACCOUNT_UNFOLLOW_SUCCESS; - relationship: Relationship; -}; - -export { - ACCOUNT_BLOCK_SUCCESS, - ACCOUNT_MUTE_SUCCESS, - ACCOUNT_UNFOLLOW_SUCCESS, - createAccount, - type AccountsAction, -}; +export { createAccount }; diff --git a/packages/nicolium/src/actions/admin.ts b/packages/nicolium/src/actions/admin.ts index 44861a11f..0cb1e8ab6 100644 --- a/packages/nicolium/src/actions/admin.ts +++ b/packages/nicolium/src/actions/admin.ts @@ -4,11 +4,9 @@ import { queryClient } from '@/queries/client'; import { queryKeys } from '@/queries/keys'; import { useComposeStore } from '@/stores/compose'; import { useModalsStore } from '@/stores/modals'; +import { useTimelinesStore } from '@/stores/timelines'; import { filterBadges, getTagDiff } from '@/utils/badges'; -import { STATUS_FETCH_SOURCE_FAIL, type StatusesAction } from './statuses'; -import { deleteFromTimelines } from './timelines'; - import type { AppDispatch, RootState } from '@/store'; import type { PleromaConfig } from 'pl-api'; @@ -74,7 +72,7 @@ const deleteStatus = (statusId: string) => (dispatch: AppDispatch, getState: () getClient(getState) .admin.statuses.deleteStatus(statusId) .then(() => { - dispatch(deleteFromTimelines(statusId)); + useTimelinesStore.getState().actions.deleteStatus(statusId); return { statusId }; }); @@ -149,9 +147,6 @@ const redactStatus = (statusId: string) => (dispatch: AppDispatch, getState: () .getState() .actions.setComposeToStatus(status, poll, source, false, null, null, true); useModalsStore.getState().actions.openModal('COMPOSE'); - }) - .catch((error) => { - dispatch
- {lastMessageAuthor && (
-
-
+ {lastMessageAuthor && (
+
+
+
- {intl.formatMessage(messages.title)} -
- -{intl.formatMessage(messages.body)}
-
+