diff --git a/lemmy-translations b/lemmy-translations index d0f35483..abd40d47 160000 --- a/lemmy-translations +++ b/lemmy-translations @@ -1 +1 @@ -Subproject commit d0f3548379e446d2c333e582734bc68f8d684f4d +Subproject commit abd40d4737fa732321fd7b62e42bbfcd51081cb6 diff --git a/package.json b/package.json index b0f00ed2..d564a884 100644 --- a/package.json +++ b/package.json @@ -23,16 +23,9 @@ "translations:update": "git submodule update --remote --recursive" }, "lint-staged": { - "*.{ts,tsx,js}": [ - "prettier --write", - "eslint --fix" - ], - "*.{css, scss}": [ - "prettier --write" - ], - "package.json": [ - "sortpack" - ] + "*.{ts,tsx,js}": ["prettier --write", "eslint --fix"], + "*.{css, scss}": ["prettier --write"], + "package.json": ["sortpack"] }, "dependencies": { "@babel/plugin-proposal-decorators": "^7.21.5", @@ -70,9 +63,10 @@ "inferno-router": "^8.2.2", "inferno-server": "^8.2.2", "jwt-decode": "^3.1.2", - "lemmy-js-client": "^0.19.0-rc.13", + "lemmy-js-client": "0.19.0-alpha.13", "lodash.isequal": "^4.5.0", "markdown-it": "^13.0.1", + "markdown-it-bidi": "^0.1.0", "markdown-it-container": "^3.0.0", "markdown-it-emoji": "^2.0.2", "markdown-it-footnote": "^3.0.3", @@ -80,7 +74,6 @@ "markdown-it-ruby": "^0.1.1", "markdown-it-sub": "^1.0.0", "markdown-it-sup": "^1.0.0", - "markdown-it-bidi": "^0.1.0", "mini-css-extract-plugin": "^2.7.5", "register-service-worker": "^1.7.2", "run-node-webpack-plugin": "^1.3.0", diff --git a/src/shared/components/common/markdown-textarea.tsx b/src/shared/components/common/markdown-textarea.tsx index 725bfa7e..d032b5a5 100644 --- a/src/shared/components/common/markdown-textarea.tsx +++ b/src/shared/components/common/markdown-textarea.tsx @@ -258,7 +258,7 @@ export class MarkdownTextArea extends Component< value={this.state.imageUploadStatus.uploaded} max={this.state.imageUploadStatus.total} text={ - I18NextService.i18n.t("pictures_uploded_progess", { + I18NextService.i18n.t("pictures_uploaded_progess", { uploaded: this.state.imageUploadStatus.uploaded, total: this.state.imageUploadStatus.total, }) ?? undefined diff --git a/src/shared/components/community/sidebar.tsx b/src/shared/components/community/sidebar.tsx index 6fd6bfa6..810f9695 100644 --- a/src/shared/components/community/sidebar.tsx +++ b/src/shared/components/community/sidebar.tsx @@ -1,4 +1,4 @@ -import { getUnixTime, hostname } from "@utils/helpers"; +import { hostname } from "@utils/helpers"; import { amAdmin, amMod, amTopMod } from "@utils/roles"; import { Component, InfernoNode, linkEvent } from "inferno"; import { T } from "inferno-i18next-dess"; @@ -546,7 +546,6 @@ export class Sidebar extends Component { community_id: i.props.community_view.community.id, removed: !i.props.community_view.community.removed, reason: i.state.removeReason, - expires: getUnixTime(i.state.removeExpires), // TODO fix this }); } diff --git a/src/shared/components/modlog.tsx b/src/shared/components/modlog.tsx index 0b246a6e..58bf27ef 100644 --- a/src/shared/components/modlog.tsx +++ b/src/shared/components/modlog.tsx @@ -364,7 +364,7 @@ function renderModlogType({ type_, view }: ModlogType) { case "ModRemoveCommunity": { const mrco = view as ModRemoveCommunityView; const { - mod_remove_community: { reason, expires, removed }, + mod_remove_community: { reason, removed }, community, } = mrco; @@ -379,11 +379,6 @@ function renderModlogType({ type_, view }: ModlogType) {
reason: {reason}
)} - {expires && ( - -
expires: {formatPastDate(expires)}
-
- )} ); } diff --git a/src/shared/components/person/settings.tsx b/src/shared/components/person/settings.tsx index 52200236..2e74aa09 100644 --- a/src/shared/components/person/settings.tsx +++ b/src/shared/components/person/settings.tsx @@ -249,7 +249,6 @@ export class Settings extends Component { show_bot_accounts, show_scores, show_read_posts, - show_new_post_notifs, send_notifications_to_email, email, }, @@ -285,7 +284,6 @@ export class Settings extends Component { show_bot_accounts, show_scores, show_read_posts, - show_new_post_notifs, email, bio, send_notifications_to_email, diff --git a/src/shared/components/post/post-listing.tsx b/src/shared/components/post/post-listing.tsx index 9a8bea09..d7335760 100644 --- a/src/shared/components/post/post-listing.tsx +++ b/src/shared/components/post/post-listing.tsx @@ -1713,6 +1713,7 @@ export class PostListing extends Component { if (myAuth() && !i.props.post_view.read) { i.props.onMarkPostAsRead({ post_id: i.props.post_view.post.id, + post_ids: [], read: true, }); } diff --git a/yarn.lock b/yarn.lock index 7538b22d..20566b47 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6064,10 +6064,10 @@ leac@^0.6.0: resolved "https://registry.yarnpkg.com/leac/-/leac-0.6.0.tgz#dcf136e382e666bd2475f44a1096061b70dc0912" integrity sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg== -lemmy-js-client@^0.19.0-rc.13: - version "0.19.0-rc.13" - resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.19.0-rc.13.tgz#e0e15ba6fe3a08cb85130eea7eec4bd2773999f9" - integrity sha512-JP9oEh1+Wfttqx5O5EMAVIR/hFVS66iVKmEo8/Uxw8fJfyUeQo7BhKvG8LTYegBE39Womgyu3KxXb7Jy9DRI5A== +lemmy-js-client@0.19.0-alpha.13: + version "0.19.0-alpha.13" + resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.19.0-alpha.13.tgz#58fccefd436900624c8c7a04e478f810c08abff5" + integrity sha512-sRb7JiWuzH/InwGHfnH8Dv18626vsCKgOThYCOKMd6LqtKHJ6FhnTKrTEz110GZq1Kx8KxPeDU5XTIG6YSA05w== dependencies: cross-fetch "^3.1.5" form-data "^4.0.0"