})
+
+ })
- {cache.getUserName(senderId)} - {props.request.message} + {req.sender.miiName} + {req.message} {' '} - {moment(Number(props.request.sent) * 1000).fromNow()} + {moment(req.sentAt).fromNow()}
-
{props.requests.length === 0 ?
+
+
+ );
+}
+
+function PostDeletedNotificationView(props: NotificationItemTypeProps
+
+
-
+
+ );
+}
+
+function SystemNotificationView(props: NotificationItemTypeProps
-
+ return (
+ <>
+
+
+
+
-
- );
+
+
Invalid notification type!
;
diff --git a/apps/juxtaposition-ui/src/services/juxt-web/views/ctr/post.tsx b/apps/juxtaposition-ui/src/services/juxt-web/views/ctr/post.tsx
index f9c47ccd..2d88a20a 100644
--- a/apps/juxtaposition-ui/src/services/juxt-web/views/ctr/post.tsx
+++ b/apps/juxtaposition-ui/src/services/juxt-web/views/ctr/post.tsx
@@ -1,7 +1,6 @@
import cx from 'classnames';
import moment from 'moment';
import { useUrl } from '@/services/juxt-web/views/common/hooks/useUrl';
-import { useCache } from '@/services/juxt-web/views/common/hooks/useCache';
import { useUser } from '@/services/juxt-web/views/common/hooks/useUser';
import { CtrMiiIcon } from '@/services/juxt-web/views/ctr/components/ui/CtrMiiIcon';
import { CtrButton } from '@/services/juxt-web/views/ctr/components/ui/CtrButton';
@@ -13,18 +12,18 @@ function CtrPostScreenshot(props: PostScreenshotProps): ReactNode {
const url = useUrl();
const post = props.post;
if (!post.screenshot) {
- return <>;
+ return null;
}
- if (post.screenshot_aspect && post.screenshot_thumb) {
+ if (post.screenshot.aspectRatio && post.screenshot.imageUrlThumbnail) {
// modern type
return (
+ + + + {post.topicTag} + + + ) : null }
}){kind=icon}
+ }){kind=icon}
- {cache.getCommunityName(post.community_id ?? '')}
+ {post.community?.name}
)
: null}
- { post.is_spoiler
+ { post.isSpoiler
? (
@@ -102,15 +103,15 @@ export function CtrPostView(props: PostViewProps): ReactNode {
: null }
- { props.isMainPost && post.yeahs.length > 0
+ { props.isMainPost && post.yeahsBy.length > 0
? (
<>
- {post.body !== ''
+ {post.body
? (
})
+ })
)
: null}
{/* TODO add post.url back */}
@@ -118,20 +119,20 @@ export function CtrPostView(props: PostViewProps): ReactNode {
{post.body}
) : null}
+
)
: null}
{/* TODO add post.url back */}
@@ -118,20 +119,20 @@ export function CtrPostView(props: PostViewProps): ReactNode {
{ post.yeahs.length }
+ count: { post.yeahsBy.length }
}}
/>
- {post.yeahs.slice(0, 10).map(pid => (
+ {post.yeahsBy.slice(0, 10).map(({ pid }) => (
diff --git a/apps/juxtaposition-ui/src/services/juxt-web/views/ctr/postPageView.tsx b/apps/juxtaposition-ui/src/services/juxt-web/views/ctr/postPageView.tsx
index 6d587cb7..b41391c5 100644
--- a/apps/juxtaposition-ui/src/services/juxt-web/views/ctr/postPageView.tsx
+++ b/apps/juxtaposition-ui/src/services/juxt-web/views/ctr/postPageView.tsx
@@ -21,7 +21,7 @@ export function CtrPostPageView(props: PostPageViewProps): ReactNode {
header={header}
data-toolbar-mode="normal"
>
- {post.screen_name}
+ {post.author.miiName}
}){kind=icon}
-
+ }){kind=icon}
+
{community.name}
diff --git a/apps/juxtaposition-ui/src/services/juxt-web/views/ctr/userSettingsView.tsx b/apps/juxtaposition-ui/src/services/juxt-web/views/ctr/userSettingsView.tsx
index cb613ad2..e26b25e6 100644
--- a/apps/juxtaposition-ui/src/services/juxt-web/views/ctr/userSettingsView.tsx
+++ b/apps/juxtaposition-ui/src/services/juxt-web/views/ctr/userSettingsView.tsx
@@ -5,6 +5,7 @@ import type { ReactNode } from 'react';
import type { UserSettingsViewProps } from '@/services/juxt-web/views/web/userSettingsView';
export function CtrUserSettingsView(props: UserSettingsViewProps): ReactNode {
+ const settings = props.userSettings;
return (
@@ -22,28 +23,28 @@ export function CtrUserSettingsView(props: UserSettingsViewProps): ReactNode {
diff --git a/apps/juxtaposition-ui/src/services/juxt-web/views/portal/firstRunView.tsx b/apps/juxtaposition-ui/src/services/juxt-web/views/portal/firstRunView.tsx
index a93a1f36..d7ce4199 100644
--- a/apps/juxtaposition-ui/src/services/juxt-web/views/portal/firstRunView.tsx
+++ b/apps/juxtaposition-ui/src/services/juxt-web/views/portal/firstRunView.tsx
@@ -85,7 +85,7 @@ export function PortalFirstRunView(_props: FirstRunViewProps): ReactNode {
-
-
-
+
+
@@ -33,14 +31,10 @@ function PortalFriendRequestItem(props: FriendRequestItemProps): ReactNode {
}
export function PortalFriendRequestListView(props: FriendRequestListViewProps): ReactNode {
- const cache = useCache();
return (
@@ -138,10 +136,8 @@ export function PortalNewPostView(props: NewPostViewProps): ReactNode {
}
export function PortalNewPostPage(props: NewPostViewProps): ReactNode {
- const cache = useCache();
- const name = props.name ?? cache.getUserName(props.pid ?? 0);
return (
-
+
): ReactNode {
+ const NickName = ({ user }: { user: ShallowUser | null | undefined }): ReactNode => {user?.miiName ?? null};
+ const users = [...props.notif.content.users].sort((a, b) => new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime());
+ const latestUser = users[0];
- let i18nKey: TranslationKey = 'notifications.new_follower/one';
- if (notif.users.length === 2) {
- i18nKey = 'notifications.new_follower/two';
- }
- if (notif.users.length === 3) {
- i18nKey = 'notifications.new_follower/three';
- }
- if (notif.users.length > 3) {
- i18nKey = 'notifications.new_follower/multiple';
+ let i18nKey: TranslationKey = 'notifications.new_follower.message/one';
+ if (users.length === 2) {
+ i18nKey = 'notifications.new_follower.message/two';
+ }
+ if (users.length === 3) {
+ i18nKey = 'notifications.new_follower.message/three';
+ }
+ if (users.length > 3) {
+ i18nKey = 'notifications.new_follower.message/multiple';
+ }
+
+ return (
+ <>
+ ): ReactNode {
+ let i18nKey: TranslationKey = 'notifications.post_deleted.post_removed';
+ if (props.notif.content.reason) {
+ i18nKey = 'notifications.post_deleted.post_removed_for_reason';
+ }
+ if (props.notif.content.postType === 'comment') {
+ i18nKey = 'notifications.post_deleted.comment_removed';
+ if (props.notif.content.reason) {
+ i18nKey = 'notifications.post_deleted.comment_removed_for_reason';
}
+ }
- return (
- <>
- ): ReactNode {
+ let i18nKey: TranslationKey = 'notifications.limited_from_posting.message';
+ if (props.notif.content.reason) {
+ i18nKey = 'notifications.limited_from_posting.message_with_reason';
+ }
+ if (props.notif.content.until) {
+ i18nKey = 'notifications.limited_from_posting.temporary';
+ if (props.notif.content.reason) {
+ i18nKey = 'notifications.limited_from_posting.temporary_with_reason';
+ }
}
- if (notif.type === 'notice') {
- return (
- <>
- ): ReactNode {
+ return (
+ <>
+ 
);
} else {
@@ -32,7 +31,7 @@ function PortalPostScreenshot(props: PostScreenshotProps): ReactNode {
return (
})
);
}
@@ -40,21 +39,20 @@ function PortalPostScreenshot(props: PostScreenshotProps): ReactNode {
export function PortalPostView(props: PostViewProps): ReactNode {
const url = useUrl();
- const cache = useCache();
const user = useUser();
const post = props.post;
- const hasYeahed = post.yeahs && post.yeahs.indexOf(user.pid) !== -1;
+ const hasYeahed = post.yeahsBy.some(v => v.pid === user.pid);
const isModerator = user.perms.moderator;
// TODO implement moderator removed post logic
const content = (
<>
-
- 
+
+ 
- {post.screen_name}
+ {post.author.miiName}
{' '}
{'- '}
- {moment(post.created_at).fromNow()}
+ {moment(post.createdAt).fromNow()}
- {post.topic_tag
+ {post.topicTag
? (
-
+
{/* TODO this has been modified due to inbalanced tags */}
})
+ })
- {cache.getCommunityName(post.community_id ?? '')}
+ {post.community?.name}
)
: null}
- { post.is_spoiler
+ { post.isSpoiler
? (
)
: null}
- { props.isReply && (post.pid === user.pid || isModerator)
+ { props.isReply && (post.author.pid === user.pid || isModerator)
? (
- { props.isMainPost && post.yeahs.length > 0
+ { props.isMainPost && post.yeahsBy.length > 0
? (
<>
diff --git a/apps/juxtaposition-ui/src/services/juxt-web/views/portal/postPageView.tsx b/apps/juxtaposition-ui/src/services/juxt-web/views/portal/postPageView.tsx
index e93c4281..e9e88496 100644
--- a/apps/juxtaposition-ui/src/services/juxt-web/views/portal/postPageView.tsx
+++ b/apps/juxtaposition-ui/src/services/juxt-web/views/portal/postPageView.tsx
@@ -9,7 +9,8 @@ import type { PostPageViewProps } from '@/services/juxt-web/views/web/postPageVi
export function PortalPostPageView(props: PostPageViewProps): ReactNode {
const user = useUser();
const { post } = props;
- const pageTitle = !post.removed ? post.screen_name : 'Removed Post';
+ const removedData = post.moderation?.removed;
+ const pageTitle = !removedData ? post.author.miiName : 'Removed Post';
return (
@@ -17,7 +18,7 @@ export function PortalPostPageView(props: PostPageViewProps): ReactNode {
diff --git a/apps/juxtaposition-ui/src/services/juxt-web/views/portal/userPageFollowingView.tsx b/apps/juxtaposition-ui/src/services/juxt-web/views/portal/userPageFollowingView.tsx
index 6e612e53..7dc1fddb 100644
--- a/apps/juxtaposition-ui/src/services/juxt-web/views/portal/userPageFollowingView.tsx
+++ b/apps/juxtaposition-ui/src/services/juxt-web/views/portal/userPageFollowingView.tsx
@@ -19,9 +19,9 @@ export function PortalUserPageFollowingView(props: UserPageFollowingViewProps):
))}
{props.communities.map(community => (
-
-
-
+
+
+
+
+
- {cache.getUserName(senderId)} - {props.request.message} + {req.sender.miiName} + {req.message} {' '} - {moment(Number(props.request.sent) * 1000).fromNow()} + {moment(req.sentAt).fromNow()}
-
{props.requests.length === 0 ?
+
+
+ );
+}
+
+function PostDeletedNotificationView(props: NotificationItemTypeProps
+
+
-
+
+ );
+}
+
+function LimitedFromPostingNotificationView(props: NotificationItemTypeProps
-
-
-
-
- {notif.content}
-
- {' '}
- {humanFromNow(notif.updatedAt)}
-
+ return (
+ <>
+
+
+ );
+}
+
+function SystemNotificationView(props: NotificationItemTypePropsInvalid notification type!
;
diff --git a/apps/juxtaposition-ui/src/services/juxt-web/views/portal/post.tsx b/apps/juxtaposition-ui/src/services/juxt-web/views/portal/post.tsx
index 58ed3e7b..487f2243 100644
--- a/apps/juxtaposition-ui/src/services/juxt-web/views/portal/post.tsx
+++ b/apps/juxtaposition-ui/src/services/juxt-web/views/portal/post.tsx
@@ -1,7 +1,6 @@
import cx from 'classnames';
import moment from 'moment';
import { useUrl } from '@/services/juxt-web/views/common/hooks/useUrl';
-import { useCache } from '@/services/juxt-web/views/common/hooks/useCache';
import { useUser } from '@/services/juxt-web/views/common/hooks/useUser';
import { PortalUIIcon } from '@/services/juxt-web/views/portal/components/ui/PortalUIIcon';
import { T } from '@/services/juxt-web/views/common/components/T';
@@ -13,18 +12,18 @@ function PortalPostScreenshot(props: PostScreenshotProps): ReactNode {
const post = props.post;
if (!post.screenshot) {
- return <>;
+ return null;
}
- if (post.screenshot_aspect) {
+ if (post.screenshot.aspectRatio) {
// modern type
return (
+
- {cache.getCommunityName(post.community_id ?? '')}
+ {post.community?.name}
)
: null}
- { post.is_spoiler
+ { post.isSpoiler
? (
@@ -106,9 +104,9 @@ export function PortalPostView(props: PostViewProps): ReactNode {
className="post-content"
data-href={!props.isReply ? `/posts/${post.id}` : undefined}
>
- {post.body !== '' ? 
: null}
+ {post.painting ? 
: null}
{/* TODO add post.url back */}
@@ -123,14 +121,14 @@ export function PortalPostView(props: PostViewProps): ReactNode {
{' '}
- { props.isReply && post.pid !== user.pid && !isModerator
+ { props.isReply && post.author.pid !== user.pid && !isModerator
? (
{post.body}
: null} + {post.body ?{post.body}
: null}
@@ -141,10 +139,10 @@ export function PortalPostView(props: PostViewProps): ReactNode {
? (
<>
{' '}
- {post.empathy_count}
+ {post.stats.empathyCount}
{ !props.isReply
? (
- {post.reply_count}
+ {post.stats.replyCount}
)
: null}
{' '}
@@ -155,22 +153,22 @@ export function PortalPostView(props: PostViewProps): ReactNode {
{post.empathy_count}
+ count: {post.stats.empathyCount}
}}
/>
- {post.yeahs.slice(0, 9).map(yeah => (
-
- })
+ {post.yeahsBy.slice(0, 9).map(({ pid }) => (
+
+ })
))}
@@ -185,10 +183,10 @@ export function PortalPostView(props: PostViewProps): ReactNode {
id={`post-${post.id}`}
className={cx('post', {
reply: props.isReply,
- spoiler: post.is_spoiler
+ spoiler: post.isSpoiler
})}
>
- {post.removed
+ {post.moderation?.removed
? (
+ {post.yeahsBy.slice(0, 9).map(({ pid }) => (
+
+
))}
{pageTitle}
- {!post.removed && props.canPost + {!removedData && props.canPost ? ( ) : null} - {!post.removed + {!removedData ? ( - post.pid === user.pid + post.author.pid === user.pid ? (
-
+
+
{community.name}
diff --git a/apps/juxtaposition-ui/src/services/juxt-web/views/portal/userSettingsView.tsx b/apps/juxtaposition-ui/src/services/juxt-web/views/portal/userSettingsView.tsx
index 39f552f7..44997fd0 100644
--- a/apps/juxtaposition-ui/src/services/juxt-web/views/portal/userSettingsView.tsx
+++ b/apps/juxtaposition-ui/src/services/juxt-web/views/portal/userSettingsView.tsx
@@ -5,6 +5,7 @@ import type { ReactNode } from 'react';
import type { UserSettingsViewProps } from '@/services/juxt-web/views/web/userSettingsView';
export function PortalUserSettingsView(props: UserSettingsViewProps): ReactNode {
+ const settings = props.userSettings;
return (
diff --git a/apps/juxtaposition-ui/src/services/juxt-web/views/web/admin/automodLogListView.tsx b/apps/juxtaposition-ui/src/services/juxt-web/views/web/admin/automodLogListView.tsx
index 1bb567e1..6c225641 100644
--- a/apps/juxtaposition-ui/src/services/juxt-web/views/web/admin/automodLogListView.tsx
+++ b/apps/juxtaposition-ui/src/services/juxt-web/views/web/admin/automodLogListView.tsx
@@ -3,7 +3,6 @@ import { WebNavBar } from '@/services/juxt-web/views/web/navbar';
import { WebAdminCenterItems, WebModerationTabs } from '@/services/juxt-web/views/web/admin/admin';
import { useUrl } from '@/services/juxt-web/views/common/hooks/useUrl';
import { WebMiiIcon } from '@/services/juxt-web/views/web/components/ui/WebMiiIcon';
-import { useCache } from '@/services/juxt-web/views/common/hooks/useCache';
import { humanDate, humanFromNow } from '@/util';
import type { ReactNode } from 'react';
import type { AutomodLog } from '@/api/generated';
@@ -56,20 +55,18 @@ function LogBodyWithMatches({ log }: AutomodLogItemViewProps): ReactNode {
}
export function AutomodLogItem({ log }: AutomodLogItemViewProps): ReactNode {
- const cache = useCache();
-
return (
+ Create post
+
+ )
+ : null}
);
}
+
+export function WebNewPostPage(props: NewPostViewProps): ReactNode {
+ const user = useUser();
+
+ let content =
+
+
+
+ {content}
+
+
+ );
+}
diff --git a/apps/juxtaposition-ui/src/services/juxt-web/views/web/notificationListView.tsx b/apps/juxtaposition-ui/src/services/juxt-web/views/web/notificationListView.tsx
index 8cf00c93..bccdde43 100644
--- a/apps/juxtaposition-ui/src/services/juxt-web/views/web/notificationListView.tsx
+++ b/apps/juxtaposition-ui/src/services/juxt-web/views/web/notificationListView.tsx
@@ -1,13 +1,12 @@
-import moment from 'moment';
import { WebRoot, WebWrapper } from '@/services/juxt-web/views/web/root';
import { WebNavBar } from '@/services/juxt-web/views/web/navbar';
import { WebReportModalView } from '@/services/juxt-web/views/web/reportModalView';
import { useUrl } from '@/services/juxt-web/views/common/hooks/useUrl';
-import { useCache } from '@/services/juxt-web/views/common/hooks/useCache';
import { T } from '@/services/juxt-web/views/common/components/T';
+import { humanDate, humanFromNow } from '@/util';
import type { ReactNode } from 'react';
import type { TranslationKey } from '@/services/juxt-web/views/common/components/T';
-import type { Notification } from '@/api/generated';
+import type { FollowNotification, LimitedFromPostingNotification, Notification, PostDeletedNotification, ShallowUser, SystemNotification } from '@/api/generated';
export type NotificationWrapperViewProps = {
children?: ReactNode;
@@ -21,71 +20,179 @@ export type NotificationItemProps = {
notification: Notification;
};
-function WebNotificationItem(props: NotificationItemProps): ReactNode {
+export type NotificationItemTypeProps = {
+ data: Notification;
+ notif: T;
+};
+
+function FollowNotificationView(props: NotificationItemTypeProps): ReactNode {
const url = useUrl();
- const cache = useCache();
- const notif = props.notification;
- if (notif.type === 'follow') {
- const NickName = ({ userId }: { userId: string | number | null | undefined }): ReactNode => {userId ? cache.getUserName(Number(userId)) : null};
+ const NickName = ({ user }: { user: ShallowUser | null | undefined }): ReactNode => {user?.miiName ?? 'Nobody'};
+ const users = [...props.notif.content.users].sort((a, b) => new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime());
+ const latestUser = users[0];
- let i18nKey: TranslationKey = 'notifications.new_follower/one';
- if (notif.users.length === 2) {
- i18nKey = 'notifications.new_follower/two';
- }
- if (notif.users.length === 3) {
- i18nKey = 'notifications.new_follower/three';
- }
- if (notif.users.length > 3) {
- i18nKey = 'notifications.new_follower/multiple';
+ let i18nKey: TranslationKey = 'notifications.new_follower.message/one';
+ if (users.length === 2) {
+ i18nKey = 'notifications.new_follower.message/two';
+ }
+ if (users.length === 3) {
+ i18nKey = 'notifications.new_follower.message/three';
+ }
+ if (users.length > 3) {
+ i18nKey = 'notifications.new_follower.message/multiple';
+ }
+
+ return (
+ ): ReactNode {
+ let i18nKey: TranslationKey = 'notifications.post_deleted.post_removed';
+ if (props.notif.content.reason) {
+ i18nKey = 'notifications.post_deleted.post_removed_for_reason';
+ }
+ if (props.notif.content.postType === 'comment') {
+ i18nKey = 'notifications.post_deleted.comment_removed';
+ if (props.notif.content.reason) {
+ i18nKey = 'notifications.post_deleted.comment_removed_for_reason';
}
+ }
- return (
- ): ReactNode {
+ let i18nKey: TranslationKey = 'notifications.limited_from_posting.message';
+ if (props.notif.content.reason) {
+ i18nKey = 'notifications.limited_from_posting.message_with_reason';
+ }
+ if (props.notif.content.until) {
+ i18nKey = 'notifications.limited_from_posting.temporary';
+ if (props.notif.content.reason) {
+ i18nKey = 'notifications.limited_from_posting.temporary_with_reason';
+ }
}
- if (notif.type === 'notice') {
- return (
- | Post;
+ post: Post;
};
export function WebPostScreenshot(props: PostScreenshotProps): ReactNode {
const url = useUrl();
const post = props.post;
if (!post.screenshot) {
- return <>;
+ return null;
}
- return ;
+ return })
;
}
export type PostViewProps = {
userContent?: SelfContent | null;
- post: InferSchemaType | Post;
+ post: Post;
isReply?: boolean;
isMainPost?: boolean;
};
@@ -34,15 +31,13 @@ export type PostViewProps = {
export function WebPostView(props: PostViewProps): ReactNode {
const url = useUrl();
const user = useUser();
- const cache = useCache();
const post = props.post;
const isModerator = user.perms.moderator;
- const canAccessContent = !post.removed || isModerator;
- const yeahed = !!props.userContent && !!post.yeahs && post.yeahs.includes(user.pid);
+ const yeahed = post.yeahsBy.some(v => v.pid === user.pid);
let removedPostPart = null;
- if (post.removed) {
+ if (post.moderation?.removed) {
removedPostPart = (
@@ -53,34 +48,34 @@ export function WebPostView(props: PostViewProps): ReactNode {
const contentPart = (
<>
@@ -115,7 +110,7 @@ export function WebPostView(props: PostViewProps): ReactNode {
aria-pressed={yeahed}
>
-
);
diff --git a/apps/juxtaposition-ui/src/services/juxt-web/views/web/admin/moderate-user/moderateUserReportsView.tsx b/apps/juxtaposition-ui/src/services/juxt-web/views/web/admin/moderate-user/moderateUserReportsView.tsx
index f5493132..c5b2871e 100644
--- a/apps/juxtaposition-ui/src/services/juxt-web/views/web/admin/moderate-user/moderateUserReportsView.tsx
+++ b/apps/juxtaposition-ui/src/services/juxt-web/views/web/admin/moderate-user/moderateUserReportsView.tsx
@@ -1,5 +1,4 @@
import moment from 'moment';
-import { useCache } from '@/services/juxt-web/views/common/hooks/useCache';
import { useUrl } from '@/services/juxt-web/views/common/hooks/useUrl';
import { WebPostView } from '@/services/juxt-web/views/web/post';
import { AutomodLogItem } from '@/services/juxt-web/views/web/admin/automodLogListView';
@@ -21,7 +20,6 @@ type ModerateUserReportProps = {
function ModerateUserReportView(props: ModerateUserReportProps): ReactNode {
const { reporter, resolved } = props.report;
const createdAt = new Date(props.report.createdAt);
- const cache = useCache();
const url = useUrl();
return (
@@ -37,7 +35,7 @@ function ModerateUserReportView(props: ModerateUserReportProps): ReactNode {
Reported By:
{' '}
- {cache.getUserName(reporter.pid)}
+ {reporter.user?.miiName ?? 'Unknown'}
{' '}
{moment(createdAt).fromNow()}
@@ -65,7 +63,7 @@ function ModerateUserReportView(props: ModerateUserReportProps): ReactNode {
Resolved By:
{' '}
- {resolved.pid ? cache.getUserName(resolved.pid) : 'Nobody'}
+ {resolved.pid ? resolved.user?.miiName : 'Nobody'}
{' '}
{moment(resolved.resolvedAt).fromNow()}
diff --git a/apps/juxtaposition-ui/src/services/juxt-web/views/web/admin/moderate-user/moderateUserView.tsx b/apps/juxtaposition-ui/src/services/juxt-web/views/web/admin/moderate-user/moderateUserView.tsx
index c23d3a9c..2bc553b9 100644
--- a/apps/juxtaposition-ui/src/services/juxt-web/views/web/admin/moderate-user/moderateUserView.tsx
+++ b/apps/juxtaposition-ui/src/services/juxt-web/views/web/admin/moderate-user/moderateUserView.tsx
@@ -5,6 +5,7 @@ import { WebNavBar } from '@/services/juxt-web/views/web/navbar';
import { WebUserPageMeta, WebUserTier } from '@/services/juxt-web/views/web/userPageView';
import { useUrl } from '@/services/juxt-web/views/common/hooks/useUrl';
import { T } from '@/services/juxt-web/views/common/components/T';
+import { WebReportModalView } from '@/services/juxt-web/views/web/reportModalView';
import type { ReactNode } from 'react';
import type { AdminUserProfile } from '@/api/generated';
@@ -109,6 +110,7 @@ export function WebModerateUserView(props: ModerateUserViewProps): ReactNode {
-
{props.communities.map(community => (
-
- +
-
@@ -49,7 +49,7 @@ export function WebManageCommunityView(props: ManageCommunityViewProps): ReactNo- +
))}
-
{props.removedPosts.length === 0 ?
-
- -+
-
+- -+})
-
-
-
-
- Removed By:
+ {props.removedPosts.map((post) => {
+ const removed = post.moderation?.removed;
+ if (!removed) {
+ return Post {post.id} not accessible
; // Should be impossible + } + + return ( +- +
- ))} ++-+
-+ +-})
+
+
+
+
+ Removed By:
+ {' '}
+ {removed.removedBy?.miiName ?? 'Nobody'}
+
{' '}
- {post.removed_by ? cache.getUserName(post.removed_by) : 'Nobody'}
-
- {' '}
- {moment(post.removed_at).fromNow()}
-
-
- - {post.removed_reason} -
+ {moment(removed.removedAt).fromNow()} + + ++ {removed.reason} +
+ - -- +
+ );
+ })}
- +
There's nothing here...
: null} - {props.removedPosts.map(post => ( -
+
+ );
+ }
+
+ return (
+ Posting is disabled on web
+
+
+
+
+ })
+
+
+
+
+
+ );
+}
+
+function PostDeletedNotificationView(props: NotificationItemTypeProps
+
+
+
+
+
-
- })
-
-
-
-
-
+ );
+}
+
+function LimitedFromPostingNotificationView(props: NotificationItemTypeProps
-
-
-
-
- 
+
-
- 
-
-
-
- {notif.content}
-
- {' '}
- {moment(notif.updatedAt).fromNow()}
-
+ return (
+
+ );
+}
+
+function SystemNotificationView(props: NotificationItemTypeProps): ReactNode {
+ return (
+
- );
+
+
+
+ );
+}
+
+function WebNotificationItem(props: NotificationItemProps): ReactNode {
+ const notif = props.notification.notif;
+ if (notif.type === 'follow') {
+ return Invalid notification type!
;
diff --git a/apps/juxtaposition-ui/src/services/juxt-web/views/web/post.tsx b/apps/juxtaposition-ui/src/services/juxt-web/views/web/post.tsx
index b5872cfd..bfed562e 100644
--- a/apps/juxtaposition-ui/src/services/juxt-web/views/web/post.tsx
+++ b/apps/juxtaposition-ui/src/services/juxt-web/views/web/post.tsx
@@ -1,32 +1,29 @@
import cx from 'classnames';
import moment from 'moment';
import { useUrl } from '@/services/juxt-web/views/common/hooks/useUrl';
-import { useCache } from '@/services/juxt-web/views/common/hooks/useCache';
import { useUser } from '@/services/juxt-web/views/common/hooks/useUser';
import { WebUIIcon } from '@/services/juxt-web/views/web/components/ui/WebUIIcon';
import { T } from '@/services/juxt-web/views/common/components/T';
-import type { InferSchemaType } from 'mongoose';
import type { ReactNode } from 'react';
-import type { PostSchema } from '@/models/post';
import type { Post, SelfContent } from '@/api/generated';
export type PostScreenshotProps = {
- post: InferSchemaType
-
+
- { post.is_spoiler
+ { post.isSpoiler
? (
- {post.screen_name} + {post.author.miiName}
- { post.verified + { post.author.verified ? ( ✓ ) : null}- {moment(post.created_at).fromNow()} + {moment(post.createdAt).fromNow()} {' - '} - {cache.getCommunityName(post.community_id ?? '')} + {post.community ? {post.community.name} : null }
{post.empathy_count}
+{post.stats.empathyCount}
{/* Reply "button" */} @@ -125,14 +120,14 @@ export function WebPostView(props: PostViewProps): ReactNode { role="button" >{post.reply_count}
+{post.stats.replyCount}
{/* Hamburger menu */}-
- { !post.removed
+ { !post.moderation?.removed
? (
-
@@ -141,7 +136,7 @@ export function WebPostView(props: PostViewProps): ReactNode {
)
: null}
- { (isModerator || post.pid === user.pid) && !post.removed
+ { (isModerator || post.author.pid === user.pid) && !post.moderation?.removed
? (
-
@@ -155,6 +150,24 @@ export function WebPostView(props: PostViewProps): ReactNode { {' '}
+ { isModerator && post.isSpoiler
+ ? (
+ -
+
+ {' '} + +
+ )
+ : null}
+ { isModerator && !post.isSpoiler
+ ? (
+ -
+
+ {' '} + +
+ )
+ : null}
+ [] | Post[];
+ posts: Post[];
nextLink: string;
prevPageLink: string | null;
nextPageLink: string;
diff --git a/apps/juxtaposition-ui/src/services/juxt-web/views/web/postPageView.tsx b/apps/juxtaposition-ui/src/services/juxt-web/views/web/postPageView.tsx
index 19ecbee5..65a3815e 100644
--- a/apps/juxtaposition-ui/src/services/juxt-web/views/web/postPageView.tsx
+++ b/apps/juxtaposition-ui/src/services/juxt-web/views/web/postPageView.tsx
@@ -4,6 +4,8 @@ import { WebReportModalView } from '@/services/juxt-web/views/web/reportModalVie
import { WebPostView } from '@/services/juxt-web/views/web/post';
import { useUrl } from '@/services/juxt-web/views/common/hooks/useUrl';
import { T } from '@/services/juxt-web/views/common/components/T';
+import { useUser } from '@/services/juxt-web/views/common/hooks/useUser';
+import { WebUIIcon } from '@/services/juxt-web/views/web/components/ui/WebUIIcon';
import type { ReactNode } from 'react';
import type { GetUserDataResponse } from '@pretendonetwork/grpc/account/get_user_data_rpc';
import type { Community, Post, SelfContent } from '@/api/generated';
@@ -15,27 +17,28 @@ export type PostPageViewProps = {
community: Community;
replies: Post[];
canPost: boolean;
+ sort: 'newest-first' | 'oldest-first';
};
function PostHead(props: PostPageViewProps): ReactNode {
const url = useUrl();
const post = props.post;
- const pageTitle = T.str('post.title', { username: post.screen_name });
+ const pageTitle = T.str('post.title', { username: post.author.miiName });
- if (post.removed) {
+ if (post.moderation?.removed) {
return (
{pageTitle}
);
}
- const title = `${post.screen_name} (@${props.postPNID.username}) - ${props.community.name}`;
+ const title = `${post.author.miiName} (@${props.postPNID.username}) - ${props.community.name}`;
const description = post.body + '\n\n' +
- `${post.reply_count} 🗨️ ${post.empathy_count} ❤️`;
+ `${post.stats.replyCount} 🗨️ ${post.stats.empathyCount} ❤️`;
let image: string | null = null;
if (post.screenshot) {
- image = url.cdn(post.screenshot);
+ image = url.cdn(post.screenshot.imageUrl);
} else if (post.painting) {
- image = url.cdn(`/paintings/${post.pid}/${post.id}.png`);
+ image = url.cdn(`/paintings/${post.author.pid}/${post.id}.png`);
}
return (
@@ -67,6 +70,8 @@ function PostHead(props: PostPageViewProps): ReactNode {
}
export function WebPostPageView(props: PostPageViewProps): ReactNode {
+ const user = useUser();
+
return (
@@ -75,6 +80,30 @@ export function WebPostPageView(props: PostPageViewProps): ReactNode {
{removedPostPart}
- {canAccessContent ? contentPart : null}
+ {contentPart}
);
}
diff --git a/apps/juxtaposition-ui/src/services/juxt-web/views/web/postList.tsx b/apps/juxtaposition-ui/src/services/juxt-web/views/web/postList.tsx
index 4adcd636..1ef1b338 100644
--- a/apps/juxtaposition-ui/src/services/juxt-web/views/web/postList.tsx
+++ b/apps/juxtaposition-ui/src/services/juxt-web/views/web/postList.tsx
@@ -1,14 +1,12 @@
import { WebPostView } from '@/services/juxt-web/views/web/post';
import { T } from '@/services/juxt-web/views/common/components/T';
import { buildUrl } from '@/services/juxt-web/views/common/hooks/useUrl';
-import type { InferSchemaType } from 'mongoose';
import type { ReactNode } from 'react';
-import type { PostSchema } from '@/models/post';
import type { Post, SelfContent } from '@/api/generated';
export type PostListViewProps = {
userContent: SelfContent | null;
- posts: InferSchemaType