Switch front end to use lemmy-js-client. Fixes #1090 (#1097)

* Switch front end to use lemmy-js-client. Fixes #1090

* Adding an HTTP client. Cleaning up Websocket client.
pull/1098/head
Dessalines 2020-08-20 10:50:26 -04:00 committed by GitHub
parent dbf231865d
commit 2080534744
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
46 changed files with 350 additions and 1685 deletions

1
README.md vendored
View File

@ -112,6 +112,7 @@ Each Lemmy server can set its own moderation policy; appointing site-wide admins
### Libraries ### Libraries
- [lemmy-js-client](https://github.com/LemmyNet/lemmy-js-client)
- [Kotlin API ( under development )](https://github.com/eiknat/lemmy-client) - [Kotlin API ( under development )](https://github.com/eiknat/lemmy-client)
## Support / Donate ## Support / Donate

View File

@ -94,7 +94,8 @@ pub fn config(cfg: &mut web::ServiceConfig, rate_limit: &RateLimit) {
web::post().to(route_post::<MarkCommentAsRead>), web::post().to(route_post::<MarkCommentAsRead>),
) )
.route("/like", web::post().to(route_post::<CreateCommentLike>)) .route("/like", web::post().to(route_post::<CreateCommentLike>))
.route("/save", web::put().to(route_post::<SaveComment>)), .route("/save", web::put().to(route_post::<SaveComment>))
.route("/list", web::get().to(route_get::<GetComments>)),
) )
// Private Message // Private Message
.service( .service(
@ -136,6 +137,7 @@ pub fn config(cfg: &mut web::ServiceConfig, rate_limit: &RateLimit) {
"/followed_communities", "/followed_communities",
web::get().to(route_get::<GetFollowedCommunities>), web::get().to(route_get::<GetFollowedCommunities>),
) )
.route("/join", web::post().to(route_post::<UserJoin>))
// Admin action. I don't like that it's in /user // Admin action. I don't like that it's in /user
.route("/ban", web::post().to(route_post::<BanUser>)) .route("/ban", web::post().to(route_post::<BanUser>))
// Account actions. I don't like that they're in /user maybe /accounts // Account actions. I don't like that they're in /user maybe /accounts

1
ui/package.json vendored
View File

@ -37,6 +37,7 @@
"inferno-router": "^7.4.2", "inferno-router": "^7.4.2",
"js-cookie": "^2.2.0", "js-cookie": "^2.2.0",
"jwt-decode": "^2.2.0", "jwt-decode": "^2.2.0",
"lemmy-js-client": "^1.0.8",
"markdown-it": "^11.0.0", "markdown-it": "^11.0.0",
"markdown-it-container": "^3.0.0", "markdown-it-container": "^3.0.0",
"markdown-it-emoji": "^1.4.0", "markdown-it-emoji": "^1.4.0",

View File

@ -21,7 +21,7 @@ import {
API, API,
} from './shared'; } from './shared';
import { PostResponse } from '../interfaces'; import { PostResponse } from 'lemmy-js-client';
let postRes: PostResponse; let postRes: PostResponse;
@ -136,7 +136,7 @@ test('Remove a comment from admin and community on the same instance', async ()
test('Remove a comment from admin and community on different instance', async () => { test('Remove a comment from admin and community on different instance', async () => {
let alphaUser = await registerUser(alpha); let alphaUser = await registerUser(alpha);
let newAlphaApi: API = { let newAlphaApi: API = {
url: alpha.url, client: alpha.client,
auth: alphaUser.jwt, auth: alphaUser.jwt,
}; };

View File

@ -1,5 +1,3 @@
import fetch from 'node-fetch';
import { import {
LoginForm, LoginForm,
LoginResponse, LoginResponse,
@ -20,15 +18,21 @@ import {
CommentForm, CommentForm,
DeleteCommentForm, DeleteCommentForm,
RemoveCommentForm, RemoveCommentForm,
SearchForm,
CommentResponse, CommentResponse,
CommunityForm, CommunityForm,
DeleteCommunityForm, DeleteCommunityForm,
RemoveCommunityForm, RemoveCommunityForm,
GetUserMentionsForm,
CommentLikeForm, CommentLikeForm,
CreatePostLikeForm, CreatePostLikeForm,
PrivateMessageForm, PrivateMessageForm,
EditPrivateMessageForm, EditPrivateMessageForm,
DeletePrivateMessageForm, DeletePrivateMessageForm,
GetFollowedCommunitiesForm,
GetPrivateMessagesForm,
GetSiteForm,
GetPostForm,
PrivateMessageResponse, PrivateMessageResponse,
PrivateMessagesResponse, PrivateMessagesResponse,
GetUserMentionsResponse, GetUserMentionsResponse,
@ -36,35 +40,33 @@ import {
SortType, SortType,
ListingType, ListingType,
GetSiteResponse, GetSiteResponse,
} from '../interfaces'; SearchType,
LemmyHttp,
} from 'lemmy-js-client';
export interface API { export interface API {
url: string; client: LemmyHttp;
auth?: string; auth?: string;
} }
function apiUrl(api: API) {
return `${api.url}/api/v1`;
}
export let alpha: API = { export let alpha: API = {
url: 'http://localhost:8540', client: new LemmyHttp('http://localhost:8540/api/v1'),
}; };
export let beta: API = { export let beta: API = {
url: 'http://localhost:8550', client: new LemmyHttp('http://localhost:8550/api/v1'),
}; };
export let gamma: API = { export let gamma: API = {
url: 'http://localhost:8560', client: new LemmyHttp('http://localhost:8560/api/v1'),
}; };
export let delta: API = { export let delta: API = {
url: 'http://localhost:8570', client: new LemmyHttp('http://localhost:8570/api/v1'),
}; };
export let epsilon: API = { export let epsilon: API = {
url: 'http://localhost:8580', client: new LemmyHttp('http://localhost:8580/api/v1'),
}; };
export async function setupLogins() { export async function setupLogins() {
@ -72,69 +74,31 @@ export async function setupLogins() {
username_or_email: 'lemmy_alpha', username_or_email: 'lemmy_alpha',
password: 'lemmy', password: 'lemmy',
}; };
let resAlpha = alpha.client.login(formAlpha);
let resAlpha: Promise<LoginResponse> = fetch(`${apiUrl(alpha)}/user/login`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(formAlpha),
}).then(d => d.json());
let formBeta = { let formBeta = {
username_or_email: 'lemmy_beta', username_or_email: 'lemmy_beta',
password: 'lemmy', password: 'lemmy',
}; };
let resBeta = beta.client.login(formBeta);
let resBeta: Promise<LoginResponse> = fetch(`${apiUrl(beta)}/user/login`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(formBeta),
}).then(d => d.json());
let formGamma = { let formGamma = {
username_or_email: 'lemmy_gamma', username_or_email: 'lemmy_gamma',
password: 'lemmy', password: 'lemmy',
}; };
let resGamma = gamma.client.login(formGamma);
let resGamma: Promise<LoginResponse> = fetch(`${apiUrl(gamma)}/user/login`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(formGamma),
}).then(d => d.json());
let formDelta = { let formDelta = {
username_or_email: 'lemmy_delta', username_or_email: 'lemmy_delta',
password: 'lemmy', password: 'lemmy',
}; };
let resDelta = delta.client.login(formDelta);
let resDelta: Promise<LoginResponse> = fetch(`${apiUrl(delta)}/user/login`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(formDelta),
}).then(d => d.json());
let formEpsilon = { let formEpsilon = {
username_or_email: 'lemmy_epsilon', username_or_email: 'lemmy_epsilon',
password: 'lemmy', password: 'lemmy',
}; };
let resEpsilon = epsilon.client.login(formEpsilon);
let resEpsilon: Promise<LoginResponse> = fetch(
`${apiUrl(epsilon)}/user/login`,
{
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(formEpsilon),
}
).then(d => d.json());
let res = await Promise.all([ let res = await Promise.all([
resAlpha, resAlpha,
@ -156,40 +120,24 @@ export async function createPost(
community_id: number community_id: number
): Promise<PostResponse> { ): Promise<PostResponse> {
let name = 'A jest test post'; let name = 'A jest test post';
let postForm: PostForm = { let form: PostForm = {
name, name,
auth: api.auth, auth: api.auth,
community_id, community_id,
nsfw: false, nsfw: false,
}; };
return api.client.createPost(form);
let createPostRes: PostResponse = await fetch(`${apiUrl(api)}/post`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(postForm),
}).then(d => d.json());
return createPostRes;
} }
export async function updatePost(api: API, post: Post): Promise<PostResponse> { export async function updatePost(api: API, post: Post): Promise<PostResponse> {
let name = 'A jest test federated post, updated'; let name = 'A jest test federated post, updated';
let postForm: PostForm = { let form: PostForm = {
name, name,
edit_id: post.id, edit_id: post.id,
auth: api.auth, auth: api.auth,
nsfw: false, nsfw: false,
}; };
return api.client.editPost(form);
let updateResponse: PostResponse = await fetch(`${apiUrl(api)}/post`, {
method: 'PUT',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(postForm),
}).then(d => d.json());
return updateResponse;
} }
export async function deletePost( export async function deletePost(
@ -197,20 +145,12 @@ export async function deletePost(
deleted: boolean, deleted: boolean,
post: Post post: Post
): Promise<PostResponse> { ): Promise<PostResponse> {
let deletePostForm: DeletePostForm = { let form: DeletePostForm = {
edit_id: post.id, edit_id: post.id,
deleted: deleted, deleted: deleted,
auth: api.auth, auth: api.auth,
}; };
return api.client.deletePost(form);
let deletePostRes: PostResponse = await fetch(`${apiUrl(api)}/post/delete`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(deletePostForm),
}).then(d => d.json());
return deletePostRes;
} }
export async function removePost( export async function removePost(
@ -218,20 +158,12 @@ export async function removePost(
removed: boolean, removed: boolean,
post: Post post: Post
): Promise<PostResponse> { ): Promise<PostResponse> {
let removePostForm: RemovePostForm = { let form: RemovePostForm = {
edit_id: post.id, edit_id: post.id,
removed, removed,
auth: api.auth, auth: api.auth,
}; };
return api.client.removePost(form);
let removePostRes: PostResponse = await fetch(`${apiUrl(api)}/post/remove`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(removePostForm),
}).then(d => d.json());
return removePostRes;
} }
export async function stickyPost( export async function stickyPost(
@ -239,21 +171,12 @@ export async function stickyPost(
stickied: boolean, stickied: boolean,
post: Post post: Post
): Promise<PostResponse> { ): Promise<PostResponse> {
let stickyPostForm: StickyPostForm = { let form: StickyPostForm = {
edit_id: post.id, edit_id: post.id,
stickied, stickied,
auth: api.auth, auth: api.auth,
}; };
return api.client.stickyPost(form);
let stickyRes: PostResponse = await fetch(`${apiUrl(api)}/post/sticky`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(stickyPostForm),
}).then(d => d.json());
return stickyRes;
} }
export async function lockPost( export async function lockPost(
@ -261,57 +184,46 @@ export async function lockPost(
locked: boolean, locked: boolean,
post: Post post: Post
): Promise<PostResponse> { ): Promise<PostResponse> {
let lockPostForm: LockPostForm = { let form: LockPostForm = {
edit_id: post.id, edit_id: post.id,
locked, locked,
auth: api.auth, auth: api.auth,
}; };
return api.client.lockPost(form);
let lockRes: PostResponse = await fetch(`${apiUrl(api)}/post/lock`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(lockPostForm),
}).then(d => d.json());
return lockRes;
} }
export async function searchPost( export async function searchPost(
api: API, api: API,
post: Post post: Post
): Promise<SearchResponse> { ): Promise<SearchResponse> {
let searchUrl = `${apiUrl(api)}/search?q=${post.ap_id}&type_=All&sort=TopAll`; let form: SearchForm = {
let searchResponse: SearchResponse = await fetch(searchUrl, { q: post.ap_id,
method: 'GET', type_: SearchType.All,
}).then(d => d.json()); sort: SortType.TopAll,
return searchResponse; };
return api.client.search(form);
} }
export async function getPost( export async function getPost(
api: API, api: API,
post_id: number post_id: number
): Promise<GetPostResponse> { ): Promise<GetPostResponse> {
let getPostUrl = `${apiUrl(api)}/post?id=${post_id}`; let form: GetPostForm = {
let getPostRes: GetPostResponse = await fetch(getPostUrl, { id: post_id,
method: 'GET', };
}).then(d => d.json()); return api.client.getPost(form);
return getPostRes;
} }
export async function searchComment( export async function searchComment(
api: API, api: API,
comment: Comment comment: Comment
): Promise<SearchResponse> { ): Promise<SearchResponse> {
let searchUrl = `${apiUrl(api)}/search?q=${ let form: SearchForm = {
comment.ap_id q: comment.ap_id,
}&type_=All&sort=TopAll`; type_: SearchType.All,
let searchResponse: SearchResponse = await fetch(searchUrl, { sort: SortType.TopAll,
method: 'GET', };
}).then(d => d.json()); return api.client.search(form);
return searchResponse;
} }
export async function searchForBetaCommunity( export async function searchForBetaCommunity(
@ -319,14 +231,12 @@ export async function searchForBetaCommunity(
): Promise<SearchResponse> { ): Promise<SearchResponse> {
// Make sure lemmy-beta/c/main is cached on lemmy_alpha // Make sure lemmy-beta/c/main is cached on lemmy_alpha
// Use short-hand search url // Use short-hand search url
let searchUrl = `${apiUrl( let form: SearchForm = {
api q: '!main@lemmy-beta:8550',
)}/search?q=!main@lemmy-beta:8550&type_=All&sort=TopAll`; type_: SearchType.All,
sort: SortType.TopAll,
let searchResponse: SearchResponse = await fetch(searchUrl, { };
method: 'GET', return api.client.search(form);
}).then(d => d.json());
return searchResponse;
} }
export async function searchForUser( export async function searchForUser(
@ -335,14 +245,12 @@ export async function searchForUser(
): Promise<SearchResponse> { ): Promise<SearchResponse> {
// Make sure lemmy-beta/c/main is cached on lemmy_alpha // Make sure lemmy-beta/c/main is cached on lemmy_alpha
// Use short-hand search url // Use short-hand search url
let searchUrl = `${apiUrl( let form: SearchForm = {
api q: apShortname,
)}/search?q=${apShortname}&type_=All&sort=TopAll`; type_: SearchType.All,
sort: SortType.TopAll,
let searchResponse: SearchResponse = await fetch(searchUrl, { };
method: 'GET', return api.client.search(form);
}).then(d => d.json());
return searchResponse;
} }
export async function followCommunity( export async function followCommunity(
@ -350,41 +258,21 @@ export async function followCommunity(
follow: boolean, follow: boolean,
community_id: number community_id: number
): Promise<CommunityResponse> { ): Promise<CommunityResponse> {
let followForm: FollowCommunityForm = { let form: FollowCommunityForm = {
community_id, community_id,
follow, follow,
auth: api.auth, auth: api.auth,
}; };
return api.client.followCommunity(form);
let followRes: CommunityResponse = await fetch(
`${apiUrl(api)}/community/follow`,
{
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(followForm),
}
)
.then(d => d.json())
.catch(_e => {});
return followRes;
} }
export async function checkFollowedCommunities( export async function checkFollowedCommunities(
api: API api: API
): Promise<GetFollowedCommunitiesResponse> { ): Promise<GetFollowedCommunitiesResponse> {
let followedCommunitiesUrl = `${apiUrl( let form: GetFollowedCommunitiesForm = {
api auth: api.auth,
)}/user/followed_communities?&auth=${api.auth}`; };
let followedCommunitiesRes: GetFollowedCommunitiesResponse = await fetch( return api.client.getFollowedCommunities(form);
followedCommunitiesUrl,
{
method: 'GET',
}
).then(d => d.json());
return followedCommunitiesRes;
} }
export async function likePost( export async function likePost(
@ -392,21 +280,13 @@ export async function likePost(
score: number, score: number,
post: Post post: Post
): Promise<PostResponse> { ): Promise<PostResponse> {
let likePostForm: CreatePostLikeForm = { let form: CreatePostLikeForm = {
post_id: post.id, post_id: post.id,
score: score, score: score,
auth: api.auth, auth: api.auth,
}; };
let likePostRes: PostResponse = await fetch(`${apiUrl(api)}/post/like`, { return api.client.likePost(form);
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(likePostForm),
}).then(d => d.json());
return likePostRes;
} }
export async function createComment( export async function createComment(
@ -415,21 +295,13 @@ export async function createComment(
parent_id?: number, parent_id?: number,
content = 'a jest test comment' content = 'a jest test comment'
): Promise<CommentResponse> { ): Promise<CommentResponse> {
let commentForm: CommentForm = { let form: CommentForm = {
content, content,
post_id, post_id,
parent_id, parent_id,
auth: api.auth, auth: api.auth,
}; };
return api.client.createComment(form);
let createResponse: CommentResponse = await fetch(`${apiUrl(api)}/comment`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(commentForm),
}).then(d => d.json());
return createResponse;
} }
export async function updateComment( export async function updateComment(
@ -437,20 +309,12 @@ export async function updateComment(
edit_id: number, edit_id: number,
content = 'A jest test federated comment update' content = 'A jest test federated comment update'
): Promise<CommentResponse> { ): Promise<CommentResponse> {
let commentForm: CommentForm = { let form: CommentForm = {
content, content,
edit_id, edit_id,
auth: api.auth, auth: api.auth,
}; };
return api.client.editComment(form);
let updateResponse: CommentResponse = await fetch(`${apiUrl(api)}/comment`, {
method: 'PUT',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(commentForm),
}).then(d => d.json());
return updateResponse;
} }
export async function deleteComment( export async function deleteComment(
@ -458,23 +322,12 @@ export async function deleteComment(
deleted: boolean, deleted: boolean,
edit_id: number edit_id: number
): Promise<CommentResponse> { ): Promise<CommentResponse> {
let deleteCommentForm: DeleteCommentForm = { let form: DeleteCommentForm = {
edit_id, edit_id,
deleted, deleted,
auth: api.auth, auth: api.auth,
}; };
return api.client.deleteComment(form);
let deleteCommentRes: CommentResponse = await fetch(
`${apiUrl(api)}/comment/delete`,
{
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(deleteCommentForm),
}
).then(d => d.json());
return deleteCommentRes;
} }
export async function removeComment( export async function removeComment(
@ -482,33 +335,21 @@ export async function removeComment(
removed: boolean, removed: boolean,
edit_id: number edit_id: number
): Promise<CommentResponse> { ): Promise<CommentResponse> {
let removeCommentForm: RemoveCommentForm = { let form: RemoveCommentForm = {
edit_id, edit_id,
removed, removed,
auth: api.auth, auth: api.auth,
}; };
return api.client.removeComment(form);
let removeCommentRes: CommentResponse = await fetch(
`${apiUrl(api)}/comment/remove`,
{
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(removeCommentForm),
}
).then(d => d.json());
return removeCommentRes;
} }
export async function getMentions(api: API): Promise<GetUserMentionsResponse> { export async function getMentions(api: API): Promise<GetUserMentionsResponse> {
let getMentionUrl = `${apiUrl( let form: GetUserMentionsForm = {
api sort: SortType.New,
)}/user/mention?sort=New&unread_only=false&auth=${api.auth}`; unread_only: false,
let getMentionsRes: GetUserMentionsResponse = await fetch(getMentionUrl, { auth: api.auth,
method: 'GET', };
}).then(d => d.json()); return api.client.getUserMentions(form);
return getMentionsRes;
} }
export async function likeComment( export async function likeComment(
@ -516,48 +357,26 @@ export async function likeComment(
score: number, score: number,
comment: Comment comment: Comment
): Promise<CommentResponse> { ): Promise<CommentResponse> {
let likeCommentForm: CommentLikeForm = { let form: CommentLikeForm = {
comment_id: comment.id, comment_id: comment.id,
score, score,
auth: api.auth, auth: api.auth,
}; };
return api.client.likeComment(form);
let likeCommentRes: CommentResponse = await fetch(
`${apiUrl(api)}/comment/like`,
{
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(likeCommentForm),
}
).then(d => d.json());
return likeCommentRes;
} }
export async function createCommunity( export async function createCommunity(
api: API, api: API,
name_: string = randomString(5) name_: string = randomString(5)
): Promise<CommunityResponse> { ): Promise<CommunityResponse> {
let communityForm: CommunityForm = { let form: CommunityForm = {
name: name_, name: name_,
title: name_, title: name_,
category_id: 1, category_id: 1,
nsfw: false, nsfw: false,
auth: api.auth, auth: api.auth,
}; };
return api.client.createCommunity(form);
let createCommunityRes: CommunityResponse = await fetch(
`${apiUrl(api)}/community`,
{
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(communityForm),
}
).then(d => d.json());
return createCommunityRes;
} }
export async function deleteCommunity( export async function deleteCommunity(
@ -565,23 +384,12 @@ export async function deleteCommunity(
deleted: boolean, deleted: boolean,
edit_id: number edit_id: number
): Promise<CommunityResponse> { ): Promise<CommunityResponse> {
let deleteCommunityForm: DeleteCommunityForm = { let form: DeleteCommunityForm = {
edit_id, edit_id,
deleted, deleted,
auth: api.auth, auth: api.auth,
}; };
return api.client.deleteCommunity(form);
let deleteResponse: CommunityResponse = await fetch(
`${apiUrl(api)}/community/delete`,
{
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(deleteCommunityForm),
}
).then(d => d.json());
return deleteResponse;
} }
export async function removeCommunity( export async function removeCommunity(
@ -589,23 +397,12 @@ export async function removeCommunity(
removed: boolean, removed: boolean,
edit_id: number edit_id: number
): Promise<CommunityResponse> { ): Promise<CommunityResponse> {
let removeCommunityForm: RemoveCommunityForm = { let form: RemoveCommunityForm = {
edit_id, edit_id,
removed, removed,
auth: api.auth, auth: api.auth,
}; };
return api.client.removeCommunity(form);
let removeResponse: CommunityResponse = await fetch(
`${apiUrl(api)}/community/remove`,
{
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(removeCommunityForm),
}
).then(d => d.json());
return removeResponse;
} }
export async function createPrivateMessage( export async function createPrivateMessage(
@ -613,23 +410,12 @@ export async function createPrivateMessage(
recipient_id: number recipient_id: number
): Promise<PrivateMessageResponse> { ): Promise<PrivateMessageResponse> {
let content = 'A jest test federated private message'; let content = 'A jest test federated private message';
let privateMessageForm: PrivateMessageForm = { let form: PrivateMessageForm = {
content, content,
recipient_id, recipient_id,
auth: api.auth, auth: api.auth,
}; };
return api.client.createPrivateMessage(form);
let createRes: PrivateMessageResponse = await fetch(
`${apiUrl(api)}/private_message`,
{
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(privateMessageForm),
}
).then(d => d.json());
return createRes;
} }
export async function updatePrivateMessage( export async function updatePrivateMessage(
@ -637,23 +423,12 @@ export async function updatePrivateMessage(
edit_id: number edit_id: number
): Promise<PrivateMessageResponse> { ): Promise<PrivateMessageResponse> {
let updatedContent = 'A jest test federated private message edited'; let updatedContent = 'A jest test federated private message edited';
let updatePrivateMessageForm: EditPrivateMessageForm = { let form: EditPrivateMessageForm = {
content: updatedContent, content: updatedContent,
edit_id, edit_id,
auth: api.auth, auth: api.auth,
}; };
return api.client.editPrivateMessage(form);
let updateRes: PrivateMessageResponse = await fetch(
`${apiUrl(api)}/private_message`,
{
method: 'PUT',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(updatePrivateMessageForm),
}
).then(d => d.json());
return updateRes;
} }
export async function deletePrivateMessage( export async function deletePrivateMessage(
@ -661,50 +436,26 @@ export async function deletePrivateMessage(
deleted: boolean, deleted: boolean,
edit_id: number edit_id: number
): Promise<PrivateMessageResponse> { ): Promise<PrivateMessageResponse> {
let deletePrivateMessageForm: DeletePrivateMessageForm = { let form: DeletePrivateMessageForm = {
deleted, deleted,
edit_id, edit_id,
auth: api.auth, auth: api.auth,
}; };
return api.client.deletePrivateMessage(form);
let deleteRes: PrivateMessageResponse = await fetch(
`${apiUrl(api)}/private_message/delete`,
{
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(deletePrivateMessageForm),
}
).then(d => d.json());
return deleteRes;
} }
export async function registerUser( export async function registerUser(
api: API, api: API,
username: string = randomString(5) username: string = randomString(5)
): Promise<LoginResponse> { ): Promise<LoginResponse> {
let registerForm: RegisterForm = { let form: RegisterForm = {
username, username,
password: 'test', password: 'test',
password_verify: 'test', password_verify: 'test',
admin: false, admin: false,
show_nsfw: true, show_nsfw: true,
}; };
return api.client.register(form);
let registerRes: Promise<LoginResponse> = fetch(
`${apiUrl(api)}/user/register`,
{
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(registerForm),
}
).then(d => d.json());
return registerRes;
} }
export async function saveUserSettingsBio( export async function saveUserSettingsBio(
@ -714,54 +465,36 @@ export async function saveUserSettingsBio(
let form: UserSettingsForm = { let form: UserSettingsForm = {
show_nsfw: true, show_nsfw: true,
theme: 'darkly', theme: 'darkly',
default_sort_type: SortType.Active, default_sort_type: Object.keys(SortType).indexOf(SortType.Active),
default_listing_type: ListingType.All, default_listing_type: Object.keys(ListingType).indexOf(ListingType.All),
lang: 'en', lang: 'en',
show_avatars: true, show_avatars: true,
send_notifications_to_email: false, send_notifications_to_email: false,
bio: 'a changed bio', bio: 'a changed bio',
auth, auth,
}; };
return api.client.saveUserSettings(form);
let res: Promise<LoginResponse> = fetch(
`${apiUrl(api)}/user/save_user_settings`,
{
method: 'PUT',
headers: {
'Content-Type': 'application/json',
},
body: wrapper(form),
}
).then(d => d.json());
return res;
} }
export async function getSite( export async function getSite(
api: API, api: API,
auth: string auth: string
): Promise<GetSiteResponse> { ): Promise<GetSiteResponse> {
let siteUrl = `${apiUrl(api)}/site?auth=${auth}`; let form: GetSiteForm = {
auth,
let res: GetSiteResponse = await fetch(siteUrl, { };
method: 'GET', return api.client.getSite(form);
}).then(d => d.json());
return res;
} }
export async function listPrivateMessages( export async function listPrivateMessages(
api: API api: API
): Promise<PrivateMessagesResponse> { ): Promise<PrivateMessagesResponse> {
let getPrivateMessagesUrl = `${apiUrl(api)}/private_message/list?auth=${ let form: GetPrivateMessagesForm = {
api.auth auth: api.auth,
}&unread_only=false&limit=999`; unread_only: false,
limit: 999,
let getPrivateMessagesRes: PrivateMessagesResponse = await fetch( };
getPrivateMessagesUrl, return api.client.getPrivateMessages(form);
{
method: 'GET',
}
).then(d => d.json());
return getPrivateMessagesRes;
} }
export async function unfollowRemotes( export async function unfollowRemotes(

View File

@ -9,7 +9,7 @@ import {
SiteConfigForm, SiteConfigForm,
GetSiteConfigResponse, GetSiteConfigResponse,
WebSocketJsonResponse, WebSocketJsonResponse,
} from '../interfaces'; } from 'lemmy-js-client';
import { WebSocketService } from '../services'; import { WebSocketService } from '../services';
import { wsJsonToRes, capitalizeFirstLetter, toast, randomStr } from '../utils'; import { wsJsonToRes, capitalizeFirstLetter, toast, randomStr } from '../utils';
import autosize from 'autosize'; import autosize from 'autosize';

View File

@ -8,7 +8,7 @@ import {
WebSocketJsonResponse, WebSocketJsonResponse,
UserOperation, UserOperation,
CommentResponse, CommentResponse,
} from '../interfaces'; } from 'lemmy-js-client';
import { capitalizeFirstLetter, wsJsonToRes } from '../utils'; import { capitalizeFirstLetter, wsJsonToRes } from '../utils';
import { WebSocketService, UserService } from '../services'; import { WebSocketService, UserService } from '../services';
import { i18n } from '../i18next'; import { i18n } from '../i18next';

View File

@ -16,10 +16,9 @@ import {
AddAdminForm, AddAdminForm,
TransferCommunityForm, TransferCommunityForm,
TransferSiteForm, TransferSiteForm,
BanType,
CommentSortType,
SortType, SortType,
} from '../interfaces'; } from 'lemmy-js-client';
import { CommentSortType, BanType } from '../interfaces';
import { WebSocketService, UserService } from '../services'; import { WebSocketService, UserService } from '../services';
import { import {
mdToHtml, mdToHtml,

View File

@ -1,11 +1,11 @@
import { Component } from 'inferno'; import { Component } from 'inferno';
import { CommentSortType } from '../interfaces';
import { import {
CommentNode as CommentNodeI, CommentNode as CommentNodeI,
CommunityUser, CommunityUser,
UserView, UserView,
CommentSortType,
SortType, SortType,
} from '../interfaces'; } from 'lemmy-js-client';
import { commentSort, commentSortSortType } from '../utils'; import { commentSort, commentSortSortType } from '../utils';
import { CommentNode } from './comment-node'; import { CommentNode } from './comment-node';

View File

@ -13,7 +13,7 @@ import {
WebSocketJsonResponse, WebSocketJsonResponse,
GetSiteResponse, GetSiteResponse,
Site, Site,
} from '../interfaces'; } from 'lemmy-js-client';
import { WebSocketService } from '../services'; import { WebSocketService } from '../services';
import { wsJsonToRes, toast, getPageFromProps } from '../utils'; import { wsJsonToRes, toast, getPageFromProps } from '../utils';
import { CommunityLink } from './community-link'; import { CommunityLink } from './community-link';
@ -218,7 +218,7 @@ export class Communities extends Component<any, CommunitiesState> {
refetch() { refetch() {
let listCommunitiesForm: ListCommunitiesForm = { let listCommunitiesForm: ListCommunitiesForm = {
sort: SortType[SortType.TopAll], sort: SortType.TopAll,
limit: communityLimit, limit: communityLimit,
page: this.state.page, page: this.state.page,
}; };

View File

@ -9,12 +9,12 @@ import {
ListCategoriesResponse, ListCategoriesResponse,
CommunityResponse, CommunityResponse,
WebSocketJsonResponse, WebSocketJsonResponse,
} from '../interfaces'; Community,
} from 'lemmy-js-client';
import { WebSocketService } from '../services'; import { WebSocketService } from '../services';
import { wsJsonToRes, capitalizeFirstLetter, toast, randomStr } from '../utils'; import { wsJsonToRes, capitalizeFirstLetter, toast, randomStr } from '../utils';
import { i18n } from '../i18next'; import { i18n } from '../i18next';
import { Community } from '../interfaces';
import { MarkdownTextArea } from './markdown-textarea'; import { MarkdownTextArea } from './markdown-textarea';
import { ImageUploadForm } from './image-upload-form'; import { ImageUploadForm } from './image-upload-form';

View File

@ -1,6 +1,6 @@
import { Component } from 'inferno'; import { Component } from 'inferno';
import { Link } from 'inferno-router'; import { Link } from 'inferno-router';
import { Community } from '../interfaces'; import { Community } from 'lemmy-js-client';
import { hostname, pictrsAvatarThumbnail, showAvatars } from '../utils'; import { hostname, pictrsAvatarThumbnail, showAvatars } from '../utils';
interface CommunityOther { interface CommunityOther {

View File

@ -2,6 +2,7 @@ import { Component, linkEvent } from 'inferno';
import { Helmet } from 'inferno-helmet'; import { Helmet } from 'inferno-helmet';
import { Subscription } from 'rxjs'; import { Subscription } from 'rxjs';
import { retryWhen, delay, take } from 'rxjs/operators'; import { retryWhen, delay, take } from 'rxjs/operators';
import { DataType } from '../interfaces';
import { import {
UserOperation, UserOperation,
Community as CommunityI, Community as CommunityI,
@ -14,7 +15,6 @@ import {
GetPostsForm, GetPostsForm,
GetCommunityForm, GetCommunityForm,
ListingType, ListingType,
DataType,
GetPostsResponse, GetPostsResponse,
PostResponse, PostResponse,
AddModToCommunityResponse, AddModToCommunityResponse,
@ -26,7 +26,7 @@ import {
WebSocketJsonResponse, WebSocketJsonResponse,
GetSiteResponse, GetSiteResponse,
Site, Site,
} from '../interfaces'; } from 'lemmy-js-client';
import { WebSocketService } from '../services'; import { WebSocketService } from '../services';
import { PostListings } from './post-listings'; import { PostListings } from './post-listings';
import { CommentNodes } from './comment-nodes'; import { CommentNodes } from './comment-nodes';
@ -78,7 +78,7 @@ interface CommunityProps {
interface UrlParams { interface UrlParams {
dataType?: string; dataType?: string;
sort?: string; sort?: SortType;
page?: number; page?: number;
} }
@ -287,9 +287,7 @@ export class Community extends Component<any, State> {
<SortSelect sort={this.state.sort} onChange={this.handleSortChange} /> <SortSelect sort={this.state.sort} onChange={this.handleSortChange} />
</span> </span>
<a <a
href={`/feeds/c/${this.state.communityName}.xml?sort=${ href={`/feeds/c/${this.state.communityName}.xml?sort=${this.state.sort}`}
SortType[this.state.sort]
}`}
target="_blank" target="_blank"
title="RSS" title="RSS"
rel="noopener" rel="noopener"
@ -336,20 +334,18 @@ export class Community extends Component<any, State> {
} }
handleSortChange(val: SortType) { handleSortChange(val: SortType) {
this.updateUrl({ sort: SortType[val].toLowerCase(), page: 1 }); this.updateUrl({ sort: val, page: 1 });
window.scrollTo(0, 0); window.scrollTo(0, 0);
} }
handleDataTypeChange(val: DataType) { handleDataTypeChange(val: DataType) {
this.updateUrl({ dataType: DataType[val].toLowerCase(), page: 1 }); this.updateUrl({ dataType: DataType[val], page: 1 });
window.scrollTo(0, 0); window.scrollTo(0, 0);
} }
updateUrl(paramUpdates: UrlParams) { updateUrl(paramUpdates: UrlParams) {
const dataTypeStr = const dataTypeStr = paramUpdates.dataType || DataType[this.state.dataType];
paramUpdates.dataType || DataType[this.state.dataType].toLowerCase(); const sortStr = paramUpdates.sort || this.state.sort;
const sortStr =
paramUpdates.sort || SortType[this.state.sort].toLowerCase();
const page = paramUpdates.page || this.state.page; const page = paramUpdates.page || this.state.page;
this.props.history.push( this.props.history.push(
`/c/${this.state.community.name}/data_type/${dataTypeStr}/sort/${sortStr}/page/${page}` `/c/${this.state.community.name}/data_type/${dataTypeStr}/sort/${sortStr}/page/${page}`
@ -361,8 +357,8 @@ export class Community extends Component<any, State> {
let getPostsForm: GetPostsForm = { let getPostsForm: GetPostsForm = {
page: this.state.page, page: this.state.page,
limit: fetchLimit, limit: fetchLimit,
sort: SortType[this.state.sort], sort: this.state.sort,
type_: ListingType[ListingType.Community], type_: ListingType.Community,
community_id: this.state.community.id, community_id: this.state.community.id,
}; };
WebSocketService.Instance.getPosts(getPostsForm); WebSocketService.Instance.getPosts(getPostsForm);
@ -370,8 +366,8 @@ export class Community extends Component<any, State> {
let getCommentsForm: GetCommentsForm = { let getCommentsForm: GetCommentsForm = {
page: this.state.page, page: this.state.page,
limit: fetchLimit, limit: fetchLimit,
sort: SortType[this.state.sort], sort: this.state.sort,
type_: ListingType[ListingType.Community], type_: ListingType.Community,
community_id: this.state.community.id, community_id: this.state.community.id,
}; };
WebSocketService.Instance.getComments(getCommentsForm); WebSocketService.Instance.getComments(getCommentsForm);

View File

@ -9,7 +9,7 @@ import {
WebSocketJsonResponse, WebSocketJsonResponse,
GetSiteResponse, GetSiteResponse,
Site, Site,
} from '../interfaces'; } from 'lemmy-js-client';
import { toast, wsJsonToRes } from '../utils'; import { toast, wsJsonToRes } from '../utils';
import { WebSocketService, UserService } from '../services'; import { WebSocketService, UserService } from '../services';
import { i18n } from '../i18next'; import { i18n } from '../i18next';

View File

@ -11,7 +11,7 @@ import {
WebSocketJsonResponse, WebSocketJsonResponse,
GetSiteResponse, GetSiteResponse,
Site, Site,
} from '../interfaces'; } from 'lemmy-js-client';
import { i18n } from '../i18next'; import { i18n } from '../i18next';
interface CreatePostState { interface CreatePostState {

View File

@ -10,7 +10,7 @@ import {
GetSiteResponse, GetSiteResponse,
Site, Site,
PrivateMessageFormParams, PrivateMessageFormParams,
} from '../interfaces'; } from 'lemmy-js-client';
import { toast, wsJsonToRes } from '../utils'; import { toast, wsJsonToRes } from '../utils';
import { i18n } from '../i18next'; import { i18n } from '../i18next';

View File

@ -9,7 +9,7 @@ import {
UserOperation, UserOperation,
WebSocketJsonResponse, WebSocketJsonResponse,
GetSiteResponse, GetSiteResponse,
} from '../interfaces'; } from 'lemmy-js-client';
interface FooterState { interface FooterState {
version: string; version: string;

View File

@ -1,5 +1,5 @@
import { Component, linkEvent } from 'inferno'; import { Component, linkEvent } from 'inferno';
import { Post } from '../interfaces'; import { Post } from 'lemmy-js-client';
import { mdToHtml } from '../utils'; import { mdToHtml } from '../utils';
import { i18n } from '../i18next'; import { i18n } from '../i18next';

View File

@ -19,7 +19,7 @@ import {
PrivateMessageResponse, PrivateMessageResponse,
GetSiteResponse, GetSiteResponse,
Site, Site,
} from '../interfaces'; } from 'lemmy-js-client';
import { WebSocketService, UserService } from '../services'; import { WebSocketService, UserService } from '../services';
import { import {
wsJsonToRes, wsJsonToRes,
@ -399,7 +399,7 @@ export class Inbox extends Component<any, InboxState> {
refetch() { refetch() {
let repliesForm: GetRepliesForm = { let repliesForm: GetRepliesForm = {
sort: SortType[this.state.sort], sort: this.state.sort,
unread_only: this.state.unreadOrAll == UnreadOrAll.Unread, unread_only: this.state.unreadOrAll == UnreadOrAll.Unread,
page: this.state.page, page: this.state.page,
limit: fetchLimit, limit: fetchLimit,
@ -407,7 +407,7 @@ export class Inbox extends Component<any, InboxState> {
WebSocketService.Instance.getReplies(repliesForm); WebSocketService.Instance.getReplies(repliesForm);
let userMentionsForm: GetUserMentionsForm = { let userMentionsForm: GetUserMentionsForm = {
sort: SortType[this.state.sort], sort: this.state.sort,
unread_only: this.state.unreadOrAll == UnreadOrAll.Unread, unread_only: this.state.unreadOrAll == UnreadOrAll.Unread,
page: this.state.page, page: this.state.page,
limit: fetchLimit, limit: fetchLimit,

View File

@ -6,7 +6,7 @@ import {
UserOperation, UserOperation,
WebSocketJsonResponse, WebSocketJsonResponse,
GetSiteResponse, GetSiteResponse,
} from '../interfaces'; } from 'lemmy-js-client';
import { WebSocketService } from '../services'; import { WebSocketService } from '../services';
import { wsJsonToRes, toast } from '../utils'; import { wsJsonToRes, toast } from '../utils';
import { i18n } from '../i18next'; import { i18n } from '../i18next';

View File

@ -1,7 +1,7 @@
import { Component, linkEvent } from 'inferno'; import { Component, linkEvent } from 'inferno';
import { ListingType } from '../interfaces'; import { ListingType } from 'lemmy-js-client';
import { UserService } from '../services'; import { UserService } from '../services';
import { randomStr } from '../utils';
import { i18n } from '../i18next'; import { i18n } from '../i18next';
interface ListingTypeSelectProps { interface ListingTypeSelectProps {
@ -17,6 +17,8 @@ export class ListingTypeSelect extends Component<
ListingTypeSelectProps, ListingTypeSelectProps,
ListingTypeSelectState ListingTypeSelectState
> { > {
private id = `listing-type-input-${randomStr()}`;
private emptyState: ListingTypeSelectState = { private emptyState: ListingTypeSelectState = {
type_: this.props.type_, type_: this.props.type_,
}; };
@ -42,6 +44,7 @@ export class ListingTypeSelect extends Component<
`} `}
> >
<input <input
id={`${this.id}-subscribed`}
type="radio" type="radio"
value={ListingType.Subscribed} value={ListingType.Subscribed}
checked={this.state.type_ == ListingType.Subscribed} checked={this.state.type_ == ListingType.Subscribed}
@ -56,6 +59,7 @@ export class ListingTypeSelect extends Component<
}`} }`}
> >
<input <input
id={`${this.id}-all`}
type="radio" type="radio"
value={ListingType.All} value={ListingType.All}
checked={this.state.type_ == ListingType.All} checked={this.state.type_ == ListingType.All}
@ -68,6 +72,6 @@ export class ListingTypeSelect extends Component<
} }
handleTypeChange(i: ListingTypeSelect, event: any) { handleTypeChange(i: ListingTypeSelect, event: any) {
i.props.onChange(Number(event.target.value)); i.props.onChange(event.target.value);
} }
} }

View File

@ -12,7 +12,7 @@ import {
GetCaptchaResponse, GetCaptchaResponse,
WebSocketJsonResponse, WebSocketJsonResponse,
Site, Site,
} from '../interfaces'; } from 'lemmy-js-client';
import { WebSocketService, UserService } from '../services'; import { WebSocketService, UserService } from '../services';
import { wsJsonToRes, validEmail, toast } from '../utils'; import { wsJsonToRes, validEmail, toast } from '../utils';
import { i18n } from '../i18next'; import { i18n } from '../i18next';

View File

@ -13,7 +13,6 @@ import {
SortType, SortType,
GetSiteResponse, GetSiteResponse,
ListingType, ListingType,
DataType,
SiteResponse, SiteResponse,
GetPostsResponse, GetPostsResponse,
PostResponse, PostResponse,
@ -26,7 +25,8 @@ import {
AddAdminResponse, AddAdminResponse,
BanUserResponse, BanUserResponse,
WebSocketJsonResponse, WebSocketJsonResponse,
} from '../interfaces'; } from 'lemmy-js-client';
import { DataType } from '../interfaces';
import { WebSocketService, UserService } from '../services'; import { WebSocketService, UserService } from '../services';
import { PostListings } from './post-listings'; import { PostListings } from './post-listings';
import { CommentNodes } from './comment-nodes'; import { CommentNodes } from './comment-nodes';
@ -82,9 +82,9 @@ interface MainProps {
} }
interface UrlParams { interface UrlParams {
listingType?: string; listingType?: ListingType;
dataType?: string; dataType?: string;
sort?: string; sort?: SortType;
page?: number; page?: number;
} }
@ -151,7 +151,7 @@ export class Main extends Component<any, MainState> {
} }
let listCommunitiesForm: ListCommunitiesForm = { let listCommunitiesForm: ListCommunitiesForm = {
sort: SortType[SortType.Hot], sort: SortType.Hot,
limit: 6, limit: 6,
}; };
@ -334,13 +334,9 @@ export class Main extends Component<any, MainState> {
} }
updateUrl(paramUpdates: UrlParams) { updateUrl(paramUpdates: UrlParams) {
const listingTypeStr = const listingTypeStr = paramUpdates.listingType || this.state.listingType;
paramUpdates.listingType || const dataTypeStr = paramUpdates.dataType || DataType[this.state.dataType];
ListingType[this.state.listingType].toLowerCase(); const sortStr = paramUpdates.sort || this.state.sort;
const dataTypeStr =
paramUpdates.dataType || DataType[this.state.dataType].toLowerCase();
const sortStr =
paramUpdates.sort || SortType[this.state.sort].toLowerCase();
const page = paramUpdates.page || this.state.page; const page = paramUpdates.page || this.state.page;
this.props.history.push( this.props.history.push(
`/home/data_type/${dataTypeStr}/listing_type/${listingTypeStr}/sort/${sortStr}/page/${page}` `/home/data_type/${dataTypeStr}/listing_type/${listingTypeStr}/sort/${sortStr}/page/${page}`
@ -549,7 +545,7 @@ export class Main extends Component<any, MainState> {
</span> </span>
{this.state.listingType == ListingType.All && ( {this.state.listingType == ListingType.All && (
<a <a
href={`/feeds/all.xml?sort=${SortType[this.state.sort]}`} href={`/feeds/all.xml?sort=${this.state.sort}`}
target="_blank" target="_blank"
rel="noopener" rel="noopener"
title="RSS" title="RSS"
@ -562,9 +558,7 @@ export class Main extends Component<any, MainState> {
{UserService.Instance.user && {UserService.Instance.user &&
this.state.listingType == ListingType.Subscribed && ( this.state.listingType == ListingType.Subscribed && (
<a <a
href={`/feeds/front/${UserService.Instance.auth}.xml?sort=${ href={`/feeds/front/${UserService.Instance.auth}.xml?sort=${this.state.sort}`}
SortType[this.state.sort]
}`}
target="_blank" target="_blank"
title="RSS" title="RSS"
rel="noopener" rel="noopener"
@ -631,17 +625,17 @@ export class Main extends Component<any, MainState> {
} }
handleSortChange(val: SortType) { handleSortChange(val: SortType) {
this.updateUrl({ sort: SortType[val].toLowerCase(), page: 1 }); this.updateUrl({ sort: val, page: 1 });
window.scrollTo(0, 0); window.scrollTo(0, 0);
} }
handleListingTypeChange(val: ListingType) { handleListingTypeChange(val: ListingType) {
this.updateUrl({ listingType: ListingType[val].toLowerCase(), page: 1 }); this.updateUrl({ listingType: val, page: 1 });
window.scrollTo(0, 0); window.scrollTo(0, 0);
} }
handleDataTypeChange(val: DataType) { handleDataTypeChange(val: DataType) {
this.updateUrl({ dataType: DataType[val].toLowerCase(), page: 1 }); this.updateUrl({ dataType: DataType[val], page: 1 });
window.scrollTo(0, 0); window.scrollTo(0, 0);
} }
@ -650,16 +644,16 @@ export class Main extends Component<any, MainState> {
let getPostsForm: GetPostsForm = { let getPostsForm: GetPostsForm = {
page: this.state.page, page: this.state.page,
limit: fetchLimit, limit: fetchLimit,
sort: SortType[this.state.sort], sort: this.state.sort,
type_: ListingType[this.state.listingType], type_: this.state.listingType,
}; };
WebSocketService.Instance.getPosts(getPostsForm); WebSocketService.Instance.getPosts(getPostsForm);
} else { } else {
let getCommentsForm: GetCommentsForm = { let getCommentsForm: GetCommentsForm = {
page: this.state.page, page: this.state.page,
limit: fetchLimit, limit: fetchLimit,
sort: SortType[this.state.sort], sort: this.state.sort,
type_: ListingType[this.state.listingType], type_: this.state.listingType,
}; };
WebSocketService.Instance.getComments(getCommentsForm); WebSocketService.Instance.getComments(getCommentsForm);
} }

View File

@ -19,7 +19,7 @@ import {
WebSocketJsonResponse, WebSocketJsonResponse,
GetSiteResponse, GetSiteResponse,
Site, Site,
} from '../interfaces'; } from 'lemmy-js-client';
import { WebSocketService } from '../services'; import { WebSocketService } from '../services';
import { wsJsonToRes, addTypeInfo, fetchLimit, toast } from '../utils'; import { wsJsonToRes, addTypeInfo, fetchLimit, toast } from '../utils';
import { MomentTime } from './moment-time'; import { MomentTime } from './moment-time';

View File

@ -18,7 +18,7 @@ import {
PrivateMessage, PrivateMessage,
PrivateMessageResponse, PrivateMessageResponse,
WebSocketJsonResponse, WebSocketJsonResponse,
} from '../interfaces'; } from 'lemmy-js-client';
import { import {
wsJsonToRes, wsJsonToRes,
pictrsAvatarThumbnail, pictrsAvatarThumbnail,
@ -137,7 +137,7 @@ export class Navbar extends Component<any, NavbarState> {
this.context.router.history.push(`/search/`); this.context.router.history.push(`/search/`);
} else { } else {
this.context.router.history.push( this.context.router.history.push(
`/search/q/${searchParam}/type/all/sort/topall/page/1` `/search/q/${searchParam}/type/All/sort/TopAll/page/1`
); );
} }
} }
@ -477,14 +477,14 @@ export class Navbar extends Component<any, NavbarState> {
fetchUnreads() { fetchUnreads() {
console.log('Fetching unreads...'); console.log('Fetching unreads...');
let repliesForm: GetRepliesForm = { let repliesForm: GetRepliesForm = {
sort: SortType[SortType.New], sort: SortType.New,
unread_only: true, unread_only: true,
page: 1, page: 1,
limit: fetchLimit, limit: fetchLimit,
}; };
let userMentionsForm: GetUserMentionsForm = { let userMentionsForm: GetUserMentionsForm = {
sort: SortType[SortType.New], sort: SortType.New,
unread_only: true, unread_only: true,
page: 1, page: 1,
limit: fetchLimit, limit: fetchLimit,

View File

@ -9,7 +9,7 @@ import {
WebSocketJsonResponse, WebSocketJsonResponse,
GetSiteResponse, GetSiteResponse,
Site, Site,
} from '../interfaces'; } from 'lemmy-js-client';
import { WebSocketService, UserService } from '../services'; import { WebSocketService, UserService } from '../services';
import { wsJsonToRes, capitalizeFirstLetter, toast } from '../utils'; import { wsJsonToRes, capitalizeFirstLetter, toast } from '../utils';
import { i18n } from '../i18next'; import { i18n } from '../i18next';

View File

@ -18,7 +18,7 @@ import {
SearchType, SearchType,
SearchResponse, SearchResponse,
WebSocketJsonResponse, WebSocketJsonResponse,
} from '../interfaces'; } from 'lemmy-js-client';
import { WebSocketService, UserService } from '../services'; import { WebSocketService, UserService } from '../services';
import { import {
wsJsonToRes, wsJsonToRes,
@ -121,7 +121,7 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
); );
let listCommunitiesForm: ListCommunitiesForm = { let listCommunitiesForm: ListCommunitiesForm = {
sort: SortType[SortType.TopAll], sort: SortType.TopAll,
limit: 9999, limit: 9999,
}; };
@ -405,8 +405,8 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
if (validURL(this.state.postForm.url)) { if (validURL(this.state.postForm.url)) {
let form: SearchForm = { let form: SearchForm = {
q: this.state.postForm.url, q: this.state.postForm.url,
type_: SearchType[SearchType.Url], type_: SearchType.Url,
sort: SortType[SortType.TopAll], sort: SortType.TopAll,
page: 1, page: 1,
limit: 6, limit: 6,
}; };
@ -433,8 +433,8 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
fetchSimilarPosts() { fetchSimilarPosts() {
let form: SearchForm = { let form: SearchForm = {
q: this.state.postForm.name, q: this.state.postForm.name,
type_: SearchType[SearchType.Posts], type_: SearchType.Posts,
sort: SortType[SortType.TopAll], sort: SortType.TopAll,
community_id: this.state.postForm.community_id, community_id: this.state.postForm.community_id,
page: 1, page: 1,
limit: 6, limit: 6,

View File

@ -11,14 +11,14 @@ import {
SavePostForm, SavePostForm,
CommunityUser, CommunityUser,
UserView, UserView,
BanType,
BanFromCommunityForm, BanFromCommunityForm,
BanUserForm, BanUserForm,
AddModToCommunityForm, AddModToCommunityForm,
AddAdminForm, AddAdminForm,
TransferSiteForm, TransferSiteForm,
TransferCommunityForm, TransferCommunityForm,
} from '../interfaces'; } from 'lemmy-js-client';
import { BanType } from '../interfaces';
import { MomentTime } from './moment-time'; import { MomentTime } from './moment-time';
import { PostForm } from './post-form'; import { PostForm } from './post-form';
import { IFramelyCard } from './iframely-card'; import { IFramelyCard } from './iframely-card';

View File

@ -1,6 +1,6 @@
import { Component } from 'inferno'; import { Component } from 'inferno';
import { Link } from 'inferno-router'; import { Link } from 'inferno-router';
import { Post, SortType } from '../interfaces'; import { Post, SortType } from 'lemmy-js-client';
import { postSort } from '../utils'; import { postSort } from '../utils';
import { PostListing } from './post-listing'; import { PostListing } from './post-listing';
import { i18n } from '../i18next'; import { i18n } from '../i18next';

View File

@ -11,8 +11,6 @@ import {
Comment, Comment,
MarkCommentAsReadForm, MarkCommentAsReadForm,
CommentResponse, CommentResponse,
CommentSortType,
CommentViewType,
CommunityUser, CommunityUser,
CommunityResponse, CommunityResponse,
CommentNode as CommentNodeI, CommentNode as CommentNodeI,
@ -28,7 +26,8 @@ import {
GetSiteResponse, GetSiteResponse,
GetCommunityResponse, GetCommunityResponse,
WebSocketJsonResponse, WebSocketJsonResponse,
} from '../interfaces'; } from 'lemmy-js-client';
import { CommentSortType, CommentViewType } from '../interfaces';
import { WebSocketService, UserService } from '../services'; import { WebSocketService, UserService } from '../services';
import { import {
wsJsonToRes, wsJsonToRes,
@ -439,8 +438,8 @@ export class Post extends Component<any, PostState> {
if (this.state.post.url) { if (this.state.post.url) {
let form: SearchForm = { let form: SearchForm = {
q: this.state.post.url, q: this.state.post.url,
type_: SearchType[SearchType.Url], type_: SearchType.Url,
sort: SortType[SortType.TopAll], sort: SortType.TopAll,
page: 1, page: 1,
limit: 6, limit: 6,
}; };

View File

@ -14,7 +14,7 @@ import {
GetUserDetailsForm, GetUserDetailsForm,
SortType, SortType,
WebSocketJsonResponse, WebSocketJsonResponse,
} from '../interfaces'; } from 'lemmy-js-client';
import { WebSocketService } from '../services'; import { WebSocketService } from '../services';
import { import {
capitalizeFirstLetter, capitalizeFirstLetter,
@ -77,7 +77,7 @@ export class PrivateMessageForm extends Component<
this.state.privateMessageForm.recipient_id = this.props.params.recipient_id; this.state.privateMessageForm.recipient_id = this.props.params.recipient_id;
let form: GetUserDetailsForm = { let form: GetUserDetailsForm = {
user_id: this.state.privateMessageForm.recipient_id, user_id: this.state.privateMessageForm.recipient_id,
sort: SortType[SortType.New], sort: SortType.New,
saved_only: false, saved_only: false,
}; };
WebSocketService.Instance.getUserDetails(form); WebSocketService.Instance.getUserDetails(form);

View File

@ -4,7 +4,7 @@ import {
PrivateMessage as PrivateMessageI, PrivateMessage as PrivateMessageI,
DeletePrivateMessageForm, DeletePrivateMessageForm,
MarkPrivateMessageAsReadForm, MarkPrivateMessageAsReadForm,
} from '../interfaces'; } from 'lemmy-js-client';
import { WebSocketService, UserService } from '../services'; import { WebSocketService, UserService } from '../services';
import { mdToHtml, pictrsAvatarThumbnail, showAvatars, toast } from '../utils'; import { mdToHtml, pictrsAvatarThumbnail, showAvatars, toast } from '../utils';
import { MomentTime } from './moment-time'; import { MomentTime } from './moment-time';

View File

@ -17,7 +17,7 @@ import {
WebSocketJsonResponse, WebSocketJsonResponse,
GetSiteResponse, GetSiteResponse,
Site, Site,
} from '../interfaces'; } from 'lemmy-js-client';
import { WebSocketService } from '../services'; import { WebSocketService } from '../services';
import { import {
wsJsonToRes, wsJsonToRes,
@ -57,8 +57,8 @@ interface SearchProps {
interface UrlParams { interface UrlParams {
q?: string; q?: string;
type_?: string; type_?: SearchType;
sort?: string; sort?: SortType;
page?: number; page?: number;
} }
@ -461,8 +461,8 @@ export class Search extends Component<any, SearchState> {
search() { search() {
let form: SearchForm = { let form: SearchForm = {
q: this.state.q, q: this.state.q,
type_: SearchType[this.state.type_], type_: this.state.type_,
sort: SortType[this.state.sort], sort: this.state.sort,
page: this.state.page, page: this.state.page,
limit: fetchLimit, limit: fetchLimit,
}; };
@ -473,12 +473,12 @@ export class Search extends Component<any, SearchState> {
} }
handleSortChange(val: SortType) { handleSortChange(val: SortType) {
this.updateUrl({ sort: SortType[val].toLowerCase(), page: 1 }); this.updateUrl({ sort: val, page: 1 });
} }
handleTypeChange(i: Search, event: any) { handleTypeChange(i: Search, event: any) {
i.updateUrl({ i.updateUrl({
type_: SearchType[Number(event.target.value)].toLowerCase(), type_: SearchType[event.target.value],
page: 1, page: 1,
}); });
} }
@ -487,8 +487,8 @@ export class Search extends Component<any, SearchState> {
event.preventDefault(); event.preventDefault();
i.updateUrl({ i.updateUrl({
q: i.state.searchText, q: i.state.searchText,
type_: SearchType[i.state.type_].toLowerCase(), type_: i.state.type_,
sort: SortType[i.state.sort].toLowerCase(), sort: i.state.sort,
page: i.state.page, page: i.state.page,
}); });
} }
@ -499,10 +499,8 @@ export class Search extends Component<any, SearchState> {
updateUrl(paramUpdates: UrlParams) { updateUrl(paramUpdates: UrlParams) {
const qStr = paramUpdates.q || this.state.q; const qStr = paramUpdates.q || this.state.q;
const typeStr = const typeStr = paramUpdates.type_ || this.state.type_;
paramUpdates.type_ || SearchType[this.state.type_].toLowerCase(); const sortStr = paramUpdates.sort || this.state.sort;
const sortStr =
paramUpdates.sort || SortType[this.state.sort].toLowerCase();
const page = paramUpdates.page || this.state.page; const page = paramUpdates.page || this.state.page;
this.props.history.push( this.props.history.push(
`/search/q/${qStr}/type/${typeStr}/sort/${sortStr}/page/${page}` `/search/q/${qStr}/type/${typeStr}/sort/${sortStr}/page/${page}`

View File

@ -7,7 +7,7 @@ import {
LoginResponse, LoginResponse,
UserOperation, UserOperation,
WebSocketJsonResponse, WebSocketJsonResponse,
} from '../interfaces'; } from 'lemmy-js-client';
import { WebSocketService, UserService } from '../services'; import { WebSocketService, UserService } from '../services';
import { wsJsonToRes, toast } from '../utils'; import { wsJsonToRes, toast } from '../utils';
import { SiteForm } from './site-form'; import { SiteForm } from './site-form';

View File

@ -8,7 +8,7 @@ import {
RemoveCommunityForm, RemoveCommunityForm,
UserView, UserView,
AddModToCommunityForm, AddModToCommunityForm,
} from '../interfaces'; } from 'lemmy-js-client';
import { WebSocketService, UserService } from '../services'; import { WebSocketService, UserService } from '../services';
import { mdToHtml, getUnixTime } from '../utils'; import { mdToHtml, getUnixTime } from '../utils';
import { CommunityForm } from './community-form'; import { CommunityForm } from './community-form';

View File

@ -2,7 +2,7 @@ import { Component, linkEvent } from 'inferno';
import { Prompt } from 'inferno-router'; import { Prompt } from 'inferno-router';
import { MarkdownTextArea } from './markdown-textarea'; import { MarkdownTextArea } from './markdown-textarea';
import { ImageUploadForm } from './image-upload-form'; import { ImageUploadForm } from './image-upload-form';
import { Site, SiteForm as SiteFormI } from '../interfaces'; import { Site, SiteForm as SiteFormI } from 'lemmy-js-client';
import { WebSocketService } from '../services'; import { WebSocketService } from '../services';
import { capitalizeFirstLetter, randomStr } from '../utils'; import { capitalizeFirstLetter, randomStr } from '../utils';
import { i18n } from '../i18next'; import { i18n } from '../i18next';

View File

@ -1,6 +1,6 @@
import { Component, linkEvent } from 'inferno'; import { Component, linkEvent } from 'inferno';
import { SortType } from '../interfaces'; import { SortType } from 'lemmy-js-client';
import { sortingHelpUrl } from '../utils'; import { sortingHelpUrl, randomStr } from '../utils';
import { i18n } from '../i18next'; import { i18n } from '../i18next';
interface SortSelectProps { interface SortSelectProps {
@ -14,6 +14,7 @@ interface SortSelectState {
} }
export class SortSelect extends Component<SortSelectProps, SortSelectState> { export class SortSelect extends Component<SortSelectProps, SortSelectState> {
private id = `sort-select-${randomStr()}`;
private emptyState: SortSelectState = { private emptyState: SortSelectState = {
sort: this.props.sort, sort: this.props.sort,
}; };
@ -33,6 +34,8 @@ export class SortSelect extends Component<SortSelectProps, SortSelectState> {
return ( return (
<> <>
<select <select
id={this.id}
name={this.id}
value={this.state.sort} value={this.state.sort}
onChange={linkEvent(this, this.handleSortChange)} onChange={linkEvent(this, this.handleSortChange)}
class="custom-select w-auto mr-2 mb-2" class="custom-select w-auto mr-2 mb-2"
@ -68,6 +71,6 @@ export class SortSelect extends Component<SortSelectProps, SortSelectState> {
} }
handleSortChange(i: SortSelect, event: any) { handleSortChange(i: SortSelect, event: any) {
i.props.onChange(Number(event.target.value)); i.props.onChange(event.target.value);
} }
} }

View File

@ -8,7 +8,7 @@ import {
Site, Site,
WebSocketJsonResponse, WebSocketJsonResponse,
UserOperation, UserOperation,
} from '../interfaces'; } from 'lemmy-js-client';
import { i18n } from '../i18next'; import { i18n } from '../i18next';
import { T } from 'inferno-i18next'; import { T } from 'inferno-i18next';
import { repoUrl, wsJsonToRes, toast } from '../utils'; import { repoUrl, wsJsonToRes, toast } from '../utils';

View File

@ -12,11 +12,11 @@ import {
UserDetailsResponse, UserDetailsResponse,
UserView, UserView,
WebSocketJsonResponse, WebSocketJsonResponse,
UserDetailsView,
CommentResponse, CommentResponse,
BanUserResponse, BanUserResponse,
PostResponse, PostResponse,
} from '../interfaces'; } from 'lemmy-js-client';
import { UserDetailsView } from '../interfaces';
import { import {
wsJsonToRes, wsJsonToRes,
toast, toast,
@ -35,7 +35,7 @@ interface UserDetailsProps {
user_id?: number; user_id?: number;
page: number; page: number;
limit: number; limit: number;
sort: string; sort: SortType;
enableDownvotes: boolean; enableDownvotes: boolean;
enableNsfw: boolean; enableNsfw: boolean;
view: UserDetailsView; view: UserDetailsView;
@ -137,7 +137,7 @@ export class UserDetails extends Component<UserDetailsProps, UserDetailsState> {
]; ];
// Sort it // Sort it
if (SortType[this.props.sort] === SortType.New) { if (this.props.sort === SortType.New) {
combined.sort((a, b) => b.data.published.localeCompare(a.data.published)); combined.sort((a, b) => b.data.published.localeCompare(a.data.published));
} else { } else {
combined.sort((a, b) => b.data.score - a.data.score); combined.sort((a, b) => b.data.score - a.data.score);

View File

@ -1,6 +1,6 @@
import { Component } from 'inferno'; import { Component } from 'inferno';
import { Link } from 'inferno-router'; import { Link } from 'inferno-router';
import { UserView } from '../interfaces'; import { UserView } from 'lemmy-js-client';
import { import {
pictrsAvatarThumbnail, pictrsAvatarThumbnail,
showAvatars, showAvatars,

View File

@ -14,10 +14,10 @@ import {
DeleteAccountForm, DeleteAccountForm,
WebSocketJsonResponse, WebSocketJsonResponse,
GetSiteResponse, GetSiteResponse,
UserDetailsView,
UserDetailsResponse, UserDetailsResponse,
AddAdminResponse, AddAdminResponse,
} from '../interfaces'; } from 'lemmy-js-client';
import { UserDetailsView } from '../interfaces';
import { WebSocketService, UserService } from '../services'; import { WebSocketService, UserService } from '../services';
import { import {
wsJsonToRes, wsJsonToRes,
@ -73,7 +73,7 @@ interface UserProps {
interface UrlParams { interface UrlParams {
view?: string; view?: string;
sort?: string; sort?: SortType;
page?: number; page?: number;
} }
@ -190,17 +190,15 @@ export class User extends Component<any, UserState> {
); );
} }
static getViewFromProps(view: any): UserDetailsView { static getViewFromProps(view: string): UserDetailsView {
return view return view ? UserDetailsView[view] : UserDetailsView.Overview;
? UserDetailsView[capitalizeFirstLetter(view)]
: UserDetailsView.Overview;
} }
static getSortTypeFromProps(sort: any): SortType { static getSortTypeFromProps(sort: string): SortType {
return sort ? routeSortTypeToEnum(sort) : SortType.New; return sort ? routeSortTypeToEnum(sort) : SortType.New;
} }
static getPageFromProps(page: any): number { static getPageFromProps(page: number): number {
return page ? Number(page) : 1; return page ? Number(page) : 1;
} }
@ -272,7 +270,7 @@ export class User extends Component<any, UserState> {
<UserDetails <UserDetails
user_id={this.state.user_id} user_id={this.state.user_id}
username={this.state.username} username={this.state.username}
sort={SortType[this.state.sort]} sort={this.state.sort}
page={this.state.page} page={this.state.page}
limit={fetchLimit} limit={fetchLimit}
enableDownvotes={this.state.siteRes.site.enable_downvotes} enableDownvotes={this.state.siteRes.site.enable_downvotes}
@ -364,9 +362,7 @@ export class User extends Component<any, UserState> {
hideHot hideHot
/> />
<a <a
href={`/feeds/u/${this.state.username}.xml?sort=${ href={`/feeds/u/${this.state.username}.xml?sort=${this.state.sort}`}
SortType[this.state.sort]
}`}
target="_blank" target="_blank"
rel="noopener" rel="noopener"
title="RSS" title="RSS"
@ -538,7 +534,11 @@ export class User extends Component<any, UserState> {
<div class="mr-2">{i18n.t('sort_type')}</div> <div class="mr-2">{i18n.t('sort_type')}</div>
</label> </label>
<ListingTypeSelect <ListingTypeSelect
type_={this.state.userSettingsForm.default_listing_type} type_={
Object.values(ListingType)[
this.state.userSettingsForm.default_listing_type
]
}
onChange={this.handleUserSettingsListingTypeChange} onChange={this.handleUserSettingsListingTypeChange}
/> />
</form> </form>
@ -547,7 +547,11 @@ export class User extends Component<any, UserState> {
<div class="mr-2">{i18n.t('type')}</div> <div class="mr-2">{i18n.t('type')}</div>
</label> </label>
<SortSelect <SortSelect
sort={this.state.userSettingsForm.default_sort_type} sort={
Object.values(SortType)[
this.state.userSettingsForm.default_sort_type
]
}
onChange={this.handleUserSettingsSortTypeChange} onChange={this.handleUserSettingsSortTypeChange}
/> />
</form> </form>
@ -859,10 +863,8 @@ export class User extends Component<any, UserState> {
updateUrl(paramUpdates: UrlParams) { updateUrl(paramUpdates: UrlParams) {
const page = paramUpdates.page || this.state.page; const page = paramUpdates.page || this.state.page;
const viewStr = const viewStr = paramUpdates.view || UserDetailsView[this.state.view];
paramUpdates.view || UserDetailsView[this.state.view].toLowerCase(); const sortStr = paramUpdates.sort || this.state.sort;
const sortStr =
paramUpdates.sort || SortType[this.state.sort].toLowerCase();
this.props.history.push( this.props.history.push(
`/u/${this.state.username}/view/${viewStr}/sort/${sortStr}/page/${page}` `/u/${this.state.username}/view/${viewStr}/sort/${sortStr}/page/${page}`
); );
@ -873,12 +875,12 @@ export class User extends Component<any, UserState> {
} }
handleSortChange(val: SortType) { handleSortChange(val: SortType) {
this.updateUrl({ sort: SortType[val].toLowerCase(), page: 1 }); this.updateUrl({ sort: val, page: 1 });
} }
handleViewChange(i: User, event: any) { handleViewChange(i: User, event: any) {
i.updateUrl({ i.updateUrl({
view: UserDetailsView[Number(event.target.value)].toLowerCase(), view: UserDetailsView[Number(event.target.value)],
page: 1, page: 1,
}); });
} }
@ -912,12 +914,16 @@ export class User extends Component<any, UserState> {
} }
handleUserSettingsSortTypeChange(val: SortType) { handleUserSettingsSortTypeChange(val: SortType) {
this.state.userSettingsForm.default_sort_type = val; this.state.userSettingsForm.default_sort_type = Object.keys(
SortType
).indexOf(val);
this.setState(this.state); this.setState(this.state);
} }
handleUserSettingsListingTypeChange(val: ListingType) { handleUserSettingsListingTypeChange(val: ListingType) {
this.state.userSettingsForm.default_listing_type = val; this.state.userSettingsForm.default_listing_type = Object.keys(
ListingType
).indexOf(val);
this.setState(this.state); this.setState(this.state);
} }

1052
ui/src/interfaces.ts vendored

File diff suppressed because it is too large Load Diff

View File

@ -1,9 +1,14 @@
import Cookies from 'js-cookie'; import Cookies from 'js-cookie';
import { User, Claims, LoginResponse } from '../interfaces'; import { User, LoginResponse } from 'lemmy-js-client';
import { setTheme } from '../utils'; import { setTheme } from '../utils';
import jwt_decode from 'jwt-decode'; import jwt_decode from 'jwt-decode';
import { Subject, BehaviorSubject } from 'rxjs'; import { Subject, BehaviorSubject } from 'rxjs';
interface Claims {
id: number;
iss: string;
}
export class UserService { export class UserService {
private static _instance: UserService; private static _instance: UserService;
public user: User; public user: User;

View File

@ -1,8 +1,8 @@
import { wsUri } from '../env'; import { wsUri } from '../env';
import { import {
LemmyWebsocket,
LoginForm, LoginForm,
RegisterForm, RegisterForm,
UserOperation,
CommunityForm, CommunityForm,
DeleteCommunityForm, DeleteCommunityForm,
RemoveCommunityForm, RemoveCommunityForm,
@ -53,9 +53,9 @@ import {
GetSiteConfig, GetSiteConfig,
GetSiteForm, GetSiteForm,
SiteConfigForm, SiteConfigForm,
MessageType, MarkAllAsReadForm,
WebSocketJsonResponse, WebSocketJsonResponse,
} from '../interfaces'; } from 'lemmy-js-client';
import { UserService } from './'; import { UserService } from './';
import { i18n } from '../i18next'; import { i18n } from '../i18next';
import { toast } from '../utils'; import { toast } from '../utils';
@ -70,6 +70,7 @@ export class WebSocketService {
public admins: Array<UserView>; public admins: Array<UserView>;
public banned: Array<UserView>; public banned: Array<UserView>;
private client = new LemmyWebsocket();
private constructor() { private constructor() {
this.ws = new ReconnectingWebSocket(wsUri); this.ws = new ReconnectingWebSocket(wsUri);
@ -100,301 +101,287 @@ export class WebSocketService {
public userJoin() { public userJoin() {
let form: UserJoinForm = { auth: UserService.Instance.auth }; let form: UserJoinForm = { auth: UserService.Instance.auth };
this.ws.send(this.wsSendWrapper(UserOperation.UserJoin, form)); this.ws.send(this.client.userJoin(form));
} }
public login(loginForm: LoginForm) { public login(form: LoginForm) {
this.ws.send(this.wsSendWrapper(UserOperation.Login, loginForm)); this.ws.send(this.client.login(form));
} }
public register(registerForm: RegisterForm) { public register(form: RegisterForm) {
this.ws.send(this.wsSendWrapper(UserOperation.Register, registerForm)); this.ws.send(this.client.register(form));
} }
public getCaptcha() { public getCaptcha() {
this.ws.send(this.wsSendWrapper(UserOperation.GetCaptcha, {})); this.ws.send(this.client.getCaptcha());
} }
public createCommunity(form: CommunityForm) { public createCommunity(form: CommunityForm) {
this.setAuth(form); this.setAuth(form); // TODO all these setauths at some point would be good to make required
this.ws.send(this.wsSendWrapper(UserOperation.CreateCommunity, form)); this.ws.send(this.client.createCommunity(form));
} }
public editCommunity(form: CommunityForm) { public editCommunity(form: CommunityForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.EditCommunity, form)); this.ws.send(this.client.editCommunity(form));
} }
public deleteCommunity(form: DeleteCommunityForm) { public deleteCommunity(form: DeleteCommunityForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.DeleteCommunity, form)); this.ws.send(this.client.deleteCommunity(form));
} }
public removeCommunity(form: RemoveCommunityForm) { public removeCommunity(form: RemoveCommunityForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.RemoveCommunity, form)); this.ws.send(this.client.removeCommunity(form));
} }
public followCommunity(followCommunityForm: FollowCommunityForm) { public followCommunity(form: FollowCommunityForm) {
this.setAuth(followCommunityForm); this.setAuth(form);
this.ws.send( this.ws.send(this.client.followCommunity(form));
this.wsSendWrapper(UserOperation.FollowCommunity, followCommunityForm)
);
} }
public listCommunities(form: ListCommunitiesForm) { public listCommunities(form: ListCommunitiesForm) {
this.setAuth(form, false); this.setAuth(form, false);
this.ws.send(this.wsSendWrapper(UserOperation.ListCommunities, form)); this.ws.send(this.client.listCommunities(form));
} }
public getFollowedCommunities() { public getFollowedCommunities() {
let form: GetFollowedCommunitiesForm = { auth: UserService.Instance.auth }; let form: GetFollowedCommunitiesForm = { auth: UserService.Instance.auth };
this.ws.send( this.ws.send(this.client.getFollowedCommunities(form));
this.wsSendWrapper(UserOperation.GetFollowedCommunities, form)
);
} }
public listCategories() { public listCategories() {
this.ws.send(this.wsSendWrapper(UserOperation.ListCategories, {})); this.ws.send(this.client.listCategories());
} }
public createPost(form: PostForm) { public createPost(form: PostForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.CreatePost, form)); this.ws.send(this.client.createPost(form));
} }
public getPost(form: GetPostForm) { public getPost(form: GetPostForm) {
this.setAuth(form, false); this.setAuth(form, false);
this.ws.send(this.wsSendWrapper(UserOperation.GetPost, form)); this.ws.send(this.client.getPost(form));
} }
public getCommunity(form: GetCommunityForm) { public getCommunity(form: GetCommunityForm) {
this.setAuth(form, false); this.setAuth(form, false);
this.ws.send(this.wsSendWrapper(UserOperation.GetCommunity, form)); this.ws.send(this.client.getCommunity(form));
} }
public createComment(form: CommentForm) { public createComment(form: CommentForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.CreateComment, form)); this.ws.send(this.client.createComment(form));
} }
public editComment(form: CommentForm) { public editComment(form: CommentForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.EditComment, form)); this.ws.send(this.client.editComment(form));
} }
public deleteComment(form: DeleteCommentForm) { public deleteComment(form: DeleteCommentForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.DeleteComment, form)); this.ws.send(this.client.deleteComment(form));
} }
public removeComment(form: RemoveCommentForm) { public removeComment(form: RemoveCommentForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.RemoveComment, form)); this.ws.send(this.client.removeComment(form));
} }
public markCommentAsRead(form: MarkCommentAsReadForm) { public markCommentAsRead(form: MarkCommentAsReadForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.MarkCommentAsRead, form)); this.ws.send(this.client.markCommentAsRead(form));
} }
public likeComment(form: CommentLikeForm) { public likeComment(form: CommentLikeForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.CreateCommentLike, form)); this.ws.send(this.client.likeComment(form));
} }
public saveComment(form: SaveCommentForm) { public saveComment(form: SaveCommentForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.SaveComment, form)); this.ws.send(this.client.saveComment(form));
} }
public getPosts(form: GetPostsForm) { public getPosts(form: GetPostsForm) {
this.setAuth(form, false); this.setAuth(form, false);
this.ws.send(this.wsSendWrapper(UserOperation.GetPosts, form)); this.ws.send(this.client.getPosts(form));
} }
public getComments(form: GetCommentsForm) { public getComments(form: GetCommentsForm) {
this.setAuth(form, false); this.setAuth(form, false);
this.ws.send(this.wsSendWrapper(UserOperation.GetComments, form)); this.ws.send(this.client.getComments(form));
} }
public likePost(form: CreatePostLikeForm) { public likePost(form: CreatePostLikeForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.CreatePostLike, form)); this.ws.send(this.client.likePost(form));
} }
public editPost(form: PostForm) { public editPost(form: PostForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.EditPost, form)); this.ws.send(this.client.editPost(form));
} }
public deletePost(form: DeletePostForm) { public deletePost(form: DeletePostForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.DeletePost, form)); this.ws.send(this.client.deletePost(form));
} }
public removePost(form: RemovePostForm) { public removePost(form: RemovePostForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.RemovePost, form)); this.ws.send(this.client.removePost(form));
} }
public lockPost(form: LockPostForm) { public lockPost(form: LockPostForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.LockPost, form)); this.ws.send(this.client.lockPost(form));
} }
public stickyPost(form: StickyPostForm) { public stickyPost(form: StickyPostForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.StickyPost, form)); this.ws.send(this.client.stickyPost(form));
} }
public savePost(form: SavePostForm) { public savePost(form: SavePostForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.SavePost, form)); this.ws.send(this.client.savePost(form));
} }
public banFromCommunity(form: BanFromCommunityForm) { public banFromCommunity(form: BanFromCommunityForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.BanFromCommunity, form)); this.ws.send(this.client.banFromCommunity(form));
} }
public addModToCommunity(form: AddModToCommunityForm) { public addModToCommunity(form: AddModToCommunityForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.AddModToCommunity, form)); this.ws.send(this.client.addModToCommunity(form));
} }
public transferCommunity(form: TransferCommunityForm) { public transferCommunity(form: TransferCommunityForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.TransferCommunity, form)); this.ws.send(this.client.transferCommunity(form));
} }
public transferSite(form: TransferSiteForm) { public transferSite(form: TransferSiteForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.TransferSite, form)); this.ws.send(this.client.transferSite(form));
} }
public banUser(form: BanUserForm) { public banUser(form: BanUserForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.BanUser, form)); this.ws.send(this.client.banUser(form));
} }
public addAdmin(form: AddAdminForm) { public addAdmin(form: AddAdminForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.AddAdmin, form)); this.ws.send(this.client.addAdmin(form));
} }
public getUserDetails(form: GetUserDetailsForm) { public getUserDetails(form: GetUserDetailsForm) {
this.setAuth(form, false); this.setAuth(form, false);
this.ws.send(this.wsSendWrapper(UserOperation.GetUserDetails, form)); this.ws.send(this.client.getUserDetails(form));
} }
public getReplies(form: GetRepliesForm) { public getReplies(form: GetRepliesForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.GetReplies, form)); this.ws.send(this.client.getReplies(form));
} }
public getUserMentions(form: GetUserMentionsForm) { public getUserMentions(form: GetUserMentionsForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.GetUserMentions, form)); this.ws.send(this.client.getUserMentions(form));
} }
public markUserMentionAsRead(form: MarkUserMentionAsReadForm) { public markUserMentionAsRead(form: MarkUserMentionAsReadForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.MarkUserMentionAsRead, form)); this.ws.send(this.client.markUserMentionAsRead(form));
} }
public getModlog(form: GetModlogForm) { public getModlog(form: GetModlogForm) {
this.ws.send(this.wsSendWrapper(UserOperation.GetModlog, form)); this.ws.send(this.client.getModlog(form));
} }
public createSite(siteForm: SiteForm) { public createSite(form: SiteForm) {
this.setAuth(siteForm); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.CreateSite, siteForm)); this.ws.send(this.client.createSite(form));
} }
public editSite(siteForm: SiteForm) { public editSite(form: SiteForm) {
this.setAuth(siteForm); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.EditSite, siteForm)); this.ws.send(this.client.editSite(form));
} }
public getSite(form: GetSiteForm = {}) { public getSite(form: GetSiteForm = {}) {
this.setAuth(form, false); this.setAuth(form, false);
this.ws.send(this.wsSendWrapper(UserOperation.GetSite, form)); this.ws.send(this.client.getSite(form));
} }
public getSiteConfig() { public getSiteConfig() {
let siteConfig: GetSiteConfig = {}; let form: GetSiteConfig = {};
this.setAuth(siteConfig); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.GetSiteConfig, siteConfig)); this.ws.send(this.client.getSiteConfig(form));
} }
public search(form: SearchForm) { public search(form: SearchForm) {
this.setAuth(form, false); this.setAuth(form, false);
this.ws.send(this.wsSendWrapper(UserOperation.Search, form)); this.ws.send(this.client.search(form));
} }
public markAllAsRead() { public markAllAsRead() {
let form = {}; let form: MarkAllAsReadForm;
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.MarkAllAsRead, form)); this.ws.send(this.client.markAllAsRead(form));
} }
public saveUserSettings(userSettingsForm: UserSettingsForm) { public saveUserSettings(form: UserSettingsForm) {
this.setAuth(userSettingsForm); this.setAuth(form);
this.ws.send( this.ws.send(this.client.saveUserSettings(form));
this.wsSendWrapper(UserOperation.SaveUserSettings, userSettingsForm)
);
} }
public deleteAccount(form: DeleteAccountForm) { public deleteAccount(form: DeleteAccountForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.DeleteAccount, form)); this.ws.send(this.client.deleteAccount(form));
} }
public passwordReset(form: PasswordResetForm) { public passwordReset(form: PasswordResetForm) {
this.ws.send(this.wsSendWrapper(UserOperation.PasswordReset, form)); this.ws.send(this.client.passwordReset(form));
} }
public passwordChange(form: PasswordChangeForm) { public passwordChange(form: PasswordChangeForm) {
this.ws.send(this.wsSendWrapper(UserOperation.PasswordChange, form)); this.ws.send(this.client.passwordChange(form));
} }
public createPrivateMessage(form: PrivateMessageForm) { public createPrivateMessage(form: PrivateMessageForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.CreatePrivateMessage, form)); this.ws.send(this.client.createPrivateMessage(form));
} }
public editPrivateMessage(form: EditPrivateMessageForm) { public editPrivateMessage(form: EditPrivateMessageForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.EditPrivateMessage, form)); this.ws.send(this.client.editPrivateMessage(form));
} }
public deletePrivateMessage(form: DeletePrivateMessageForm) { public deletePrivateMessage(form: DeletePrivateMessageForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.DeletePrivateMessage, form)); this.ws.send(this.client.deletePrivateMessage(form));
} }
public markPrivateMessageAsRead(form: MarkPrivateMessageAsReadForm) { public markPrivateMessageAsRead(form: MarkPrivateMessageAsReadForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send( this.ws.send(this.client.markPrivateMessageAsRead(form));
this.wsSendWrapper(UserOperation.MarkPrivateMessageAsRead, form)
);
} }
public getPrivateMessages(form: GetPrivateMessagesForm) { public getPrivateMessages(form: GetPrivateMessagesForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.GetPrivateMessages, form)); this.ws.send(this.client.getPrivateMessages(form));
} }
public saveSiteConfig(form: SiteConfigForm) { public saveSiteConfig(form: SiteConfigForm) {
this.setAuth(form); this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.SaveSiteConfig, form)); this.ws.send(this.client.saveSiteConfig(form));
}
private wsSendWrapper(op: UserOperation, data: MessageType) {
let send = { op: UserOperation[op], data: data };
console.log(send);
return JSON.stringify(send);
} }
private setAuth(obj: any, throwErr: boolean = true) { private setAuth(obj: any, throwErr: boolean = true) {

38
ui/src/utils.ts vendored
View File

@ -34,9 +34,7 @@ import {
PrivateMessage, PrivateMessage,
User, User,
SortType, SortType,
CommentSortType,
ListingType, ListingType,
DataType,
SearchType, SearchType,
WebSocketResponse, WebSocketResponse,
WebSocketJsonResponse, WebSocketJsonResponse,
@ -44,7 +42,9 @@ import {
SearchResponse, SearchResponse,
CommentResponse, CommentResponse,
PostResponse, PostResponse,
} from './interfaces'; } from 'lemmy-js-client';
import { CommentSortType, DataType } from './interfaces';
import { UserService, WebSocketService } from './services'; import { UserService, WebSocketService } from './services';
import Tribute from 'tributejs/src/Tribute.js'; import Tribute from 'tributejs/src/Tribute.js';
@ -273,27 +273,11 @@ export function capitalizeFirstLetter(str: string): string {
} }
export function routeSortTypeToEnum(sort: string): SortType { export function routeSortTypeToEnum(sort: string): SortType {
if (sort == 'new') { return SortType[sort];
return SortType.New;
} else if (sort == 'hot') {
return SortType.Hot;
} else if (sort == 'active') {
return SortType.Active;
} else if (sort == 'topday') {
return SortType.TopDay;
} else if (sort == 'topweek') {
return SortType.TopWeek;
} else if (sort == 'topmonth') {
return SortType.TopMonth;
} else if (sort == 'topyear') {
return SortType.TopYear;
} else if (sort == 'topall') {
return SortType.TopAll;
}
} }
export function routeListingTypeToEnum(type: string): ListingType { export function routeListingTypeToEnum(type: string): ListingType {
return ListingType[capitalizeFirstLetter(type)]; return ListingType[type];
} }
export function routeDataTypeToEnum(type: string): DataType { export function routeDataTypeToEnum(type: string): DataType {
@ -730,8 +714,8 @@ function userSearch(text: string, cb: any) {
if (text) { if (text) {
let form: SearchForm = { let form: SearchForm = {
q: text, q: text,
type_: SearchType[SearchType.Users], type_: SearchType.Users,
sort: SortType[SortType.TopAll], sort: SortType.TopAll,
page: 1, page: 1,
limit: mentionDropdownFetchLimit, limit: mentionDropdownFetchLimit,
}; };
@ -767,8 +751,8 @@ function communitySearch(text: string, cb: any) {
if (text) { if (text) {
let form: SearchForm = { let form: SearchForm = {
q: text, q: text,
type_: SearchType[SearchType.Communities], type_: SearchType.Communities,
sort: SortType[SortType.TopAll], sort: SortType.TopAll,
page: 1, page: 1,
limit: mentionDropdownFetchLimit, limit: mentionDropdownFetchLimit,
}; };
@ -804,7 +788,7 @@ export function getListingTypeFromProps(props: any): ListingType {
return props.match.params.listing_type return props.match.params.listing_type
? routeListingTypeToEnum(props.match.params.listing_type) ? routeListingTypeToEnum(props.match.params.listing_type)
: UserService.Instance.user : UserService.Instance.user
? UserService.Instance.user.default_listing_type ? Object.values(ListingType)[UserService.Instance.user.default_listing_type]
: ListingType.All; : ListingType.All;
} }
@ -819,7 +803,7 @@ export function getSortTypeFromProps(props: any): SortType {
return props.match.params.sort return props.match.params.sort
? routeSortTypeToEnum(props.match.params.sort) ? routeSortTypeToEnum(props.match.params.sort)
: UserService.Instance.user : UserService.Instance.user
? UserService.Instance.user.default_sort_type ? Object.values(SortType)[UserService.Instance.user.default_sort_type]
: SortType.Active; : SortType.Active;
} }

5
ui/yarn.lock vendored
View File

@ -4938,6 +4938,11 @@ lego-api@^1.0.7:
dependencies: dependencies:
chain-able "^3.0.0" chain-able "^3.0.0"
lemmy-js-client@^1.0.8:
version "1.0.8"
resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-1.0.8.tgz#98e34c8e3cd07427f883f60fad376dc4d6f46e7f"
integrity sha512-YZxD3+8RGz7cRKdI8EIe5iQqQIMm5WzdNz6zZ7/CdkMtXUv6YuMOEv8HLTvBoGuaWIJwlMJ+23NIarxlT26IEw==
leven@^3.1.0: leven@^3.1.0:
version "3.1.0" version "3.1.0"
resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"