+ {
/>
)}
-
{RouteComponent &&
(isAuthPath(path ?? "") ? (
diff --git a/src/shared/components/comment/comment-form.tsx b/src/shared/components/comment/comment-form.tsx
index 0cfbf8b0..4c761e56 100644
--- a/src/shared/components/comment/comment-form.tsx
+++ b/src/shared/components/comment/comment-form.tsx
@@ -74,6 +74,9 @@ export class CommentForm extends Component {
#
+
+ #
+
)}
diff --git a/src/shared/components/comment/comment-node.tsx b/src/shared/components/comment/comment-node.tsx
index eb644363..905c730f 100644
--- a/src/shared/components/comment/comment-node.tsx
+++ b/src/shared/components/comment/comment-node.tsx
@@ -51,7 +51,7 @@ import { CommunityLink } from "../community/community-link";
import { PersonListing } from "../person/person-listing";
import { CommentForm } from "./comment-form";
import { CommentNodes } from "./comment-nodes";
-import { BanUpdateForm } from "../common/mod-action-form-modal";
+import { BanUpdateForm } from "../common/modal/mod-action-form-modal";
import CommentActionDropdown from "../common/content-actions/comment-action-dropdown";
import { RequestState } from "../../services/HttpService";
import { VoteDisplay } from "../common/vote-display";
@@ -294,7 +294,7 @@ export class CommentNode extends Component
+ {
super(props, context);
this.handleSortChange = this.handleSortChange.bind(this);
+ this.handleCommentSortChange = this.handleCommentSortChange.bind(this);
this.handleDataTypeChange = this.handleDataTypeChange.bind(this);
this.handlePageNext = this.handlePageNext.bind(this);
this.handlePagePrev = this.handlePagePrev.bind(this);
@@ -485,7 +489,6 @@ export class Community extends Component {
return (
{
)}
- {
this.updateUrl({ pageCursor: nextPage });
}
- handleSortChange(sort: SortType) {
- this.updateUrl({ sort, pageCursor: undefined });
+ handleSortChange(sort: PostSortType) {
+ this.updateUrl({
+ sort: sort,
+ pageCursor: undefined,
+ });
+ }
+
+ handleCommentSortChange(sort: CommentSortType) {
+ this.updateUrl({
+ sort: commentToPostSortType(sort),
+ pageCursor: undefined,
+ });
}
handleDataTypeChange(dataType: DataType) {
diff --git a/src/shared/components/home/admin-settings.tsx b/src/shared/components/home/admin-settings.tsx
index 5d4706c2..561cc20c 100644
--- a/src/shared/components/home/admin-settings.tsx
+++ b/src/shared/components/home/admin-settings.tsx
@@ -6,9 +6,9 @@ import classNames from "classnames";
import { Component } from "inferno";
import {
BannedPersonsResponse,
- CreateCustomEmoji,
- DeleteCustomEmoji,
- EditCustomEmoji,
+ CreateOAuthProvider,
+ DeleteOAuthProvider,
+ EditOAuthProvider,
EditSite,
GetFederatedInstancesResponse,
GetSiteResponse,
@@ -17,7 +17,6 @@ import {
PersonView,
} from "lemmy-js-client";
import { InitialFetchRequest } from "../../interfaces";
-import { removeFromEmojiDataModel, updateEmojiDataModel } from "../../markdown";
import { FirstLoadService, I18NextService } from "../../services";
import {
EMPTY_REQUEST,
@@ -42,7 +41,8 @@ import { MediaUploads } from "../common/media-uploads";
import { Paginator } from "../common/paginator";
import { snapToTop } from "@utils/browser";
import { isBrowser } from "@utils/browser";
-import ConfirmationModal from "../common/confirmation-modal";
+import ConfirmationModal from "../common/modal/confirmation-modal";
+import OAuthProvidersTab from "./oauth/oauth-providers-tab";
type AdminSettingsData = RouteDataResponse<{
bannedRes: BannedPersonsResponse;
@@ -104,13 +104,13 @@ export class AdminSettings extends Component<
super(props, context);
this.handleEditSite = this.handleEditSite.bind(this);
- this.handleEditEmoji = this.handleEditEmoji.bind(this);
- this.handleDeleteEmoji = this.handleDeleteEmoji.bind(this);
- this.handleCreateEmoji = this.handleCreateEmoji.bind(this);
this.handleUploadsPageChange = this.handleUploadsPageChange.bind(this);
this.handleToggleShowLeaveAdminConfirmation =
this.handleToggleShowLeaveAdminConfirmation.bind(this);
this.handleLeaveAdminTeam = this.handleLeaveAdminTeam.bind(this);
+ this.handleEditOAuthProvider = this.handleEditOAuthProvider.bind(this);
+ this.handleDeleteOAuthProvider = this.handleDeleteOAuthProvider.bind(this);
+ this.handleCreateOAuthProvider = this.handleCreateOAuthProvider.bind(this);
// Only fetch the data if coming from another route
if (FirstLoadService.isFirstLoad) {
@@ -249,11 +249,7 @@ export class AdminSettings extends Component<
id="taglines-tab-pane"
>
),
@@ -270,11 +266,7 @@ export class AdminSettings extends Component<
id="emojis-tab-pane"
>
{this.props.showContext && this.getLinkButton()}
{this.props.markable && (
diff --git a/src/shared/components/community/community.tsx b/src/shared/components/community/community.tsx
index d9ff4ea9..69f9a43b 100644
--- a/src/shared/components/community/community.tsx
+++ b/src/shared/components/community/community.tsx
@@ -1,5 +1,6 @@
import {
commentsToFlatNodes,
+ commentToPostSortType,
communityRSSUrl,
editComment,
editPost,
@@ -81,9 +82,10 @@ import {
RemovePost,
SaveComment,
SavePost,
- SortType,
+ PostSortType,
SuccessResponse,
TransferCommunity,
+ CommentSortType,
} from "lemmy-js-client";
import { fetchLimit, relTags } from "../../config";
import {
@@ -121,6 +123,7 @@ import { IRoutePropsWithFetch } from "../../routes";
import PostHiddenSelect from "../common/post-hidden-select";
import { isBrowser } from "@utils/browser";
import { LoadingEllipses } from "../common/loading-ellipses";
+import { CommentSortSelect } from "../common/comment-sort-select";
type CommunityData = RouteDataResponse<{
communityRes: GetCommunityResponse;
@@ -139,12 +142,12 @@ interface State {
interface CommunityProps {
dataType: DataType;
- sort: SortType;
+ sort: PostSortType;
pageCursor?: PaginationCursor;
showHidden?: StringBoolean;
}
-type Fallbacks = { sort: SortType };
+type Fallbacks = { sort: PostSortType };
export function getCommunityQueryParams(
source: string | undefined,
@@ -162,7 +165,8 @@ export function getCommunityQueryParams(
},
source,
{
- sort: local_user?.default_sort_type ?? local_site.default_sort_type,
+ sort:
+ local_user?.default_post_sort_type ?? local_site.default_post_sort_type,
},
);
}
@@ -171,12 +175,11 @@ function getDataTypeFromQuery(type?: string): DataType {
return type ? DataType[type] : DataType.Post;
}
-function getSortTypeFromQuery(type?: string): SortType {
- const mySortType =
- UserService.Instance.myUserInfo?.local_user_view.local_user
- .default_sort_type;
-
- return type ? (type as SortType) : (mySortType ?? "Active");
+function getSortTypeFromQuery(
+ type?: string,
+ fallback: PostSortType,
+): PostSortType {
+ return type ? (type as PostSortType) : fallback;
}
type CommunityPathProps = { name: string };
@@ -215,6 +218,7 @@ export class Community extends Component
-
-
),
@@ -294,6 +286,28 @@ export class AdminSettings extends Component<
),
},
+ {
+ key: "auth",
+ label: I18NextService.i18n.t("authentication"),
+ getNode: isSelected => (
+
+
+ ),
+ },
]}
/>
@@ -431,7 +445,6 @@ export class AdminSettings extends Component<
this.setState(s => {
s.siteRes.site_view = editRes.data.site_view;
// TODO: Where to get taglines from?
- s.siteRes.taglines = editRes.data.taglines;
return s;
});
toast(I18NextService.i18n.t("site_saved"));
@@ -464,30 +477,71 @@ export class AdminSettings extends Component<
}
}
- async handleEditEmoji(form: EditCustomEmoji) {
- const res = await HttpService.client.editCustomEmoji(form);
- if (res.state === "success") {
- updateEmojiDataModel(res.data.custom_emoji);
- }
- }
-
- async handleDeleteEmoji(form: DeleteCustomEmoji) {
- const res = await HttpService.client.deleteCustomEmoji(form);
- if (res.state === "success") {
- removeFromEmojiDataModel(form.id);
- }
- }
-
- async handleCreateEmoji(form: CreateCustomEmoji) {
- const res = await HttpService.client.createCustomEmoji(form);
- if (res.state === "success") {
- updateEmojiDataModel(res.data.custom_emoji);
- }
- }
-
async handleUploadsPageChange(val: number) {
this.setState({ uploadsPage: val });
snapToTop();
await this.fetchUploadsOnly();
}
+
+ async handleEditOAuthProvider(form: EditOAuthProvider) {
+ this.setState({ loading: true });
+
+ const res = await HttpService.client.editOAuthProvider(form);
+
+ if (res.state === "success") {
+ const newOAuthProvider = res.data;
+ this.setState(s => {
+ s.siteRes.admin_oauth_providers = (
+ s.siteRes.admin_oauth_providers ?? []
+ ).map(p => {
+ return p?.id === newOAuthProvider.id ? newOAuthProvider : p;
+ });
+ return s;
+ });
+ toast(I18NextService.i18n.t("site_saved"));
+ } else {
+ toast(I18NextService.i18n.t("couldnt_edit_oauth_provider"), "danger");
+ }
+
+ this.setState({ loading: false });
+ }
+
+ async handleDeleteOAuthProvider(form: DeleteOAuthProvider) {
+ this.setState({ loading: true });
+
+ const res = await HttpService.client.deleteOAuthProvider(form);
+
+ if (res.state === "success") {
+ this.setState(s => {
+ s.siteRes.admin_oauth_providers = (
+ s.siteRes.admin_oauth_providers ?? []
+ ).filter(p => p.id !== form.id);
+ return s;
+ });
+ toast(I18NextService.i18n.t("site_saved"));
+ } else {
+ toast(I18NextService.i18n.t("couldnt_delete_oauth_provider"), "danger");
+ }
+
+ this.setState({ loading: false });
+ }
+
+ async handleCreateOAuthProvider(form: CreateOAuthProvider) {
+ this.setState({ loading: true });
+
+ const res = await HttpService.client.createOAuthProvider(form);
+ if (res.state === "success") {
+ this.setState(s => {
+ s.siteRes.admin_oauth_providers = [
+ ...(s.siteRes.admin_oauth_providers ?? []),
+ res.data,
+ ];
+ });
+ toast(I18NextService.i18n.t("site_saved"));
+ } else {
+ toast(I18NextService.i18n.t("couldnt_create_oauth_provider"), "danger");
+ }
+
+ this.setState({ loading: false });
+ }
}
diff --git a/src/shared/components/home/emojis-form.tsx b/src/shared/components/home/emojis-form.tsx
index e6d299e6..79ae4b51 100644
--- a/src/shared/components/home/emojis-form.tsx
+++ b/src/shared/components/home/emojis-form.tsx
@@ -1,79 +1,81 @@
-import { setIsoData } from "@utils/app";
import { capitalizeFirstLetter } from "@utils/helpers";
import { Component, linkEvent } from "inferno";
-import {
- CreateCustomEmoji,
- DeleteCustomEmoji,
- EditCustomEmoji,
- GetSiteResponse,
-} from "lemmy-js-client";
-import { customEmojisLookup } from "../../markdown";
+import { CustomEmojiView } from "lemmy-js-client";
+import { emojiMartCategories, EmojiMartCategory } from "../../markdown";
import { HttpService, I18NextService } from "../../services";
import { pictrsDeleteToast, toast } from "../../toast";
import { EmojiMart } from "../common/emoji-mart";
import { Icon, Spinner } from "../common/icon";
import { Paginator } from "../common/paginator";
import { tippyMixin } from "../mixins/tippy-mixin";
+import { isBrowser } from "@utils/browser";
+import classNames from "classnames";
+import { amAdmin } from "@utils/roles";
+import { Prompt } from "inferno-router";
-interface EmojiFormProps {
- onEdit(form: EditCustomEmoji): void;
- onCreate(form: CreateCustomEmoji): void;
- onDelete(form: DeleteCustomEmoji): void;
+interface EditableEmoji {
+ change?: "update" | "delete" | "create";
+ emoji: CustomEmojiView;
+ loading?: boolean;
+}
+
+function markForUpdate(editable: EditableEmoji) {
+ if (editable.change !== "create") {
+ editable.change = "update";
+ }
}
interface EmojiFormState {
- siteRes: GetSiteResponse;
- customEmojis: CustomEmojiViewForm[];
- page: number;
-}
-
-interface CustomEmojiViewForm {
- id: number;
- category: string;
- shortcode: string;
- image_url: string;
- alt_text: string;
- keywords: string;
- changed: boolean;
+ emojis: EditableEmoji[]; // Emojis for the current page
+ allEmojis: CustomEmojiView[]; // All emojis for emoji lookup across pages
+ emojiMartCustom: EmojiMartCategory[];
+ emojiMartKey: number;
page: number;
loading: boolean;
}
@tippyMixin
-export class EmojiForm extends Component
+ {
{I18NextService.i18n.t("column_emoji")}
+
{I18NextService.i18n.t("column_shortcode")}
@@ -102,20 +108,15 @@ export class EmojiForm extends Component {
{I18NextService.i18n.t("column_keywords")}
+
- {this.state.customEmojis
- .slice(
- Number((this.state.page - 1) * this.itemsPerPage),
- Number(
- (this.state.page - 1) * this.itemsPerPage +
- this.itemsPerPage,
- ),
- )
- .map((cv, index) => (
- (this.scrollRef[cv.shortcode] = e)}>
+ {this.state.emojis.map((editable: EditableEmoji, index) => {
+ const cv = editable.emoji.custom_emoji;
+ return (
+
{cv.image_url.length > 0 && (
![]()
{
alt={cv.alt_text}
/>
)}
- {cv.image_url.length === 0 && (
+
+
+ {
- )}
+ }
{
(this.scrollRef[cv.shortcode] = e)}
type="text"
placeholder="Category"
className="form-control"
@@ -206,31 +210,54 @@ export class EmojiForm extends Component {
type="text"
placeholder="Keywords"
className="form-control"
- value={cv.keywords}
+ value={editable.emoji.keywords
+ .map(k => k.keyword)
+ .join(" ")}
onInput={linkEvent(
{ form: this, index: index },
this.handleEmojiKeywordChange,
)}
/>
+
+ {editable.change === "update" && (
+
+
-
- ))}
+ );
+ })}
@@ -273,43 +318,91 @@ export class EmojiForm extends Component {
page={this.state.page}
onChange={this.handlePageChange}
nextDisabled={false}
+ disabled={this.hasPendingChanges()}
/>
);
}
- canEdit(cv: CustomEmojiViewForm) {
- const noEmptyFields =
- cv.alt_text.length > 0 &&
- cv.category.length > 0 &&
- cv.image_url.length > 0 &&
- cv.shortcode.length > 0;
- const noDuplicateShortCodes =
- this.state.customEmojis.filter(
- x => x.shortcode === cv.shortcode && x.id !== cv.id,
- ).length === 0;
- return noEmptyFields && noDuplicateShortCodes && !cv.loading && cv.changed;
+ canSave(cv: EditableEmoji) {
+ const requiredFields =
+ cv.emoji.custom_emoji.image_url.length > 0 &&
+ cv.emoji.custom_emoji.shortcode.length > 0;
+ return requiredFields && !cv.loading;
}
- getEditTooltip(cv: CustomEmojiViewForm) {
- if (this.canEdit(cv)) return I18NextService.i18n.t("save");
+ getEditTooltip(cv: EditableEmoji) {
+ if (this.canSave(cv)) return I18NextService.i18n.t("save");
else return I18NextService.i18n.t("custom_emoji_save_validation");
}
- handlePageChange(page: number) {
- this.setState({ page: page });
+ async handlePageChange(page: number) {
+ this.setState({ loading: true });
+ let allEmojis: CustomEmojiView[] = this.state.allEmojis;
+ let emojiMartCustom: EmojiMartCategory[] = this.state.emojiMartCustom;
+ let emojiMartKey: number = this.state.emojiMartKey;
+ if (this.needsRefetch) {
+ const emojiRes = await HttpService.client.listCustomEmojis({
+ ignore_page_limits: true,
+ });
+ if (emojiRes.state === "success") {
+ this.needsRefetch = false;
+ allEmojis = emojiRes.data.custom_emojis;
+ allEmojis.sort((a, b) => {
+ const categoryOrder = a.custom_emoji.category.localeCompare(
+ b.custom_emoji.category,
+ );
+ if (categoryOrder === 0) {
+ return a.custom_emoji.shortcode.localeCompare(
+ b.custom_emoji.shortcode,
+ );
+ }
+ return categoryOrder;
+ });
+ }
+ emojiMartCustom = emojiMartCategories(allEmojis);
+ emojiMartKey++;
+ }
+ if (allEmojis) {
+ const startIndex = (page - 1) * this.itemsPerPage;
+ const emojis = allEmojis
+ .slice(startIndex, startIndex + this.itemsPerPage)
+ .map(x => ({ emoji: structuredClone(x) })); // clone for restore after cancel
+ this.setState({
+ loading: false,
+ allEmojis,
+ emojiMartCustom,
+ emojiMartKey,
+ emojis,
+ page,
+ });
+ } else {
+ this.setState({ loading: false, page });
+ }
}
- handleEmojiClick(e: any) {
- const view = customEmojisLookup.get(e.id);
- if (view) {
- const page = this.state.customEmojis.find(
- x => x.id === view.custom_emoji.id,
- )?.page;
- if (page) {
- this.setState({ page: page });
- this.scrollRef[view.custom_emoji.shortcode].scrollIntoView();
+ async handleEmojiClick(e: any) {
+ const emojiIndex = this.state.allEmojis.findIndex(
+ x => x.custom_emoji.shortcode === e.id,
+ );
+ if (emojiIndex >= 0) {
+ const { shortcode } = this.state.allEmojis[emojiIndex].custom_emoji;
+ const page = Math.floor(emojiIndex / this.itemsPerPage) + 1;
+ if (page !== this.state.page) {
+ if (
+ this.hasPendingChanges() &&
+ !confirm(I18NextService.i18n.t("block_leaving"))
+ ) {
+ return;
+ }
+ await this.handlePageChange(page);
+ await new Promise(r => setTimeout(r));
+ }
+ if (shortcode) {
+ const categoryInput: HTMLInputElement | undefined =
+ this.scrollRef[shortcode];
+ categoryInput?.focus();
}
}
}
@@ -318,32 +411,22 @@ export class EmojiForm extends Component{I18NextService.i18n.t("custom_emojis")}
- {customEmojisLookup.size > 0 && ( + {this.state.emojiMartCustom.length > 0 && (
-
+
+
+
@@ -273,43 +318,91 @@ export class EmojiForm extends Component
- {this.trendingCommunities()}
-
- )}
{showSubscribedMobile && (
{this.subscribedCommunities(true)}
@@ -539,9 +486,6 @@ export class Home extends Component {
return (
{
return successful;
}
+ async handleLoginWithProvider(params: { oauth_provider: OAuthProvider }) {
+ handleUseOAuthProvider({
+ oauth_provider: params.oauth_provider,
+ prev: this.props.prev ?? "/",
+ });
+ }
+
loginForm() {
return (
-
-
{getRss(
@@ -842,17 +748,6 @@ export class Home extends Component {
);
}
- async fetchTrendingCommunities() {
- this.setState({ trendingCommunitiesRes: LOADING_REQUEST });
- this.setState({
- trendingCommunitiesRes: await HttpService.client.listCommunities({
- type_: "Local",
- sort: "Hot",
- limit: trendingFetchLimit,
- }),
- });
- }
-
fetchDataToken?: symbol;
async fetchData({
dataType,
@@ -893,10 +788,6 @@ export class Home extends Component {
i.setState({ showSubscribedMobile: !i.state.showSubscribedMobile });
}
- handleShowTrendingMobile(i: Home) {
- i.setState({ showTrendingMobile: !i.state.showTrendingMobile });
- }
-
handleShowSidebarMobile(i: Home) {
i.setState({ showSidebarMobile: !i.state.showSidebarMobile });
}
@@ -917,10 +808,14 @@ export class Home extends Component {
this.updateUrl({ pageCursor: nextPage });
}
- handleSortChange(val: SortType) {
+ handleSortChange(val: PostSortType) {
this.updateUrl({ sort: val, pageCursor: undefined });
}
+ handleCommentSortChange(val: CommentSortType) {
+ this.updateUrl({ sort: commentToPostSortType(val), pageCursor: undefined });
+ }
+
handleListingTypeChange(val: ListingType) {
this.updateUrl({ listingType: val, pageCursor: undefined });
}
diff --git a/src/shared/components/home/login.tsx b/src/shared/components/home/login.tsx
index 4a7723d8..01f3d781 100644
--- a/src/shared/components/home/login.tsx
+++ b/src/shared/components/home/login.tsx
@@ -3,7 +3,12 @@ import { isBrowser, refreshTheme } from "@utils/browser";
import { getQueryParams } from "@utils/helpers";
import { Component, linkEvent } from "inferno";
import { RouteComponentProps } from "inferno-router/dist/Route";
-import { GetSiteResponse, LoginResponse } from "lemmy-js-client";
+import {
+ GetSiteResponse,
+ LoginResponse,
+ OAuthProvider,
+ PublicOAuthProvider,
+} from "lemmy-js-client";
import { I18NextService, UserService } from "../../services";
import {
EMPTY_REQUEST,
@@ -15,7 +20,7 @@ import { toast } from "../../toast";
import { HtmlTags } from "../common/html-tags";
import { Spinner } from "../common/icon";
import PasswordInput from "../common/password-input";
-import TotpModal from "../common/totp-modal";
+import TotpModal from "../common/modal/totp-modal";
import { UnreadCounterService } from "../../services";
import { RouteData } from "../../interfaces";
import { IRoutePropsWithFetch } from "../../routes";
@@ -42,6 +47,7 @@ interface State {
};
siteRes: GetSiteResponse;
show2faModal: boolean;
+ showOAuthModal: boolean;
}
async function handleLoginSuccess(i: Login, loginRes: LoginResponse) {
@@ -52,16 +58,21 @@ async function handleLoginSuccess(i: Login, loginRes: LoginResponse) {
if (site.state === "success") {
UserService.Instance.myUserInfo = site.data.my_user;
+ const isoData = setIsoData(i.context);
+ isoData.site_res.oauth_providers = site.data.oauth_providers;
+ isoData.site_res.admin_oauth_providers = site.data.admin_oauth_providers;
refreshTheme();
}
const { prev } = i.props;
- prev
- ? i.props.history.replace(prev)
- : i.props.history.action === "PUSH"
- ? i.props.history.back()
- : i.props.history.replace("/");
+ if (prev) {
+ i.props.history.replace(prev);
+ } else if (i.props.history.action === "PUSH") {
+ i.props.history.back();
+ } else {
+ i.props.history.replace("/");
+ }
UnreadCounterService.Instance.updateAll();
}
@@ -105,6 +116,45 @@ async function handleLoginSubmit(i: Login, event: any) {
}
}
+export async function handleUseOAuthProvider(params: {
+ oauth_provider: OAuthProvider;
+ username?: string;
+ prev?: string;
+ answer?: string;
+ show_nsfw?: boolean;
+}) {
+ const redirectUri = `${window.location.origin}/oauth/callback`;
+
+ const state = crypto.randomUUID();
+ const requestUri =
+ params.oauth_provider.authorization_endpoint +
+ "?" +
+ [
+ `client_id=${encodeURIComponent(params.oauth_provider.client_id)}`,
+ `response_type=code`,
+ `scope=${encodeURIComponent(params.oauth_provider.scopes)}`,
+ `redirect_uri=${encodeURIComponent(redirectUri)}`,
+ `state=${state}`,
+ ].join("&");
+
+ // store state in local storage
+ localStorage.setItem(
+ "oauth_state",
+ JSON.stringify({
+ state,
+ oauth_provider_id: params.oauth_provider.id,
+ redirect_uri: redirectUri,
+ prev: params.prev ?? "/",
+ username: params.username,
+ answer: params.answer,
+ show_nsfw: params.show_nsfw,
+ expires_at: Date.now() + 5 * 60_000,
+ }),
+ );
+
+ window.location.assign(requestUri);
+}
+
function handleLoginUsernameChange(i: Login, event: any) {
i.setState(
prevState => (prevState.form.username_or_email = event.target.value.trim()),
@@ -138,12 +188,14 @@ export class Login extends Component {
},
siteRes: this.isoData.site_res,
show2faModal: false,
+ showOAuthModal: false,
};
constructor(props: any, context: any) {
super(props, context);
this.handleSubmitTotp = this.handleSubmitTotp.bind(this);
+ this.handleLoginWithProvider = this.handleLoginWithProvider.bind(this);
}
get documentTitle(): string {
@@ -172,6 +224,35 @@ export class Login extends Component {
+ {(this.state.siteRes.oauth_providers?.length || 0) > 0 && (
+ <>
+
);
}
@@ -194,6 +275,13 @@ export class Login extends Component{this.loginForm()}
+
+
+ {I18NextService.i18n.t("or")}
+
+
+
+
+ )}
+
+ + {I18NextService.i18n.t("oauth_login_with_provider")} +
+ {(this.state.siteRes.oauth_providers ?? []).map( + (provider: PublicOAuthProvider) => ( + + ), + )} +
diff --git a/src/shared/components/home/oauth/oauth-callback.tsx b/src/shared/components/home/oauth/oauth-callback.tsx
new file mode 100644
index 00000000..8d8ea3db
--- /dev/null
+++ b/src/shared/components/home/oauth/oauth-callback.tsx
@@ -0,0 +1,175 @@
+import { setIsoData } from "@utils/app";
+import { Component } from "inferno";
+import { refreshTheme } from "@utils/browser";
+import { GetSiteResponse, LoginResponse } from "lemmy-js-client";
+import { Spinner } from "../../common/icon";
+import { getQueryParams } from "@utils/helpers";
+import { IRoutePropsWithFetch } from "../../../routes";
+import { RouteData } from "../../../interfaces";
+import { I18NextService, UserService } from "../../../services";
+import { RouteComponentProps } from "inferno-router/dist/Route";
+import { UnreadCounterService } from "../../../services";
+import { HttpService } from "../../../services/HttpService";
+import { toast } from "../../../toast";
+
+interface OAuthCallbackProps {
+ code?: string;
+ state?: string;
+}
+
+export function getOAuthCallbackQueryParams(
+ source?: string,
+): OAuthCallbackProps {
+ return getQueryParams(
+ {
+ code: (code?: string) => code,
+ state: (state?: string) => state,
+ },
+ source,
+ );
+}
+
+type OAuthCallbackRouteProps = RouteComponentProps> &
+ OAuthCallbackProps;
+export type OAuthCallbackConfig = IRoutePropsWithFetch<
+ RouteData,
+ Record,
+ OAuthCallbackProps
+>;
+
+interface State {
+ siteRes: GetSiteResponse;
+}
+
+export class OAuthCallback extends Component {
+ private isoData = setIsoData(this.context);
+
+ state: State = {
+ siteRes: this.isoData.site_res,
+ };
+
+ constructor(props: any, context: any) {
+ super(props, context);
+ }
+
+ async componentDidMount() {
+ // store state in local storage
+ const local_oauth_state = JSON.parse(
+ localStorage.getItem("oauth_state") || "{}",
+ );
+ if (
+ !(
+ this.props.state &&
+ this.props.code &&
+ local_oauth_state?.state &&
+ local_oauth_state?.oauth_provider_id &&
+ local_oauth_state?.expires_at &&
+ this.props.state === local_oauth_state.state
+ ) ||
+ local_oauth_state.expires_at < Date.now()
+ ) {
+ // oauth failed or expired
+ toast(I18NextService.i18n.t("oauth_authorization_invalid"), "danger");
+ this.props.history.replace("/login");
+ } else {
+ const loginRes = await HttpService.client.authenticateWithOAuth({
+ code: this.props.code,
+ oauth_provider_id: local_oauth_state.oauth_provider_id,
+ redirect_uri: local_oauth_state.redirect_uri,
+ show_nsfw: local_oauth_state.show_nsfw,
+ username: local_oauth_state.username,
+ answer: local_oauth_state.answer,
+ });
+
+ switch (loginRes.state) {
+ case "success": {
+ if (loginRes.data.jwt) {
+ handleOAuthLoginSuccess(
+ this,
+ local_oauth_state.prev,
+ loginRes.data,
+ );
+ } else {
+ if (loginRes.data.verify_email_sent) {
+ toast(I18NextService.i18n.t("verify_email_sent"));
+ }
+ if (loginRes.data.registration_created) {
+ toast(I18NextService.i18n.t("registration_application_sent"));
+ }
+ this.props.history.push("/login");
+ }
+ break;
+ }
+ case "failed": {
+ let err_redirect = "/login";
+ switch (loginRes.err.message) {
+ case "registration_username_required":
+ case "registration_application_answer_required":
+ err_redirect = `/signup?sso_provider_id=${local_oauth_state.oauth_provider_id}`;
+ toast(I18NextService.i18n.t(loginRes.err.message), "danger");
+ break;
+ case "registration_application_is_pending":
+ toast(
+ I18NextService.i18n.t("registration_application_pending"),
+ "danger",
+ );
+ break;
+ case "registration_denied":
+ case "oauth_authorization_invalid":
+ case "oauth_login_failed":
+ case "oauth_registration_closed":
+ case "email_already_exists":
+ case "username_already_exists":
+ case "no_email_setup":
+ toast(I18NextService.i18n.t(loginRes.err.message), "danger");
+ break;
+ default:
+ toast(I18NextService.i18n.t("incorrect_login"), "danger");
+ break;
+ }
+ this.props.history.push(err_redirect);
+ }
+ }
+ }
+ }
+
+ get documentTitle(): string {
+ return `${I18NextService.i18n.t("login")} - ${
+ this.state.siteRes.site_view.site.name
+ }`;
+ }
+
+ render() {
+ return (
+ ;
+ onDelete: MouseEventHandler;
+};
+
+type TextInfoFieldProps = {
+ i18nKey: string;
+ data: string;
+};
+
+function TextInfoField({ i18nKey, data }: TextInfoFieldProps) {
+ return (
+
+
+ );
+}
diff --git a/src/shared/components/home/oauth/oauth-providers-tab.tsx b/src/shared/components/home/oauth/oauth-providers-tab.tsx
new file mode 100644
index 00000000..e6efa537
--- /dev/null
+++ b/src/shared/components/home/oauth/oauth-providers-tab.tsx
@@ -0,0 +1,204 @@
+import { Component, linkEvent } from "inferno";
+import { I18NextService } from "../../../services/I18NextService";
+import {
+ CreateOAuthProvider,
+ DeleteOAuthProvider,
+ EditOAuthProvider,
+ OAuthProvider,
+} from "lemmy-js-client";
+import OAuthProviderListItem from "./oauth-provider-list-item";
+import CreateOrEditOAuthProviderModal, {
+ CreateOrEditOAuthProviderModalData,
+} from "../../common/modal/create-or-edit-oauth-provider-modal";
+import ConfirmationModal from "../../common/modal/confirmation-modal";
+import { ProviderToEdit } from "@utils/types/oauth";
+
+type OAuthProvidersTabProps = {
+ oauthProviders: OAuthProvider[];
+ onEdit(form: EditOAuthProvider): Promise;
+ onCreate(form: CreateOAuthProvider): Promise;
+ onDelete(form: DeleteOAuthProvider): Promise;
+};
+
+type OAuthProvidersTabState = {
+ providerToDelete?: OAuthProvider;
+ createOrEditModalData?: CreateOrEditOAuthProviderModalData;
+};
+
+const PRESET_OAUTH_PROVIDERS: ProviderToEdit[] = [
+ {
+ display_name: "Privacy Portal",
+ issuer: "https://api.privacyportal.org/",
+ authorization_endpoint: "https://app.privacyportal.org/oauth/authorize",
+ token_endpoint: "https://api.privacyportal.org/oauth/token",
+ userinfo_endpoint: "https://api.privacyportal.org/oauth/userinfo",
+ id_claim: "sub",
+ scopes: "openid email",
+ auto_verify_email: true,
+ account_linking_enabled: true,
+ enabled: true,
+ },
+ // additional preset providers can be added here
+];
+
+function handleShowCreateOrEditProviderModal({
+ data,
+ tab,
+}: {
+ tab: OAuthProvidersTab;
+ data: CreateOrEditOAuthProviderModalData;
+}) {
+ tab.setState({
+ createOrEditModalData: data,
+ });
+}
+
+function handleCloseCreateOrEditModal(tab: OAuthProvidersTab) {
+ tab.setState({
+ createOrEditModalData: undefined,
+ });
+}
+
+function handleTryDeleteOauthProvider({
+ tab,
+ provider,
+}: {
+ tab: OAuthProvidersTab;
+ provider: OAuthProvider;
+}) {
+ tab.setState({ providerToDelete: provider });
+}
+
+function handleCloseDeleteConfirmationModal(tab: OAuthProvidersTab) {
+ tab.setState({ providerToDelete: undefined });
+}
+
+export default class OAuthProvidersTab extends Component<
+ OAuthProvidersTabProps,
+ OAuthProvidersTabState
+> {
+ state: OAuthProvidersTabState = {};
+
+ constructor(props: OAuthProvidersTabProps, context: any) {
+ super(props, context);
+
+ this.handleDeleteProvider = this.handleDeleteProvider.bind(this);
+ this.handleCreateOrEditProviderSubmit =
+ this.handleCreateOrEditProviderSubmit.bind(this);
+ }
+
+ render(
+ { oauthProviders }: Readonly,
+ {
+ providerToDelete,
+ createOrEditModalData,
+ }: Readonly,
+ ) {
+ return (
+ ({
key: rateLimitType,
diff --git a/src/shared/components/home/signup.tsx b/src/shared/components/home/signup.tsx
index 7c6c9471..2af157e6 100644
--- a/src/shared/components/home/signup.tsx
+++ b/src/shared/components/home/signup.tsx
@@ -1,6 +1,6 @@
import { setIsoData } from "@utils/app";
import { isBrowser } from "@utils/browser";
-import { resourcesSettled, validEmail } from "@utils/helpers";
+import { getQueryParams, resourcesSettled, validEmail } from "@utils/helpers";
import { scrollMixin } from "../mixins/scroll-mixin";
import { Component, linkEvent } from "inferno";
import { T } from "inferno-i18next-dess";
@@ -11,7 +11,7 @@ import {
LoginResponse,
SiteView,
} from "lemmy-js-client";
-import { joinLemmyUrl } from "../../config";
+import { joinLemmyUrl, validActorRegexPattern } from "../../config";
import { mdToHtml } from "../../markdown";
import { I18NextService, UserService } from "../../services";
import {
@@ -26,6 +26,13 @@ import { Icon, Spinner } from "../common/icon";
import { MarkdownTextArea } from "../common/markdown-textarea";
import PasswordInput from "../common/password-input";
import { RouteComponentProps } from "inferno-router/dist/Route";
+import { RouteData } from "../../interfaces";
+import { IRoutePropsWithFetch } from "../../routes";
+import { handleUseOAuthProvider } from "./login";
+
+interface SignupProps {
+ sso_provider_id?: string;
+}
interface State {
registerRes: RequestState;
@@ -45,11 +52,25 @@ interface State {
siteRes: GetSiteResponse;
}
+export function getSignupQueryParams(source?: string): SignupProps {
+ return getQueryParams(
+ {
+ sso_provider_id: (param?: string) => param,
+ },
+ source,
+ );
+}
+
+type SignupRouteProps = RouteComponentProps> &
+ SignupProps;
+export type SignupFetchConfig = IRoutePropsWithFetch<
+ RouteData,
+ Record,
+ SignupProps
+>;
+
@scrollMixin
-export class Signup extends Component<
- RouteComponentProps>,
- State
-> {
+export class Signup extends Component {
private isoData = setIsoData(this.context);
private audio?: HTMLAudioElement;
@@ -132,6 +153,8 @@ export class Signup extends Component<
registerForm() {
const siteView = this.state.siteRes.site_view;
+ const oauth_provider = getOAuthProvider(this);
+
return (
+
+ );
+ }
+}
+
+async function handleOAuthLoginSuccess(
+ i: OAuthCallback,
+ prev: string,
+ loginRes: LoginResponse,
+) {
+ UserService.Instance.login({
+ res: loginRes,
+ });
+ const site = await HttpService.client.getSite();
+
+ if (site.state === "success") {
+ UserService.Instance.myUserInfo = site.data.my_user;
+ refreshTheme();
+ }
+
+ if (prev) {
+ i.props.history.replace(prev);
+ } else if (i.props.history.action === "PUSH") {
+ i.props.history.back();
+ } else {
+ i.props.history.replace("/");
+ }
+
+ UnreadCounterService.Instance.updateAll();
+}
diff --git a/src/shared/components/home/oauth/oauth-provider-list-item.tsx b/src/shared/components/home/oauth/oauth-provider-list-item.tsx
new file mode 100644
index 00000000..e87ae3f1
--- /dev/null
+++ b/src/shared/components/home/oauth/oauth-provider-list-item.tsx
@@ -0,0 +1,98 @@
+import { OAuthProvider } from "lemmy-js-client";
+import { I18NextService } from "../../../services/I18NextService";
+import { Icon } from "../../common/icon";
+import { MouseEventHandler } from "inferno";
+
+type OAuthProviderListItemProps = {
+ provider: OAuthProvider;
+ onEdit: MouseEventHandler
+ {I18NextService.i18n.t(i18nKey)}
+ {data}
+
+ );
+}
+
+function boolToYesNo(value?: boolean) {
+ return I18NextService.i18n.t(value ? "yes" : "no");
+}
+
+export default function OAuthProviderListItem({
+ provider,
+ onEdit,
+ onDelete,
+}: OAuthProviderListItemProps) {
+ return (
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+ )}
+
+ );
+ }
+
+ async handleDeleteProvider() {
+ const id = this.state.providerToDelete?.id;
+
+ if (id !== undefined) {
+ await this.props.onDelete({ id });
+ }
+
+ this.setState({ providerToDelete: undefined });
+ }
+
+ async handleCreateOrEditProviderSubmit(
+ provider: CreateOAuthProvider | EditOAuthProvider,
+ ) {
+ if (this.state.createOrEditModalData?.type === "edit") {
+ await this.props.onEdit(provider as EditOAuthProvider);
+ } else {
+ await this.props.onCreate(provider as CreateOAuthProvider);
+ }
+
+ this.setState({
+ createOrEditModalData: undefined,
+ });
+ }
+}
diff --git a/src/shared/components/home/rate-limit-form.tsx b/src/shared/components/home/rate-limit-form.tsx
index 21b3364b..bef1440a 100644
--- a/src/shared/components/home/rate-limit-form.tsx
+++ b/src/shared/components/home/rate-limit-form.tsx
@@ -3,7 +3,7 @@ import classNames from "classnames";
import { Component, FormEventHandler, linkEvent } from "inferno";
import { EditSite, LocalSiteRateLimit } from "lemmy-js-client";
import { I18NextService } from "../../services";
-import { Spinner } from "../common/icon";
+import { Icon, Spinner } from "../common/icon";
import Tabs from "../common/tabs";
const rateLimitTypes = [
@@ -144,6 +144,10 @@ export default class RateLimitsForm extends Component<
{I18NextService.i18n.t("oauth_config")}
+ {oauthProviders.length > 0 ? ( + <> ++ {I18NextService.i18n.t("oauth_providers")} +
+-
+ {oauthProviders.map(provider => (
+
{I18NextService.i18n.t("no_oauth_providers_blurb")}
+ )}
+
+ {PRESET_OAUTH_PROVIDERS.length > 0 && (
+ + {I18NextService.i18n.t("oauth_provider_presets")} +
+-
+ {PRESET_OAUTH_PROVIDERS.map(provider => {
+ const isAlreadyUsed = oauthProviders.some(
+ p => p.issuer === provider.issuer,
+ );
+
+ return (
+
- + + + ); + })} +
{I18NextService.i18n.t("rate_limit_header")}
+
+
-
-
@@ -389,6 +439,19 @@ export class Signup extends Component<
password_verify,
username,
} = i.state.form;
+
+ const oauthProvider = getOAuthProvider(i);
+
+ // oauth registration
+ if (username && oauthProvider)
+ return handleUseOAuthProvider({
+ oauth_provider: oauthProvider,
+ username,
+ answer,
+ show_nsfw,
+ });
+
+ // normal registration
if (username && password && password_verify) {
i.setState({ registerRes: LOADING_REQUEST });
@@ -516,3 +579,9 @@ export class Signup extends Component<
return `data:image/png;base64,${captcha.png}`;
}
}
+
+function getOAuthProvider(signup: Signup) {
+ return (signup.state.siteRes.oauth_providers ?? []).find(
+ provider => provider.id === Number(signup.props?.sso_provider_id ?? -1),
+ );
+}
diff --git a/src/shared/components/home/site-form.tsx b/src/shared/components/home/site-form.tsx
index 43036559..f1967436 100644
--- a/src/shared/components/home/site-form.tsx
+++ b/src/shared/components/home/site-form.tsx
@@ -2,7 +2,6 @@ import { capitalizeFirstLetter, validInstanceTLD } from "@utils/helpers";
import {
Component,
InfernoKeyboardEvent,
- InfernoMouseEvent,
InfernoNode,
linkEvent,
} from "inferno";
@@ -64,7 +63,7 @@ export class SiteForm extends Component
-
- {!siteView.local_site.require_email_verification &&
- this.state.form.email &&
- !validEmail(this.state.form.email) && (
-
+ }
-
-
+
+
+
-
+
+ {!siteView.local_site.require_email_verification &&
+ this.state.form.email &&
+ !validEmail(this.state.form.email) && (
+
- )}
-
+
+ )}
-
+ {
+
+
+ }
-
-
+ {
+
+
+ }
+
+ )}
{siteView.local_site.registration_mode === "RequireApplication" && (
<>
@@ -296,7 +341,12 @@ export class Signup extends Component<
{this.state.registerRes.state === "loading" ? (
+
+
+
+
+
+
+
@@ -783,6 +801,7 @@ export class SiteForm extends Component {
enable_downvotes: stateSiteForm.enable_downvotes,
application_question: stateSiteForm.application_question,
registration_mode: stateSiteForm.registration_mode,
+ oauth_registration: stateSiteForm.oauth_registration,
require_email_verification: stateSiteForm.require_email_verification,
private_instance: stateSiteForm.private_instance,
default_theme: stateSiteForm.default_theme,
@@ -878,42 +897,6 @@ export class SiteForm extends Component {
this.setState(s => ((s.siteForm.legal_information = val), s));
}
- handleTaglineChange(i: SiteForm, index: number, val: string) {
- const taglines = i.state.siteForm.taglines;
- if (taglines) {
- taglines[index] = val;
- i.setState(i.state);
- }
- }
-
- handleDeleteTaglineClick(
- i: SiteForm,
- index: number,
- event: InfernoMouseEvent,
- ) {
- event.preventDefault();
- const taglines = i.state.siteForm.taglines;
- if (taglines) {
- taglines.splice(index, 1);
- i.state.siteForm.taglines = undefined;
- i.setState(i.state);
- i.state.siteForm.taglines = taglines;
- i.setState(i.state);
- }
- }
-
- handleAddTaglineClick(
- i: SiteForm,
- event: InfernoMouseEvent,
- ) {
- event.preventDefault();
- if (!i.state.siteForm.taglines) {
- i.state.siteForm.taglines = [];
- }
- i.state.siteForm.taglines.push("");
- i.setState(i.state);
- }
-
handleSiteApplicationQuestionChange(val: string) {
this.setState(s => ((s.siteForm.application_question = val), s));
}
@@ -933,6 +916,11 @@ export class SiteForm extends Component {
i.setState(i.state);
}
+ handleSiteOauthRegistration(i: SiteForm, event: any) {
+ i.state.siteForm.oauth_registration = event.target.checked;
+ i.setState(i.state);
+ }
+
handleSiteCommunityCreationAdminOnly(i: SiteForm, event: any) {
i.state.siteForm.community_creation_admin_only = event.target.checked;
i.setState(i.state);
diff --git a/src/shared/components/home/tagline-form.tsx b/src/shared/components/home/tagline-form.tsx
index ed93f466..5c08ce1d 100644
--- a/src/shared/components/home/tagline-form.tsx
+++ b/src/shared/components/home/tagline-form.tsx
@@ -1,49 +1,84 @@
import { capitalizeFirstLetter } from "@utils/helpers";
import { Component, InfernoMouseEvent, linkEvent } from "inferno";
-import { EditSite, Tagline } from "lemmy-js-client";
-import { I18NextService } from "../../services";
+import { Tagline } from "lemmy-js-client";
+import { HttpService, I18NextService } from "../../services";
import { Icon, Spinner } from "../common/icon";
import { MarkdownTextArea } from "../common/markdown-textarea";
import { tippyMixin } from "../mixins/tippy-mixin";
+import { Paginator } from "../common/paginator";
+import classNames from "classnames";
+import { isBrowser } from "@utils/browser";
+import { Prompt } from "inferno-router";
-interface TaglineFormProps {
- taglines: Array;
- onSaveSite(form: EditSite): void;
- loading: boolean;
+interface EditableTagline {
+ change?: "update" | "delete" | "create";
+ editMode?: boolean;
+ tagline: Tagline;
+}
+
+function markForUpdate(editable: EditableTagline) {
+ if (editable.change !== "create") {
+ editable.change = "update";
+ }
}
interface TaglineFormState {
- taglines: Array;
- editingRow?: number;
+ taglines: Array;
+ page: number;
+ loading: boolean;
}
@tippyMixin
-export class TaglineForm extends Component {
+export class TaglineForm extends Component<
+ Record,
+ TaglineFormState
+> {
state: TaglineFormState = {
- editingRow: undefined,
- taglines: this.props.taglines.map(x => x.content),
+ taglines: [],
+ page: 1,
+ loading: false,
};
constructor(props: any, context: any) {
super(props, context);
+ this.handlePageChange = this.handlePageChange.bind(this);
+ }
+
+ componentWillMount(): void {
+ if (isBrowser()) {
+ this.handlePageChange(1);
+ }
+ }
+
+ hasPendingChanges(): boolean {
+ return this.state.taglines.some(x => x.change);
}
render() {
return (
+
{I18NextService.i18n.t("taglines")}
-
+
| + | {this.state.taglines.map((cv, index) => ( | |
|---|---|---|
|
- {this.state.editingRow === index && (
+ {cv.editMode ? (
{cv.tagline.content}
+ )}
+ |
+
+ {cv.change === "update" && (
+
+ {cv} }
|
))}
+ {amAdmin() && (
+ <>
+
+ {showRegistrationDialog && (
+
@@ -829,7 +891,7 @@ export class Profile extends Component
@@ -557,14 +561,14 @@ export class Settings extends Component
- {I18NextService.i18n.t("blocked_users")}
-
-
-
-
-
{
instance =>
instance.domain.toLowerCase().includes(text.toLowerCase()) &&
!this.state.instanceBlocks.some(
- blockedInstance => blockedInstance.instance.id === instance.id,
+ blockedInstance => blockedInstance.id === instance.id,
),
) ?? [];
}
@@ -1496,14 +1498,6 @@ export class Settings extends Component
diff --git a/src/shared/components/post/post-form.tsx b/src/shared/components/post/post-form.tsx
index 0670dc08..9a658d73 100644
--- a/src/shared/components/post/post-form.tsx
+++ b/src/shared/components/post/post-form.tsx
@@ -27,7 +27,7 @@ import {
ghostArchiveUrl,
postMarkdownFieldCharacterLimit,
relTags,
- trendingFetchLimit,
+ similarPostFetchLimit,
webArchiveUrl,
} from "../../config";
import { PostFormParams } from "../../interfaces";
@@ -45,6 +45,14 @@ import { MarkdownTextArea } from "../common/markdown-textarea";
import { SearchableSelect } from "../common/searchable-select";
import { PostListings } from "./post-listings";
import { isBrowser } from "@utils/browser";
+import isMagnetLink, {
+ extractMagnetLinkDownloadName,
+} from "@utils/media/is-magnet-link";
+import {
+ getUnixTimeLemmy,
+ getUnixTime,
+ unixTimeToLocalDateStr,
+} from "@utils/helpers/get-unix-time";
const MAX_POST_TITLE_LENGTH = 200;
@@ -85,6 +93,8 @@ interface PostFormState {
honeypot?: string;
custom_thumbnail?: string;
alt_text?: string;
+ // Javascript treats this field as a string, that can't have timezone info.
+ scheduled_publish_time?: string;
};
suggestedPostsRes: RequestState
+
+
+
{
async fetchPageTitle() {
const url = this.state.form.url;
if (url && validURL(url)) {
- this.setState({ metadataRes: LOADING_REQUEST });
- this.setState({
- metadataRes: await HttpService.client.getSiteMetadata({ url }),
- });
+ // If its a magnet link, fill in the download name
+ if (isMagnetLink(url)) {
+ const title = extractMagnetLinkDownloadName(url);
+ if (title) {
+ this.setState({
+ metadataRes: {
+ state: "success",
+ data: {
+ metadata: { title },
+ },
+ },
+ });
+ }
+ } else {
+ this.setState({ metadataRes: LOADING_REQUEST });
+ this.setState({
+ metadataRes: await HttpService.client.getSiteMetadata({ url }),
+ });
+ }
}
}
@@ -825,7 +884,7 @@ export class PostForm extends Component
+
+
+
+
+ );
+ }
- if (this.isoData.showAdultConsentModal) {
- return <>;
- }
+ get videoBlock() {
+ const post = this.postView.post;
+ const url = post.url;
// if direct video link or embedded video link
- if (url && (isVideo(url) || post.embed_video_url)) {
+ if (url && isVideo(url)) {
return (
-
+
+ {(type === "All" || type === "Posts") && (
+
+
+
+ );
+ }
+ }
+
+ get img() {
+ if (this.isoData.showAdultConsentModal) {
+ return <>;
}
- if (this.imageSrc) {
+ // Use the full-size image for expands
+ const post = this.postView.post;
+ const url = post.url;
+ const thumbnail = post.thumbnail_url;
+ const imageSrc = url && isImage(url) ? url : thumbnail;
+
+ if (imageSrc) {
return (
<>
@@ -256,7 +297,7 @@ export class PostListing extends Component
@@ -278,26 +319,12 @@ export class PostListing extends Component- {url && !(hostname(url) === getExternalHost()) && ( - - {hostname(url)} - - )} - - ); + if (url) { + // If its a torrent link, extract the download name + const linkName = isMagnetLink(url) + ? extractMagnetLinkDownloadName(url) + : !(hostname(url) === getExternalHost()) + ? hostname(url) + : null; + + if (linkName) { + return ( ++ {url && !(hostname(url) === getExternalHost()) && ( + + {linkName} + + )} + + ); + } + } } duplicatesLine() { @@ -878,7 +916,7 @@ export class PostListing extends Component
+
+
+
+ )}
|