mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-05-29 07:08:05 +00:00
* Switch front end to use lemmy-js-client. Fixes #1090 * Adding an HTTP client. Cleaning up Websocket client.
This commit is contained in:
Dessalines
GitHub
parent
dbf231865d
commit
2080534744
1
README.md
vendored
1
README.md
vendored
|
|
@ -112,6 +112,7 @@ Each Lemmy server can set its own moderation policy; appointing site-wide admins
|
|||
|
||||
### Libraries
|
||||
|
||||
- [lemmy-js-client](https://github.com/LemmyNet/lemmy-js-client)
|
||||
- [Kotlin API ( under development )](https://github.com/eiknat/lemmy-client)
|
||||
|
||||
## Support / Donate
|
||||
|
|
|
|||
|
|
@ -94,7 +94,8 @@ pub fn config(cfg: &mut web::ServiceConfig, rate_limit: &RateLimit) {
|
|||
web::post().to(route_post::<MarkCommentAsRead>),
|
||||
)
|
||||
.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
|
||||
.service(
|
||||
|
|
@ -136,6 +137,7 @@ pub fn config(cfg: &mut web::ServiceConfig, rate_limit: &RateLimit) {
|
|||
"/followed_communities",
|
||||
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
|
||||
.route("/ban", web::post().to(route_post::<BanUser>))
|
||||
// Account actions. I don't like that they're in /user maybe /accounts
|
||||
|
|
|
|||
1
ui/package.json
vendored
1
ui/package.json
vendored
|
|
@ -37,6 +37,7 @@
|
|||
"inferno-router": "^7.4.2",
|
||||
"js-cookie": "^2.2.0",
|
||||
"jwt-decode": "^2.2.0",
|
||||
"lemmy-js-client": "^1.0.8",
|
||||
"markdown-it": "^11.0.0",
|
||||
"markdown-it-container": "^3.0.0",
|
||||
"markdown-it-emoji": "^1.4.0",
|
||||
|
|
|
|||
4
ui/src/api_tests/comment.spec.ts
vendored
4
ui/src/api_tests/comment.spec.ts
vendored
|
|
@ -21,7 +21,7 @@ import {
|
|||
API,
|
||||
} from './shared';
|
||||
|
||||
import { PostResponse } from '../interfaces';
|
||||
import { PostResponse } from 'lemmy-js-client';
|
||||
|
||||
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 () => {
|
||||
let alphaUser = await registerUser(alpha);
|
||||
let newAlphaApi: API = {
|
||||
url: alpha.url,
|
||||
client: alpha.client,
|
||||
auth: alphaUser.jwt,
|
||||
};
|
||||
|
||||
|
|
|
|||
489
ui/src/api_tests/shared.ts
vendored
489
ui/src/api_tests/shared.ts
vendored
|
|
@ -1,5 +1,3 @@
|
|||
import fetch from 'node-fetch';
|
||||
|
||||
import {
|
||||
LoginForm,
|
||||
LoginResponse,
|
||||
|
|
@ -20,15 +18,21 @@ import {
|
|||
CommentForm,
|
||||
DeleteCommentForm,
|
||||
RemoveCommentForm,
|
||||
SearchForm,
|
||||
CommentResponse,
|
||||
CommunityForm,
|
||||
DeleteCommunityForm,
|
||||
RemoveCommunityForm,
|
||||
GetUserMentionsForm,
|
||||
CommentLikeForm,
|
||||
CreatePostLikeForm,
|
||||
PrivateMessageForm,
|
||||
EditPrivateMessageForm,
|
||||
DeletePrivateMessageForm,
|
||||
GetFollowedCommunitiesForm,
|
||||
GetPrivateMessagesForm,
|
||||
GetSiteForm,
|
||||
GetPostForm,
|
||||
PrivateMessageResponse,
|
||||
PrivateMessagesResponse,
|
||||
GetUserMentionsResponse,
|
||||
|
|
@ -36,35 +40,33 @@ import {
|
|||
SortType,
|
||||
ListingType,
|
||||
GetSiteResponse,
|
||||
} from '../interfaces';
|
||||
SearchType,
|
||||
LemmyHttp,
|
||||
} from 'lemmy-js-client';
|
||||
|
||||
export interface API {
|
||||
url: string;
|
||||
client: LemmyHttp;
|
||||
auth?: string;
|
||||
}
|
||||
|
||||
function apiUrl(api: API) {
|
||||
return `${api.url}/api/v1`;
|
||||
}
|
||||
|
||||
export let alpha: API = {
|
||||
url: 'http://localhost:8540',
|
||||
client: new LemmyHttp('http://localhost:8540/api/v1'),
|
||||
};
|
||||
|
||||
export let beta: API = {
|
||||
url: 'http://localhost:8550',
|
||||
client: new LemmyHttp('http://localhost:8550/api/v1'),
|
||||
};
|
||||
|
||||
export let gamma: API = {
|
||||
url: 'http://localhost:8560',
|
||||
client: new LemmyHttp('http://localhost:8560/api/v1'),
|
||||
};
|
||||
|
||||
export let delta: API = {
|
||||
url: 'http://localhost:8570',
|
||||
client: new LemmyHttp('http://localhost:8570/api/v1'),
|
||||
};
|
||||
|
||||
export let epsilon: API = {
|
||||
url: 'http://localhost:8580',
|
||||
client: new LemmyHttp('http://localhost:8580/api/v1'),
|
||||
};
|
||||
|
||||
export async function setupLogins() {
|
||||
|
|
@ -72,69 +74,31 @@ export async function setupLogins() {
|
|||
username_or_email: 'lemmy_alpha',
|
||||
password: 'lemmy',
|
||||
};
|
||||
|
||||
let resAlpha: Promise<LoginResponse> = fetch(`${apiUrl(alpha)}/user/login`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: wrapper(formAlpha),
|
||||
}).then(d => d.json());
|
||||
let resAlpha = alpha.client.login(formAlpha);
|
||||
|
||||
let formBeta = {
|
||||
username_or_email: 'lemmy_beta',
|
||||
password: 'lemmy',
|
||||
};
|
||||
|
||||
let resBeta: Promise<LoginResponse> = fetch(`${apiUrl(beta)}/user/login`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: wrapper(formBeta),
|
||||
}).then(d => d.json());
|
||||
let resBeta = beta.client.login(formBeta);
|
||||
|
||||
let formGamma = {
|
||||
username_or_email: 'lemmy_gamma',
|
||||
password: 'lemmy',
|
||||
};
|
||||
|
||||
let resGamma: Promise<LoginResponse> = fetch(`${apiUrl(gamma)}/user/login`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: wrapper(formGamma),
|
||||
}).then(d => d.json());
|
||||
let resGamma = gamma.client.login(formGamma);
|
||||
|
||||
let formDelta = {
|
||||
username_or_email: 'lemmy_delta',
|
||||
password: 'lemmy',
|
||||
};
|
||||
|
||||
let resDelta: Promise<LoginResponse> = fetch(`${apiUrl(delta)}/user/login`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: wrapper(formDelta),
|
||||
}).then(d => d.json());
|
||||
let resDelta = delta.client.login(formDelta);
|
||||
|
||||
let formEpsilon = {
|
||||
username_or_email: 'lemmy_epsilon',
|
||||
password: 'lemmy',
|
||||
};
|
||||
|
||||
let resEpsilon: Promise<LoginResponse> = fetch(
|
||||
`${apiUrl(epsilon)}/user/login`,
|
||||
{
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: wrapper(formEpsilon),
|
||||
}
|
||||
).then(d => d.json());
|
||||
let resEpsilon = epsilon.client.login(formEpsilon);
|
||||
|
||||
let res = await Promise.all([
|
||||
resAlpha,
|
||||
|
|
@ -156,40 +120,24 @@ export async function createPost(
|
|||
community_id: number
|
||||
): Promise<PostResponse> {
|
||||
let name = 'A jest test post';
|
||||
let postForm: PostForm = {
|
||||
let form: PostForm = {
|
||||
name,
|
||||
auth: api.auth,
|
||||
community_id,
|
||||
nsfw: false,
|
||||
};
|
||||
|
||||
let createPostRes: PostResponse = await fetch(`${apiUrl(api)}/post`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: wrapper(postForm),
|
||||
}).then(d => d.json());
|
||||
return createPostRes;
|
||||
return api.client.createPost(form);
|
||||
}
|
||||
|
||||
export async function updatePost(api: API, post: Post): Promise<PostResponse> {
|
||||
let name = 'A jest test federated post, updated';
|
||||
let postForm: PostForm = {
|
||||
let form: PostForm = {
|
||||
name,
|
||||
edit_id: post.id,
|
||||
auth: api.auth,
|
||||
nsfw: false,
|
||||
};
|
||||
|
||||
let updateResponse: PostResponse = await fetch(`${apiUrl(api)}/post`, {
|
||||
method: 'PUT',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: wrapper(postForm),
|
||||
}).then(d => d.json());
|
||||
return updateResponse;
|
||||
return api.client.editPost(form);
|
||||
}
|
||||
|
||||
export async function deletePost(
|
||||
|
|
@ -197,20 +145,12 @@ export async function deletePost(
|
|||
deleted: boolean,
|
||||
post: Post
|
||||
): Promise<PostResponse> {
|
||||
let deletePostForm: DeletePostForm = {
|
||||
let form: DeletePostForm = {
|
||||
edit_id: post.id,
|
||||
deleted: deleted,
|
||||
auth: api.auth,
|
||||
};
|
||||
|
||||
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;
|
||||
return api.client.deletePost(form);
|
||||
}
|
||||
|
||||
export async function removePost(
|
||||
|
|
@ -218,20 +158,12 @@ export async function removePost(
|
|||
removed: boolean,
|
||||
post: Post
|
||||
): Promise<PostResponse> {
|
||||
let removePostForm: RemovePostForm = {
|
||||
let form: RemovePostForm = {
|
||||
edit_id: post.id,
|
||||
removed,
|
||||
auth: api.auth,
|
||||
};
|
||||
|
||||
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;
|
||||
return api.client.removePost(form);
|
||||
}
|
||||
|
||||
export async function stickyPost(
|
||||
|
|
@ -239,21 +171,12 @@ export async function stickyPost(
|
|||
stickied: boolean,
|
||||
post: Post
|
||||
): Promise<PostResponse> {
|
||||
let stickyPostForm: StickyPostForm = {
|
||||
let form: StickyPostForm = {
|
||||
edit_id: post.id,
|
||||
stickied,
|
||||
auth: api.auth,
|
||||
};
|
||||
|
||||
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;
|
||||
return api.client.stickyPost(form);
|
||||
}
|
||||
|
||||
export async function lockPost(
|
||||
|
|
@ -261,57 +184,46 @@ export async function lockPost(
|
|||
locked: boolean,
|
||||
post: Post
|
||||
): Promise<PostResponse> {
|
||||
let lockPostForm: LockPostForm = {
|
||||
let form: LockPostForm = {
|
||||
edit_id: post.id,
|
||||
locked,
|
||||
auth: api.auth,
|
||||
};
|
||||
|
||||
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;
|
||||
return api.client.lockPost(form);
|
||||
}
|
||||
|
||||
export async function searchPost(
|
||||
api: API,
|
||||
post: Post
|
||||
): Promise<SearchResponse> {
|
||||
let searchUrl = `${apiUrl(api)}/search?q=${post.ap_id}&type_=All&sort=TopAll`;
|
||||
let searchResponse: SearchResponse = await fetch(searchUrl, {
|
||||
method: 'GET',
|
||||
}).then(d => d.json());
|
||||
return searchResponse;
|
||||
let form: SearchForm = {
|
||||
q: post.ap_id,
|
||||
type_: SearchType.All,
|
||||
sort: SortType.TopAll,
|
||||
};
|
||||
return api.client.search(form);
|
||||
}
|
||||
|
||||
export async function getPost(
|
||||
api: API,
|
||||
post_id: number
|
||||
): Promise<GetPostResponse> {
|
||||
let getPostUrl = `${apiUrl(api)}/post?id=${post_id}`;
|
||||
let getPostRes: GetPostResponse = await fetch(getPostUrl, {
|
||||
method: 'GET',
|
||||
}).then(d => d.json());
|
||||
|
||||
return getPostRes;
|
||||
let form: GetPostForm = {
|
||||
id: post_id,
|
||||
};
|
||||
return api.client.getPost(form);
|
||||
}
|
||||
|
||||
export async function searchComment(
|
||||
api: API,
|
||||
comment: Comment
|
||||
): Promise<SearchResponse> {
|
||||
let searchUrl = `${apiUrl(api)}/search?q=${
|
||||
comment.ap_id
|
||||
}&type_=All&sort=TopAll`;
|
||||
let searchResponse: SearchResponse = await fetch(searchUrl, {
|
||||
method: 'GET',
|
||||
}).then(d => d.json());
|
||||
return searchResponse;
|
||||
let form: SearchForm = {
|
||||
q: comment.ap_id,
|
||||
type_: SearchType.All,
|
||||
sort: SortType.TopAll,
|
||||
};
|
||||
return api.client.search(form);
|
||||
}
|
||||
|
||||
export async function searchForBetaCommunity(
|
||||
|
|
@ -319,14 +231,12 @@ export async function searchForBetaCommunity(
|
|||
): Promise<SearchResponse> {
|
||||
// Make sure lemmy-beta/c/main is cached on lemmy_alpha
|
||||
// Use short-hand search url
|
||||
let searchUrl = `${apiUrl(
|
||||
api
|
||||
)}/search?q=!main@lemmy-beta:8550&type_=All&sort=TopAll`;
|
||||
|
||||
let searchResponse: SearchResponse = await fetch(searchUrl, {
|
||||
method: 'GET',
|
||||
}).then(d => d.json());
|
||||
return searchResponse;
|
||||
let form: SearchForm = {
|
||||
q: '!main@lemmy-beta:8550',
|
||||
type_: SearchType.All,
|
||||
sort: SortType.TopAll,
|
||||
};
|
||||
return api.client.search(form);
|
||||
}
|
||||
|
||||
export async function searchForUser(
|
||||
|
|
@ -335,14 +245,12 @@ export async function searchForUser(
|
|||
): Promise<SearchResponse> {
|
||||
// Make sure lemmy-beta/c/main is cached on lemmy_alpha
|
||||
// Use short-hand search url
|
||||
let searchUrl = `${apiUrl(
|
||||
api
|
||||
)}/search?q=${apShortname}&type_=All&sort=TopAll`;
|
||||
|
||||
let searchResponse: SearchResponse = await fetch(searchUrl, {
|
||||
method: 'GET',
|
||||
}).then(d => d.json());
|
||||
return searchResponse;
|
||||
let form: SearchForm = {
|
||||
q: apShortname,
|
||||
type_: SearchType.All,
|
||||
sort: SortType.TopAll,
|
||||
};
|
||||
return api.client.search(form);
|
||||
}
|
||||
|
||||
export async function followCommunity(
|
||||
|
|
@ -350,41 +258,21 @@ export async function followCommunity(
|
|||
follow: boolean,
|
||||
community_id: number
|
||||
): Promise<CommunityResponse> {
|
||||
let followForm: FollowCommunityForm = {
|
||||
let form: FollowCommunityForm = {
|
||||
community_id,
|
||||
follow,
|
||||
auth: api.auth,
|
||||
};
|
||||
|
||||
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;
|
||||
return api.client.followCommunity(form);
|
||||
}
|
||||
|
||||
export async function checkFollowedCommunities(
|
||||
api: API
|
||||
): Promise<GetFollowedCommunitiesResponse> {
|
||||
let followedCommunitiesUrl = `${apiUrl(
|
||||
api
|
||||
)}/user/followed_communities?&auth=${api.auth}`;
|
||||
let followedCommunitiesRes: GetFollowedCommunitiesResponse = await fetch(
|
||||
followedCommunitiesUrl,
|
||||
{
|
||||
method: 'GET',
|
||||
}
|
||||
).then(d => d.json());
|
||||
return followedCommunitiesRes;
|
||||
let form: GetFollowedCommunitiesForm = {
|
||||
auth: api.auth,
|
||||
};
|
||||
return api.client.getFollowedCommunities(form);
|
||||
}
|
||||
|
||||
export async function likePost(
|
||||
|
|
@ -392,21 +280,13 @@ export async function likePost(
|
|||
score: number,
|
||||
post: Post
|
||||
): Promise<PostResponse> {
|
||||
let likePostForm: CreatePostLikeForm = {
|
||||
let form: CreatePostLikeForm = {
|
||||
post_id: post.id,
|
||||
score: score,
|
||||
auth: api.auth,
|
||||
};
|
||||
|
||||
let likePostRes: PostResponse = await fetch(`${apiUrl(api)}/post/like`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: wrapper(likePostForm),
|
||||
}).then(d => d.json());
|
||||
|
||||
return likePostRes;
|
||||
return api.client.likePost(form);
|
||||
}
|
||||
|
||||
export async function createComment(
|
||||
|
|
@ -415,21 +295,13 @@ export async function createComment(
|
|||
parent_id?: number,
|
||||
content = 'a jest test comment'
|
||||
): Promise<CommentResponse> {
|
||||
let commentForm: CommentForm = {
|
||||
let form: CommentForm = {
|
||||
content,
|
||||
post_id,
|
||||
parent_id,
|
||||
auth: api.auth,
|
||||
};
|
||||
|
||||
let createResponse: CommentResponse = await fetch(`${apiUrl(api)}/comment`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: wrapper(commentForm),
|
||||
}).then(d => d.json());
|
||||
return createResponse;
|
||||
return api.client.createComment(form);
|
||||
}
|
||||
|
||||
export async function updateComment(
|
||||
|
|
@ -437,20 +309,12 @@ export async function updateComment(
|
|||
edit_id: number,
|
||||
content = 'A jest test federated comment update'
|
||||
): Promise<CommentResponse> {
|
||||
let commentForm: CommentForm = {
|
||||
let form: CommentForm = {
|
||||
content,
|
||||
edit_id,
|
||||
auth: api.auth,
|
||||
};
|
||||
|
||||
let updateResponse: CommentResponse = await fetch(`${apiUrl(api)}/comment`, {
|
||||
method: 'PUT',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: wrapper(commentForm),
|
||||
}).then(d => d.json());
|
||||
return updateResponse;
|
||||
return api.client.editComment(form);
|
||||
}
|
||||
|
||||
export async function deleteComment(
|
||||
|
|
@ -458,23 +322,12 @@ export async function deleteComment(
|
|||
deleted: boolean,
|
||||
edit_id: number
|
||||
): Promise<CommentResponse> {
|
||||
let deleteCommentForm: DeleteCommentForm = {
|
||||
let form: DeleteCommentForm = {
|
||||
edit_id,
|
||||
deleted,
|
||||
auth: api.auth,
|
||||
};
|
||||
|
||||
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;
|
||||
return api.client.deleteComment(form);
|
||||
}
|
||||
|
||||
export async function removeComment(
|
||||
|
|
@ -482,33 +335,21 @@ export async function removeComment(
|
|||
removed: boolean,
|
||||
edit_id: number
|
||||
): Promise<CommentResponse> {
|
||||
let removeCommentForm: RemoveCommentForm = {
|
||||
let form: RemoveCommentForm = {
|
||||
edit_id,
|
||||
removed,
|
||||
auth: api.auth,
|
||||
};
|
||||
|
||||
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;
|
||||
return api.client.removeComment(form);
|
||||
}
|
||||
|
||||
export async function getMentions(api: API): Promise<GetUserMentionsResponse> {
|
||||
let getMentionUrl = `${apiUrl(
|
||||
api
|
||||
)}/user/mention?sort=New&unread_only=false&auth=${api.auth}`;
|
||||
let getMentionsRes: GetUserMentionsResponse = await fetch(getMentionUrl, {
|
||||
method: 'GET',
|
||||
}).then(d => d.json());
|
||||
return getMentionsRes;
|
||||
let form: GetUserMentionsForm = {
|
||||
sort: SortType.New,
|
||||
unread_only: false,
|
||||
auth: api.auth,
|
||||
};
|
||||
return api.client.getUserMentions(form);
|
||||
}
|
||||
|
||||
export async function likeComment(
|
||||
|
|
@ -516,48 +357,26 @@ export async function likeComment(
|
|||
score: number,
|
||||
comment: Comment
|
||||
): Promise<CommentResponse> {
|
||||
let likeCommentForm: CommentLikeForm = {
|
||||
let form: CommentLikeForm = {
|
||||
comment_id: comment.id,
|
||||
score,
|
||||
auth: api.auth,
|
||||
};
|
||||
|
||||
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;
|
||||
return api.client.likeComment(form);
|
||||
}
|
||||
|
||||
export async function createCommunity(
|
||||
api: API,
|
||||
name_: string = randomString(5)
|
||||
): Promise<CommunityResponse> {
|
||||
let communityForm: CommunityForm = {
|
||||
let form: CommunityForm = {
|
||||
name: name_,
|
||||
title: name_,
|
||||
category_id: 1,
|
||||
nsfw: false,
|
||||
auth: api.auth,
|
||||
};
|
||||
|
||||
let createCommunityRes: CommunityResponse = await fetch(
|
||||
`${apiUrl(api)}/community`,
|
||||
{
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: wrapper(communityForm),
|
||||
}
|
||||
).then(d => d.json());
|
||||
return createCommunityRes;
|
||||
return api.client.createCommunity(form);
|
||||
}
|
||||
|
||||
export async function deleteCommunity(
|
||||
|
|
@ -565,23 +384,12 @@ export async function deleteCommunity(
|
|||
deleted: boolean,
|
||||
edit_id: number
|
||||
): Promise<CommunityResponse> {
|
||||
let deleteCommunityForm: DeleteCommunityForm = {
|
||||
let form: DeleteCommunityForm = {
|
||||
edit_id,
|
||||
deleted,
|
||||
auth: api.auth,
|
||||
};
|
||||
|
||||
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;
|
||||
return api.client.deleteCommunity(form);
|
||||
}
|
||||
|
||||
export async function removeCommunity(
|
||||
|
|
@ -589,23 +397,12 @@ export async function removeCommunity(
|
|||
removed: boolean,
|
||||
edit_id: number
|
||||
): Promise<CommunityResponse> {
|
||||
let removeCommunityForm: RemoveCommunityForm = {
|
||||
let form: RemoveCommunityForm = {
|
||||
edit_id,
|
||||
removed,
|
||||
auth: api.auth,
|
||||
};
|
||||
|
||||
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;
|
||||
return api.client.removeCommunity(form);
|
||||
}
|
||||
|
||||
export async function createPrivateMessage(
|
||||
|
|
@ -613,23 +410,12 @@ export async function createPrivateMessage(
|
|||
recipient_id: number
|
||||
): Promise<PrivateMessageResponse> {
|
||||
let content = 'A jest test federated private message';
|
||||
let privateMessageForm: PrivateMessageForm = {
|
||||
let form: PrivateMessageForm = {
|
||||
content,
|
||||
recipient_id,
|
||||
auth: api.auth,
|
||||
};
|
||||
|
||||
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;
|
||||
return api.client.createPrivateMessage(form);
|
||||
}
|
||||
|
||||
export async function updatePrivateMessage(
|
||||
|
|
@ -637,23 +423,12 @@ export async function updatePrivateMessage(
|
|||
edit_id: number
|
||||
): Promise<PrivateMessageResponse> {
|
||||
let updatedContent = 'A jest test federated private message edited';
|
||||
let updatePrivateMessageForm: EditPrivateMessageForm = {
|
||||
let form: EditPrivateMessageForm = {
|
||||
content: updatedContent,
|
||||
edit_id,
|
||||
auth: api.auth,
|
||||
};
|
||||
|
||||
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;
|
||||
return api.client.editPrivateMessage(form);
|
||||
}
|
||||
|
||||
export async function deletePrivateMessage(
|
||||
|
|
@ -661,50 +436,26 @@ export async function deletePrivateMessage(
|
|||
deleted: boolean,
|
||||
edit_id: number
|
||||
): Promise<PrivateMessageResponse> {
|
||||
let deletePrivateMessageForm: DeletePrivateMessageForm = {
|
||||
let form: DeletePrivateMessageForm = {
|
||||
deleted,
|
||||
edit_id,
|
||||
auth: api.auth,
|
||||
};
|
||||
|
||||
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;
|
||||
return api.client.deletePrivateMessage(form);
|
||||
}
|
||||
|
||||
export async function registerUser(
|
||||
api: API,
|
||||
username: string = randomString(5)
|
||||
): Promise<LoginResponse> {
|
||||
let registerForm: RegisterForm = {
|
||||
let form: RegisterForm = {
|
||||
username,
|
||||
password: 'test',
|
||||
password_verify: 'test',
|
||||
admin: false,
|
||||
show_nsfw: true,
|
||||
};
|
||||
|
||||
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;
|
||||
return api.client.register(form);
|
||||
}
|
||||
|
||||
export async function saveUserSettingsBio(
|
||||
|
|
@ -714,54 +465,36 @@ export async function saveUserSettingsBio(
|
|||
let form: UserSettingsForm = {
|
||||
show_nsfw: true,
|
||||
theme: 'darkly',
|
||||
default_sort_type: SortType.Active,
|
||||
default_listing_type: ListingType.All,
|
||||
default_sort_type: Object.keys(SortType).indexOf(SortType.Active),
|
||||
default_listing_type: Object.keys(ListingType).indexOf(ListingType.All),
|
||||
lang: 'en',
|
||||
show_avatars: true,
|
||||
send_notifications_to_email: false,
|
||||
bio: 'a changed bio',
|
||||
auth,
|
||||
};
|
||||
|
||||
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;
|
||||
return api.client.saveUserSettings(form);
|
||||
}
|
||||
|
||||
export async function getSite(
|
||||
api: API,
|
||||
auth: string
|
||||
): Promise<GetSiteResponse> {
|
||||
let siteUrl = `${apiUrl(api)}/site?auth=${auth}`;
|
||||
|
||||
let res: GetSiteResponse = await fetch(siteUrl, {
|
||||
method: 'GET',
|
||||
}).then(d => d.json());
|
||||
return res;
|
||||
let form: GetSiteForm = {
|
||||
auth,
|
||||
};
|
||||
return api.client.getSite(form);
|
||||
}
|
||||
|
||||
export async function listPrivateMessages(
|
||||
api: API
|
||||
): Promise<PrivateMessagesResponse> {
|
||||
let getPrivateMessagesUrl = `${apiUrl(api)}/private_message/list?auth=${
|
||||
api.auth
|
||||
}&unread_only=false&limit=999`;
|
||||
|
||||
let getPrivateMessagesRes: PrivateMessagesResponse = await fetch(
|
||||
getPrivateMessagesUrl,
|
||||
{
|
||||
method: 'GET',
|
||||
}
|
||||
).then(d => d.json());
|
||||
return getPrivateMessagesRes;
|
||||
let form: GetPrivateMessagesForm = {
|
||||
auth: api.auth,
|
||||
unread_only: false,
|
||||
limit: 999,
|
||||
};
|
||||
return api.client.getPrivateMessages(form);
|
||||
}
|
||||
|
||||
export async function unfollowRemotes(
|
||||
|
|
|
|||
2
ui/src/components/admin-settings.tsx
vendored
2
ui/src/components/admin-settings.tsx
vendored
|
|
@ -9,7 +9,7 @@ import {
|
|||
SiteConfigForm,
|
||||
GetSiteConfigResponse,
|
||||
WebSocketJsonResponse,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { WebSocketService } from '../services';
|
||||
import { wsJsonToRes, capitalizeFirstLetter, toast, randomStr } from '../utils';
|
||||
import autosize from 'autosize';
|
||||
|
|
|
|||
2
ui/src/components/comment-form.tsx
vendored
2
ui/src/components/comment-form.tsx
vendored
|
|
@ -8,7 +8,7 @@ import {
|
|||
WebSocketJsonResponse,
|
||||
UserOperation,
|
||||
CommentResponse,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { capitalizeFirstLetter, wsJsonToRes } from '../utils';
|
||||
import { WebSocketService, UserService } from '../services';
|
||||
import { i18n } from '../i18next';
|
||||
|
|
|
|||
5
ui/src/components/comment-node.tsx
vendored
5
ui/src/components/comment-node.tsx
vendored
|
|
@ -16,10 +16,9 @@ import {
|
|||
AddAdminForm,
|
||||
TransferCommunityForm,
|
||||
TransferSiteForm,
|
||||
BanType,
|
||||
CommentSortType,
|
||||
SortType,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { CommentSortType, BanType } from '../interfaces';
|
||||
import { WebSocketService, UserService } from '../services';
|
||||
import {
|
||||
mdToHtml,
|
||||
|
|
|
|||
4
ui/src/components/comment-nodes.tsx
vendored
4
ui/src/components/comment-nodes.tsx
vendored
|
|
@ -1,11 +1,11 @@
|
|||
import { Component } from 'inferno';
|
||||
import { CommentSortType } from '../interfaces';
|
||||
import {
|
||||
CommentNode as CommentNodeI,
|
||||
CommunityUser,
|
||||
UserView,
|
||||
CommentSortType,
|
||||
SortType,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { commentSort, commentSortSortType } from '../utils';
|
||||
import { CommentNode } from './comment-node';
|
||||
|
||||
|
|
|
|||
4
ui/src/components/communities.tsx
vendored
4
ui/src/components/communities.tsx
vendored
|
|
@ -13,7 +13,7 @@ import {
|
|||
WebSocketJsonResponse,
|
||||
GetSiteResponse,
|
||||
Site,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { WebSocketService } from '../services';
|
||||
import { wsJsonToRes, toast, getPageFromProps } from '../utils';
|
||||
import { CommunityLink } from './community-link';
|
||||
|
|
@ -218,7 +218,7 @@ export class Communities extends Component<any, CommunitiesState> {
|
|||
|
||||
refetch() {
|
||||
let listCommunitiesForm: ListCommunitiesForm = {
|
||||
sort: SortType[SortType.TopAll],
|
||||
sort: SortType.TopAll,
|
||||
limit: communityLimit,
|
||||
page: this.state.page,
|
||||
};
|
||||
|
|
|
|||
4
ui/src/components/community-form.tsx
vendored
4
ui/src/components/community-form.tsx
vendored
|
|
@ -9,12 +9,12 @@ import {
|
|||
ListCategoriesResponse,
|
||||
CommunityResponse,
|
||||
WebSocketJsonResponse,
|
||||
} from '../interfaces';
|
||||
Community,
|
||||
} from 'lemmy-js-client';
|
||||
import { WebSocketService } from '../services';
|
||||
import { wsJsonToRes, capitalizeFirstLetter, toast, randomStr } from '../utils';
|
||||
import { i18n } from '../i18next';
|
||||
|
||||
import { Community } from '../interfaces';
|
||||
import { MarkdownTextArea } from './markdown-textarea';
|
||||
import { ImageUploadForm } from './image-upload-form';
|
||||
|
||||
|
|
|
|||
2
ui/src/components/community-link.tsx
vendored
2
ui/src/components/community-link.tsx
vendored
|
|
@ -1,6 +1,6 @@
|
|||
import { Component } from 'inferno';
|
||||
import { Link } from 'inferno-router';
|
||||
import { Community } from '../interfaces';
|
||||
import { Community } from 'lemmy-js-client';
|
||||
import { hostname, pictrsAvatarThumbnail, showAvatars } from '../utils';
|
||||
|
||||
interface CommunityOther {
|
||||
|
|
|
|||
28
ui/src/components/community.tsx
vendored
28
ui/src/components/community.tsx
vendored
|
|
@ -2,6 +2,7 @@ import { Component, linkEvent } from 'inferno';
|
|||
import { Helmet } from 'inferno-helmet';
|
||||
import { Subscription } from 'rxjs';
|
||||
import { retryWhen, delay, take } from 'rxjs/operators';
|
||||
import { DataType } from '../interfaces';
|
||||
import {
|
||||
UserOperation,
|
||||
Community as CommunityI,
|
||||
|
|
@ -14,7 +15,6 @@ import {
|
|||
GetPostsForm,
|
||||
GetCommunityForm,
|
||||
ListingType,
|
||||
DataType,
|
||||
GetPostsResponse,
|
||||
PostResponse,
|
||||
AddModToCommunityResponse,
|
||||
|
|
@ -26,7 +26,7 @@ import {
|
|||
WebSocketJsonResponse,
|
||||
GetSiteResponse,
|
||||
Site,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { WebSocketService } from '../services';
|
||||
import { PostListings } from './post-listings';
|
||||
import { CommentNodes } from './comment-nodes';
|
||||
|
|
@ -78,7 +78,7 @@ interface CommunityProps {
|
|||
|
||||
interface UrlParams {
|
||||
dataType?: string;
|
||||
sort?: string;
|
||||
sort?: SortType;
|
||||
page?: number;
|
||||
}
|
||||
|
||||
|
|
@ -287,9 +287,7 @@ export class Community extends Component<any, State> {
|
|||
<SortSelect sort={this.state.sort} onChange={this.handleSortChange} />
|
||||
</span>
|
||||
<a
|
||||
href={`/feeds/c/${this.state.communityName}.xml?sort=${
|
||||
SortType[this.state.sort]
|
||||
}`}
|
||||
href={`/feeds/c/${this.state.communityName}.xml?sort=${this.state.sort}`}
|
||||
target="_blank"
|
||||
title="RSS"
|
||||
rel="noopener"
|
||||
|
|
@ -336,20 +334,18 @@ export class Community extends Component<any, State> {
|
|||
}
|
||||
|
||||
handleSortChange(val: SortType) {
|
||||
this.updateUrl({ sort: SortType[val].toLowerCase(), page: 1 });
|
||||
this.updateUrl({ sort: val, page: 1 });
|
||||
window.scrollTo(0, 0);
|
||||
}
|
||||
|
||||
handleDataTypeChange(val: DataType) {
|
||||
this.updateUrl({ dataType: DataType[val].toLowerCase(), page: 1 });
|
||||
this.updateUrl({ dataType: DataType[val], page: 1 });
|
||||
window.scrollTo(0, 0);
|
||||
}
|
||||
|
||||
updateUrl(paramUpdates: UrlParams) {
|
||||
const dataTypeStr =
|
||||
paramUpdates.dataType || DataType[this.state.dataType].toLowerCase();
|
||||
const sortStr =
|
||||
paramUpdates.sort || SortType[this.state.sort].toLowerCase();
|
||||
const dataTypeStr = paramUpdates.dataType || DataType[this.state.dataType];
|
||||
const sortStr = paramUpdates.sort || this.state.sort;
|
||||
const page = paramUpdates.page || this.state.page;
|
||||
this.props.history.push(
|
||||
`/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 = {
|
||||
page: this.state.page,
|
||||
limit: fetchLimit,
|
||||
sort: SortType[this.state.sort],
|
||||
type_: ListingType[ListingType.Community],
|
||||
sort: this.state.sort,
|
||||
type_: ListingType.Community,
|
||||
community_id: this.state.community.id,
|
||||
};
|
||||
WebSocketService.Instance.getPosts(getPostsForm);
|
||||
|
|
@ -370,8 +366,8 @@ export class Community extends Component<any, State> {
|
|||
let getCommentsForm: GetCommentsForm = {
|
||||
page: this.state.page,
|
||||
limit: fetchLimit,
|
||||
sort: SortType[this.state.sort],
|
||||
type_: ListingType[ListingType.Community],
|
||||
sort: this.state.sort,
|
||||
type_: ListingType.Community,
|
||||
community_id: this.state.community.id,
|
||||
};
|
||||
WebSocketService.Instance.getComments(getCommentsForm);
|
||||
|
|
|
|||
2
ui/src/components/create-community.tsx
vendored
2
ui/src/components/create-community.tsx
vendored
|
|
@ -9,7 +9,7 @@ import {
|
|||
WebSocketJsonResponse,
|
||||
GetSiteResponse,
|
||||
Site,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { toast, wsJsonToRes } from '../utils';
|
||||
import { WebSocketService, UserService } from '../services';
|
||||
import { i18n } from '../i18next';
|
||||
|
|
|
|||
2
ui/src/components/create-post.tsx
vendored
2
ui/src/components/create-post.tsx
vendored
|
|
@ -11,7 +11,7 @@ import {
|
|||
WebSocketJsonResponse,
|
||||
GetSiteResponse,
|
||||
Site,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { i18n } from '../i18next';
|
||||
|
||||
interface CreatePostState {
|
||||
|
|
|
|||
2
ui/src/components/create-private-message.tsx
vendored
2
ui/src/components/create-private-message.tsx
vendored
|
|
@ -10,7 +10,7 @@ import {
|
|||
GetSiteResponse,
|
||||
Site,
|
||||
PrivateMessageFormParams,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { toast, wsJsonToRes } from '../utils';
|
||||
import { i18n } from '../i18next';
|
||||
|
||||
|
|
|
|||
2
ui/src/components/footer.tsx
vendored
2
ui/src/components/footer.tsx
vendored
|
|
@ -9,7 +9,7 @@ import {
|
|||
UserOperation,
|
||||
WebSocketJsonResponse,
|
||||
GetSiteResponse,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
|
||||
interface FooterState {
|
||||
version: string;
|
||||
|
|
|
|||
2
ui/src/components/iframely-card.tsx
vendored
2
ui/src/components/iframely-card.tsx
vendored
|
|
@ -1,5 +1,5 @@
|
|||
import { Component, linkEvent } from 'inferno';
|
||||
import { Post } from '../interfaces';
|
||||
import { Post } from 'lemmy-js-client';
|
||||
import { mdToHtml } from '../utils';
|
||||
import { i18n } from '../i18next';
|
||||
|
||||
|
|
|
|||
6
ui/src/components/inbox.tsx
vendored
6
ui/src/components/inbox.tsx
vendored
|
|
@ -19,7 +19,7 @@ import {
|
|||
PrivateMessageResponse,
|
||||
GetSiteResponse,
|
||||
Site,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { WebSocketService, UserService } from '../services';
|
||||
import {
|
||||
wsJsonToRes,
|
||||
|
|
@ -399,7 +399,7 @@ export class Inbox extends Component<any, InboxState> {
|
|||
|
||||
refetch() {
|
||||
let repliesForm: GetRepliesForm = {
|
||||
sort: SortType[this.state.sort],
|
||||
sort: this.state.sort,
|
||||
unread_only: this.state.unreadOrAll == UnreadOrAll.Unread,
|
||||
page: this.state.page,
|
||||
limit: fetchLimit,
|
||||
|
|
@ -407,7 +407,7 @@ export class Inbox extends Component<any, InboxState> {
|
|||
WebSocketService.Instance.getReplies(repliesForm);
|
||||
|
||||
let userMentionsForm: GetUserMentionsForm = {
|
||||
sort: SortType[this.state.sort],
|
||||
sort: this.state.sort,
|
||||
unread_only: this.state.unreadOrAll == UnreadOrAll.Unread,
|
||||
page: this.state.page,
|
||||
limit: fetchLimit,
|
||||
|
|
|
|||
2
ui/src/components/instances.tsx
vendored
2
ui/src/components/instances.tsx
vendored
|
|
@ -6,7 +6,7 @@ import {
|
|||
UserOperation,
|
||||
WebSocketJsonResponse,
|
||||
GetSiteResponse,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { WebSocketService } from '../services';
|
||||
import { wsJsonToRes, toast } from '../utils';
|
||||
import { i18n } from '../i18next';
|
||||
|
|
|
|||
10
ui/src/components/listing-type-select.tsx
vendored
10
ui/src/components/listing-type-select.tsx
vendored
|
|
@ -1,7 +1,7 @@
|
|||
import { Component, linkEvent } from 'inferno';
|
||||
import { ListingType } from '../interfaces';
|
||||
import { ListingType } from 'lemmy-js-client';
|
||||
import { UserService } from '../services';
|
||||
|
||||
import { randomStr } from '../utils';
|
||||
import { i18n } from '../i18next';
|
||||
|
||||
interface ListingTypeSelectProps {
|
||||
|
|
@ -17,6 +17,8 @@ export class ListingTypeSelect extends Component<
|
|||
ListingTypeSelectProps,
|
||||
ListingTypeSelectState
|
||||
> {
|
||||
private id = `listing-type-input-${randomStr()}`;
|
||||
|
||||
private emptyState: ListingTypeSelectState = {
|
||||
type_: this.props.type_,
|
||||
};
|
||||
|
|
@ -42,6 +44,7 @@ export class ListingTypeSelect extends Component<
|
|||
`}
|
||||
>
|
||||
<input
|
||||
id={`${this.id}-subscribed`}
|
||||
type="radio"
|
||||
value={ListingType.Subscribed}
|
||||
checked={this.state.type_ == ListingType.Subscribed}
|
||||
|
|
@ -56,6 +59,7 @@ export class ListingTypeSelect extends Component<
|
|||
}`}
|
||||
>
|
||||
<input
|
||||
id={`${this.id}-all`}
|
||||
type="radio"
|
||||
value={ListingType.All}
|
||||
checked={this.state.type_ == ListingType.All}
|
||||
|
|
@ -68,6 +72,6 @@ export class ListingTypeSelect extends Component<
|
|||
}
|
||||
|
||||
handleTypeChange(i: ListingTypeSelect, event: any) {
|
||||
i.props.onChange(Number(event.target.value));
|
||||
i.props.onChange(event.target.value);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
2
ui/src/components/login.tsx
vendored
2
ui/src/components/login.tsx
vendored
|
|
@ -12,7 +12,7 @@ import {
|
|||
GetCaptchaResponse,
|
||||
WebSocketJsonResponse,
|
||||
Site,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { WebSocketService, UserService } from '../services';
|
||||
import { wsJsonToRes, validEmail, toast } from '../utils';
|
||||
import { i18n } from '../i18next';
|
||||
|
|
|
|||
40
ui/src/components/main.tsx
vendored
40
ui/src/components/main.tsx
vendored
|
|
@ -13,7 +13,6 @@ import {
|
|||
SortType,
|
||||
GetSiteResponse,
|
||||
ListingType,
|
||||
DataType,
|
||||
SiteResponse,
|
||||
GetPostsResponse,
|
||||
PostResponse,
|
||||
|
|
@ -26,7 +25,8 @@ import {
|
|||
AddAdminResponse,
|
||||
BanUserResponse,
|
||||
WebSocketJsonResponse,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { DataType } from '../interfaces';
|
||||
import { WebSocketService, UserService } from '../services';
|
||||
import { PostListings } from './post-listings';
|
||||
import { CommentNodes } from './comment-nodes';
|
||||
|
|
@ -82,9 +82,9 @@ interface MainProps {
|
|||
}
|
||||
|
||||
interface UrlParams {
|
||||
listingType?: string;
|
||||
listingType?: ListingType;
|
||||
dataType?: string;
|
||||
sort?: string;
|
||||
sort?: SortType;
|
||||
page?: number;
|
||||
}
|
||||
|
||||
|
|
@ -151,7 +151,7 @@ export class Main extends Component<any, MainState> {
|
|||
}
|
||||
|
||||
let listCommunitiesForm: ListCommunitiesForm = {
|
||||
sort: SortType[SortType.Hot],
|
||||
sort: SortType.Hot,
|
||||
limit: 6,
|
||||
};
|
||||
|
||||
|
|
@ -334,13 +334,9 @@ export class Main extends Component<any, MainState> {
|
|||
}
|
||||
|
||||
updateUrl(paramUpdates: UrlParams) {
|
||||
const listingTypeStr =
|
||||
paramUpdates.listingType ||
|
||||
ListingType[this.state.listingType].toLowerCase();
|
||||
const dataTypeStr =
|
||||
paramUpdates.dataType || DataType[this.state.dataType].toLowerCase();
|
||||
const sortStr =
|
||||
paramUpdates.sort || SortType[this.state.sort].toLowerCase();
|
||||
const listingTypeStr = paramUpdates.listingType || this.state.listingType;
|
||||
const dataTypeStr = paramUpdates.dataType || DataType[this.state.dataType];
|
||||
const sortStr = paramUpdates.sort || this.state.sort;
|
||||
const page = paramUpdates.page || this.state.page;
|
||||
this.props.history.push(
|
||||
`/home/data_type/${dataTypeStr}/listing_type/${listingTypeStr}/sort/${sortStr}/page/${page}`
|
||||
|
|
@ -549,7 +545,7 @@ export class Main extends Component<any, MainState> {
|
|||
</span>
|
||||
{this.state.listingType == ListingType.All && (
|
||||
<a
|
||||
href={`/feeds/all.xml?sort=${SortType[this.state.sort]}`}
|
||||
href={`/feeds/all.xml?sort=${this.state.sort}`}
|
||||
target="_blank"
|
||||
rel="noopener"
|
||||
title="RSS"
|
||||
|
|
@ -562,9 +558,7 @@ export class Main extends Component<any, MainState> {
|
|||
{UserService.Instance.user &&
|
||||
this.state.listingType == ListingType.Subscribed && (
|
||||
<a
|
||||
href={`/feeds/front/${UserService.Instance.auth}.xml?sort=${
|
||||
SortType[this.state.sort]
|
||||
}`}
|
||||
href={`/feeds/front/${UserService.Instance.auth}.xml?sort=${this.state.sort}`}
|
||||
target="_blank"
|
||||
title="RSS"
|
||||
rel="noopener"
|
||||
|
|
@ -631,17 +625,17 @@ export class Main extends Component<any, MainState> {
|
|||
}
|
||||
|
||||
handleSortChange(val: SortType) {
|
||||
this.updateUrl({ sort: SortType[val].toLowerCase(), page: 1 });
|
||||
this.updateUrl({ sort: val, page: 1 });
|
||||
window.scrollTo(0, 0);
|
||||
}
|
||||
|
||||
handleListingTypeChange(val: ListingType) {
|
||||
this.updateUrl({ listingType: ListingType[val].toLowerCase(), page: 1 });
|
||||
this.updateUrl({ listingType: val, page: 1 });
|
||||
window.scrollTo(0, 0);
|
||||
}
|
||||
|
||||
handleDataTypeChange(val: DataType) {
|
||||
this.updateUrl({ dataType: DataType[val].toLowerCase(), page: 1 });
|
||||
this.updateUrl({ dataType: DataType[val], page: 1 });
|
||||
window.scrollTo(0, 0);
|
||||
}
|
||||
|
||||
|
|
@ -650,16 +644,16 @@ export class Main extends Component<any, MainState> {
|
|||
let getPostsForm: GetPostsForm = {
|
||||
page: this.state.page,
|
||||
limit: fetchLimit,
|
||||
sort: SortType[this.state.sort],
|
||||
type_: ListingType[this.state.listingType],
|
||||
sort: this.state.sort,
|
||||
type_: this.state.listingType,
|
||||
};
|
||||
WebSocketService.Instance.getPosts(getPostsForm);
|
||||
} else {
|
||||
let getCommentsForm: GetCommentsForm = {
|
||||
page: this.state.page,
|
||||
limit: fetchLimit,
|
||||
sort: SortType[this.state.sort],
|
||||
type_: ListingType[this.state.listingType],
|
||||
sort: this.state.sort,
|
||||
type_: this.state.listingType,
|
||||
};
|
||||
WebSocketService.Instance.getComments(getCommentsForm);
|
||||
}
|
||||
|
|
|
|||
2
ui/src/components/modlog.tsx
vendored
2
ui/src/components/modlog.tsx
vendored
|
|
@ -19,7 +19,7 @@ import {
|
|||
WebSocketJsonResponse,
|
||||
GetSiteResponse,
|
||||
Site,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { WebSocketService } from '../services';
|
||||
import { wsJsonToRes, addTypeInfo, fetchLimit, toast } from '../utils';
|
||||
import { MomentTime } from './moment-time';
|
||||
|
|
|
|||
8
ui/src/components/navbar.tsx
vendored
8
ui/src/components/navbar.tsx
vendored
|
|
@ -18,7 +18,7 @@ import {
|
|||
PrivateMessage,
|
||||
PrivateMessageResponse,
|
||||
WebSocketJsonResponse,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import {
|
||||
wsJsonToRes,
|
||||
pictrsAvatarThumbnail,
|
||||
|
|
@ -137,7 +137,7 @@ export class Navbar extends Component<any, NavbarState> {
|
|||
this.context.router.history.push(`/search/`);
|
||||
} else {
|
||||
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() {
|
||||
console.log('Fetching unreads...');
|
||||
let repliesForm: GetRepliesForm = {
|
||||
sort: SortType[SortType.New],
|
||||
sort: SortType.New,
|
||||
unread_only: true,
|
||||
page: 1,
|
||||
limit: fetchLimit,
|
||||
};
|
||||
|
||||
let userMentionsForm: GetUserMentionsForm = {
|
||||
sort: SortType[SortType.New],
|
||||
sort: SortType.New,
|
||||
unread_only: true,
|
||||
page: 1,
|
||||
limit: fetchLimit,
|
||||
|
|
|
|||
2
ui/src/components/password_change.tsx
vendored
2
ui/src/components/password_change.tsx
vendored
|
|
@ -9,7 +9,7 @@ import {
|
|||
WebSocketJsonResponse,
|
||||
GetSiteResponse,
|
||||
Site,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { WebSocketService, UserService } from '../services';
|
||||
import { wsJsonToRes, capitalizeFirstLetter, toast } from '../utils';
|
||||
import { i18n } from '../i18next';
|
||||
|
|
|
|||
12
ui/src/components/post-form.tsx
vendored
12
ui/src/components/post-form.tsx
vendored
|
|
@ -18,7 +18,7 @@ import {
|
|||
SearchType,
|
||||
SearchResponse,
|
||||
WebSocketJsonResponse,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { WebSocketService, UserService } from '../services';
|
||||
import {
|
||||
wsJsonToRes,
|
||||
|
|
@ -121,7 +121,7 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
|
|||
);
|
||||
|
||||
let listCommunitiesForm: ListCommunitiesForm = {
|
||||
sort: SortType[SortType.TopAll],
|
||||
sort: SortType.TopAll,
|
||||
limit: 9999,
|
||||
};
|
||||
|
||||
|
|
@ -405,8 +405,8 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
|
|||
if (validURL(this.state.postForm.url)) {
|
||||
let form: SearchForm = {
|
||||
q: this.state.postForm.url,
|
||||
type_: SearchType[SearchType.Url],
|
||||
sort: SortType[SortType.TopAll],
|
||||
type_: SearchType.Url,
|
||||
sort: SortType.TopAll,
|
||||
page: 1,
|
||||
limit: 6,
|
||||
};
|
||||
|
|
@ -433,8 +433,8 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
|
|||
fetchSimilarPosts() {
|
||||
let form: SearchForm = {
|
||||
q: this.state.postForm.name,
|
||||
type_: SearchType[SearchType.Posts],
|
||||
sort: SortType[SortType.TopAll],
|
||||
type_: SearchType.Posts,
|
||||
sort: SortType.TopAll,
|
||||
community_id: this.state.postForm.community_id,
|
||||
page: 1,
|
||||
limit: 6,
|
||||
|
|
|
|||
4
ui/src/components/post-listing.tsx
vendored
4
ui/src/components/post-listing.tsx
vendored
|
|
@ -11,14 +11,14 @@ import {
|
|||
SavePostForm,
|
||||
CommunityUser,
|
||||
UserView,
|
||||
BanType,
|
||||
BanFromCommunityForm,
|
||||
BanUserForm,
|
||||
AddModToCommunityForm,
|
||||
AddAdminForm,
|
||||
TransferSiteForm,
|
||||
TransferCommunityForm,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { BanType } from '../interfaces';
|
||||
import { MomentTime } from './moment-time';
|
||||
import { PostForm } from './post-form';
|
||||
import { IFramelyCard } from './iframely-card';
|
||||
|
|
|
|||
2
ui/src/components/post-listings.tsx
vendored
2
ui/src/components/post-listings.tsx
vendored
|
|
@ -1,6 +1,6 @@
|
|||
import { Component } from 'inferno';
|
||||
import { Link } from 'inferno-router';
|
||||
import { Post, SortType } from '../interfaces';
|
||||
import { Post, SortType } from 'lemmy-js-client';
|
||||
import { postSort } from '../utils';
|
||||
import { PostListing } from './post-listing';
|
||||
import { i18n } from '../i18next';
|
||||
|
|
|
|||
9
ui/src/components/post.tsx
vendored
9
ui/src/components/post.tsx
vendored
|
|
@ -11,8 +11,6 @@ import {
|
|||
Comment,
|
||||
MarkCommentAsReadForm,
|
||||
CommentResponse,
|
||||
CommentSortType,
|
||||
CommentViewType,
|
||||
CommunityUser,
|
||||
CommunityResponse,
|
||||
CommentNode as CommentNodeI,
|
||||
|
|
@ -28,7 +26,8 @@ import {
|
|||
GetSiteResponse,
|
||||
GetCommunityResponse,
|
||||
WebSocketJsonResponse,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { CommentSortType, CommentViewType } from '../interfaces';
|
||||
import { WebSocketService, UserService } from '../services';
|
||||
import {
|
||||
wsJsonToRes,
|
||||
|
|
@ -439,8 +438,8 @@ export class Post extends Component<any, PostState> {
|
|||
if (this.state.post.url) {
|
||||
let form: SearchForm = {
|
||||
q: this.state.post.url,
|
||||
type_: SearchType[SearchType.Url],
|
||||
sort: SortType[SortType.TopAll],
|
||||
type_: SearchType.Url,
|
||||
sort: SortType.TopAll,
|
||||
page: 1,
|
||||
limit: 6,
|
||||
};
|
||||
|
|
|
|||
4
ui/src/components/private-message-form.tsx
vendored
4
ui/src/components/private-message-form.tsx
vendored
|
|
@ -14,7 +14,7 @@ import {
|
|||
GetUserDetailsForm,
|
||||
SortType,
|
||||
WebSocketJsonResponse,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { WebSocketService } from '../services';
|
||||
import {
|
||||
capitalizeFirstLetter,
|
||||
|
|
@ -77,7 +77,7 @@ export class PrivateMessageForm extends Component<
|
|||
this.state.privateMessageForm.recipient_id = this.props.params.recipient_id;
|
||||
let form: GetUserDetailsForm = {
|
||||
user_id: this.state.privateMessageForm.recipient_id,
|
||||
sort: SortType[SortType.New],
|
||||
sort: SortType.New,
|
||||
saved_only: false,
|
||||
};
|
||||
WebSocketService.Instance.getUserDetails(form);
|
||||
|
|
|
|||
2
ui/src/components/private-message.tsx
vendored
2
ui/src/components/private-message.tsx
vendored
|
|
@ -4,7 +4,7 @@ import {
|
|||
PrivateMessage as PrivateMessageI,
|
||||
DeletePrivateMessageForm,
|
||||
MarkPrivateMessageAsReadForm,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { WebSocketService, UserService } from '../services';
|
||||
import { mdToHtml, pictrsAvatarThumbnail, showAvatars, toast } from '../utils';
|
||||
import { MomentTime } from './moment-time';
|
||||
|
|
|
|||
24
ui/src/components/search.tsx
vendored
24
ui/src/components/search.tsx
vendored
|
|
@ -17,7 +17,7 @@ import {
|
|||
WebSocketJsonResponse,
|
||||
GetSiteResponse,
|
||||
Site,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { WebSocketService } from '../services';
|
||||
import {
|
||||
wsJsonToRes,
|
||||
|
|
@ -57,8 +57,8 @@ interface SearchProps {
|
|||
|
||||
interface UrlParams {
|
||||
q?: string;
|
||||
type_?: string;
|
||||
sort?: string;
|
||||
type_?: SearchType;
|
||||
sort?: SortType;
|
||||
page?: number;
|
||||
}
|
||||
|
||||
|
|
@ -461,8 +461,8 @@ export class Search extends Component<any, SearchState> {
|
|||
search() {
|
||||
let form: SearchForm = {
|
||||
q: this.state.q,
|
||||
type_: SearchType[this.state.type_],
|
||||
sort: SortType[this.state.sort],
|
||||
type_: this.state.type_,
|
||||
sort: this.state.sort,
|
||||
page: this.state.page,
|
||||
limit: fetchLimit,
|
||||
};
|
||||
|
|
@ -473,12 +473,12 @@ export class Search extends Component<any, SearchState> {
|
|||
}
|
||||
|
||||
handleSortChange(val: SortType) {
|
||||
this.updateUrl({ sort: SortType[val].toLowerCase(), page: 1 });
|
||||
this.updateUrl({ sort: val, page: 1 });
|
||||
}
|
||||
|
||||
handleTypeChange(i: Search, event: any) {
|
||||
i.updateUrl({
|
||||
type_: SearchType[Number(event.target.value)].toLowerCase(),
|
||||
type_: SearchType[event.target.value],
|
||||
page: 1,
|
||||
});
|
||||
}
|
||||
|
|
@ -487,8 +487,8 @@ export class Search extends Component<any, SearchState> {
|
|||
event.preventDefault();
|
||||
i.updateUrl({
|
||||
q: i.state.searchText,
|
||||
type_: SearchType[i.state.type_].toLowerCase(),
|
||||
sort: SortType[i.state.sort].toLowerCase(),
|
||||
type_: i.state.type_,
|
||||
sort: i.state.sort,
|
||||
page: i.state.page,
|
||||
});
|
||||
}
|
||||
|
|
@ -499,10 +499,8 @@ export class Search extends Component<any, SearchState> {
|
|||
|
||||
updateUrl(paramUpdates: UrlParams) {
|
||||
const qStr = paramUpdates.q || this.state.q;
|
||||
const typeStr =
|
||||
paramUpdates.type_ || SearchType[this.state.type_].toLowerCase();
|
||||
const sortStr =
|
||||
paramUpdates.sort || SortType[this.state.sort].toLowerCase();
|
||||
const typeStr = paramUpdates.type_ || this.state.type_;
|
||||
const sortStr = paramUpdates.sort || this.state.sort;
|
||||
const page = paramUpdates.page || this.state.page;
|
||||
this.props.history.push(
|
||||
`/search/q/${qStr}/type/${typeStr}/sort/${sortStr}/page/${page}`
|
||||
|
|
|
|||
2
ui/src/components/setup.tsx
vendored
2
ui/src/components/setup.tsx
vendored
|
|
@ -7,7 +7,7 @@ import {
|
|||
LoginResponse,
|
||||
UserOperation,
|
||||
WebSocketJsonResponse,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { WebSocketService, UserService } from '../services';
|
||||
import { wsJsonToRes, toast } from '../utils';
|
||||
import { SiteForm } from './site-form';
|
||||
|
|
|
|||
2
ui/src/components/sidebar.tsx
vendored
2
ui/src/components/sidebar.tsx
vendored
|
|
@ -8,7 +8,7 @@ import {
|
|||
RemoveCommunityForm,
|
||||
UserView,
|
||||
AddModToCommunityForm,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { WebSocketService, UserService } from '../services';
|
||||
import { mdToHtml, getUnixTime } from '../utils';
|
||||
import { CommunityForm } from './community-form';
|
||||
|
|
|
|||
2
ui/src/components/site-form.tsx
vendored
2
ui/src/components/site-form.tsx
vendored
|
|
@ -2,7 +2,7 @@ import { Component, linkEvent } from 'inferno';
|
|||
import { Prompt } from 'inferno-router';
|
||||
import { MarkdownTextArea } from './markdown-textarea';
|
||||
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 { capitalizeFirstLetter, randomStr } from '../utils';
|
||||
import { i18n } from '../i18next';
|
||||
|
|
|
|||
9
ui/src/components/sort-select.tsx
vendored
9
ui/src/components/sort-select.tsx
vendored
|
|
@ -1,6 +1,6 @@
|
|||
import { Component, linkEvent } from 'inferno';
|
||||
import { SortType } from '../interfaces';
|
||||
import { sortingHelpUrl } from '../utils';
|
||||
import { SortType } from 'lemmy-js-client';
|
||||
import { sortingHelpUrl, randomStr } from '../utils';
|
||||
import { i18n } from '../i18next';
|
||||
|
||||
interface SortSelectProps {
|
||||
|
|
@ -14,6 +14,7 @@ interface SortSelectState {
|
|||
}
|
||||
|
||||
export class SortSelect extends Component<SortSelectProps, SortSelectState> {
|
||||
private id = `sort-select-${randomStr()}`;
|
||||
private emptyState: SortSelectState = {
|
||||
sort: this.props.sort,
|
||||
};
|
||||
|
|
@ -33,6 +34,8 @@ export class SortSelect extends Component<SortSelectProps, SortSelectState> {
|
|||
return (
|
||||
<>
|
||||
<select
|
||||
id={this.id}
|
||||
name={this.id}
|
||||
value={this.state.sort}
|
||||
onChange={linkEvent(this, this.handleSortChange)}
|
||||
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) {
|
||||
i.props.onChange(Number(event.target.value));
|
||||
i.props.onChange(event.target.value);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
2
ui/src/components/sponsors.tsx
vendored
2
ui/src/components/sponsors.tsx
vendored
|
|
@ -8,7 +8,7 @@ import {
|
|||
Site,
|
||||
WebSocketJsonResponse,
|
||||
UserOperation,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { i18n } from '../i18next';
|
||||
import { T } from 'inferno-i18next';
|
||||
import { repoUrl, wsJsonToRes, toast } from '../utils';
|
||||
|
|
|
|||
8
ui/src/components/user-details.tsx
vendored
8
ui/src/components/user-details.tsx
vendored
|
|
@ -12,11 +12,11 @@ import {
|
|||
UserDetailsResponse,
|
||||
UserView,
|
||||
WebSocketJsonResponse,
|
||||
UserDetailsView,
|
||||
CommentResponse,
|
||||
BanUserResponse,
|
||||
PostResponse,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { UserDetailsView } from '../interfaces';
|
||||
import {
|
||||
wsJsonToRes,
|
||||
toast,
|
||||
|
|
@ -35,7 +35,7 @@ interface UserDetailsProps {
|
|||
user_id?: number;
|
||||
page: number;
|
||||
limit: number;
|
||||
sort: string;
|
||||
sort: SortType;
|
||||
enableDownvotes: boolean;
|
||||
enableNsfw: boolean;
|
||||
view: UserDetailsView;
|
||||
|
|
@ -137,7 +137,7 @@ export class UserDetails extends Component<UserDetailsProps, UserDetailsState> {
|
|||
];
|
||||
|
||||
// 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));
|
||||
} else {
|
||||
combined.sort((a, b) => b.data.score - a.data.score);
|
||||
|
|
|
|||
2
ui/src/components/user-listing.tsx
vendored
2
ui/src/components/user-listing.tsx
vendored
|
|
@ -1,6 +1,6 @@
|
|||
import { Component } from 'inferno';
|
||||
import { Link } from 'inferno-router';
|
||||
import { UserView } from '../interfaces';
|
||||
import { UserView } from 'lemmy-js-client';
|
||||
import {
|
||||
pictrsAvatarThumbnail,
|
||||
showAvatars,
|
||||
|
|
|
|||
52
ui/src/components/user.tsx
vendored
52
ui/src/components/user.tsx
vendored
|
|
@ -14,10 +14,10 @@ import {
|
|||
DeleteAccountForm,
|
||||
WebSocketJsonResponse,
|
||||
GetSiteResponse,
|
||||
UserDetailsView,
|
||||
UserDetailsResponse,
|
||||
AddAdminResponse,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { UserDetailsView } from '../interfaces';
|
||||
import { WebSocketService, UserService } from '../services';
|
||||
import {
|
||||
wsJsonToRes,
|
||||
|
|
@ -73,7 +73,7 @@ interface UserProps {
|
|||
|
||||
interface UrlParams {
|
||||
view?: string;
|
||||
sort?: string;
|
||||
sort?: SortType;
|
||||
page?: number;
|
||||
}
|
||||
|
||||
|
|
@ -190,17 +190,15 @@ export class User extends Component<any, UserState> {
|
|||
);
|
||||
}
|
||||
|
||||
static getViewFromProps(view: any): UserDetailsView {
|
||||
return view
|
||||
? UserDetailsView[capitalizeFirstLetter(view)]
|
||||
: UserDetailsView.Overview;
|
||||
static getViewFromProps(view: string): UserDetailsView {
|
||||
return view ? UserDetailsView[view] : UserDetailsView.Overview;
|
||||
}
|
||||
|
||||
static getSortTypeFromProps(sort: any): SortType {
|
||||
static getSortTypeFromProps(sort: string): SortType {
|
||||
return sort ? routeSortTypeToEnum(sort) : SortType.New;
|
||||
}
|
||||
|
||||
static getPageFromProps(page: any): number {
|
||||
static getPageFromProps(page: number): number {
|
||||
return page ? Number(page) : 1;
|
||||
}
|
||||
|
||||
|
|
@ -272,7 +270,7 @@ export class User extends Component<any, UserState> {
|
|||
<UserDetails
|
||||
user_id={this.state.user_id}
|
||||
username={this.state.username}
|
||||
sort={SortType[this.state.sort]}
|
||||
sort={this.state.sort}
|
||||
page={this.state.page}
|
||||
limit={fetchLimit}
|
||||
enableDownvotes={this.state.siteRes.site.enable_downvotes}
|
||||
|
|
@ -364,9 +362,7 @@ export class User extends Component<any, UserState> {
|
|||
hideHot
|
||||
/>
|
||||
<a
|
||||
href={`/feeds/u/${this.state.username}.xml?sort=${
|
||||
SortType[this.state.sort]
|
||||
}`}
|
||||
href={`/feeds/u/${this.state.username}.xml?sort=${this.state.sort}`}
|
||||
target="_blank"
|
||||
rel="noopener"
|
||||
title="RSS"
|
||||
|
|
@ -538,7 +534,11 @@ export class User extends Component<any, UserState> {
|
|||
<div class="mr-2">{i18n.t('sort_type')}</div>
|
||||
</label>
|
||||
<ListingTypeSelect
|
||||
type_={this.state.userSettingsForm.default_listing_type}
|
||||
type_={
|
||||
Object.values(ListingType)[
|
||||
this.state.userSettingsForm.default_listing_type
|
||||
]
|
||||
}
|
||||
onChange={this.handleUserSettingsListingTypeChange}
|
||||
/>
|
||||
</form>
|
||||
|
|
@ -547,7 +547,11 @@ export class User extends Component<any, UserState> {
|
|||
<div class="mr-2">{i18n.t('type')}</div>
|
||||
</label>
|
||||
<SortSelect
|
||||
sort={this.state.userSettingsForm.default_sort_type}
|
||||
sort={
|
||||
Object.values(SortType)[
|
||||
this.state.userSettingsForm.default_sort_type
|
||||
]
|
||||
}
|
||||
onChange={this.handleUserSettingsSortTypeChange}
|
||||
/>
|
||||
</form>
|
||||
|
|
@ -859,10 +863,8 @@ export class User extends Component<any, UserState> {
|
|||
|
||||
updateUrl(paramUpdates: UrlParams) {
|
||||
const page = paramUpdates.page || this.state.page;
|
||||
const viewStr =
|
||||
paramUpdates.view || UserDetailsView[this.state.view].toLowerCase();
|
||||
const sortStr =
|
||||
paramUpdates.sort || SortType[this.state.sort].toLowerCase();
|
||||
const viewStr = paramUpdates.view || UserDetailsView[this.state.view];
|
||||
const sortStr = paramUpdates.sort || this.state.sort;
|
||||
this.props.history.push(
|
||||
`/u/${this.state.username}/view/${viewStr}/sort/${sortStr}/page/${page}`
|
||||
);
|
||||
|
|
@ -873,12 +875,12 @@ export class User extends Component<any, UserState> {
|
|||
}
|
||||
|
||||
handleSortChange(val: SortType) {
|
||||
this.updateUrl({ sort: SortType[val].toLowerCase(), page: 1 });
|
||||
this.updateUrl({ sort: val, page: 1 });
|
||||
}
|
||||
|
||||
handleViewChange(i: User, event: any) {
|
||||
i.updateUrl({
|
||||
view: UserDetailsView[Number(event.target.value)].toLowerCase(),
|
||||
view: UserDetailsView[Number(event.target.value)],
|
||||
page: 1,
|
||||
});
|
||||
}
|
||||
|
|
@ -912,12 +914,16 @@ export class User extends Component<any, UserState> {
|
|||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
|
|||
1052
ui/src/interfaces.ts
vendored
1052
ui/src/interfaces.ts
vendored
File diff suppressed because it is too large
Load diff
7
ui/src/services/UserService.ts
vendored
7
ui/src/services/UserService.ts
vendored
|
|
@ -1,9 +1,14 @@
|
|||
import Cookies from 'js-cookie';
|
||||
import { User, Claims, LoginResponse } from '../interfaces';
|
||||
import { User, LoginResponse } from 'lemmy-js-client';
|
||||
import { setTheme } from '../utils';
|
||||
import jwt_decode from 'jwt-decode';
|
||||
import { Subject, BehaviorSubject } from 'rxjs';
|
||||
|
||||
interface Claims {
|
||||
id: number;
|
||||
iss: string;
|
||||
}
|
||||
|
||||
export class UserService {
|
||||
private static _instance: UserService;
|
||||
public user: User;
|
||||
|
|
|
|||
165
ui/src/services/WebSocketService.ts
vendored
165
ui/src/services/WebSocketService.ts
vendored
|
|
@ -1,8 +1,8 @@
|
|||
import { wsUri } from '../env';
|
||||
import {
|
||||
LemmyWebsocket,
|
||||
LoginForm,
|
||||
RegisterForm,
|
||||
UserOperation,
|
||||
CommunityForm,
|
||||
DeleteCommunityForm,
|
||||
RemoveCommunityForm,
|
||||
|
|
@ -53,9 +53,9 @@ import {
|
|||
GetSiteConfig,
|
||||
GetSiteForm,
|
||||
SiteConfigForm,
|
||||
MessageType,
|
||||
MarkAllAsReadForm,
|
||||
WebSocketJsonResponse,
|
||||
} from '../interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
import { UserService } from './';
|
||||
import { i18n } from '../i18next';
|
||||
import { toast } from '../utils';
|
||||
|
|
@ -70,6 +70,7 @@ export class WebSocketService {
|
|||
|
||||
public admins: Array<UserView>;
|
||||
public banned: Array<UserView>;
|
||||
private client = new LemmyWebsocket();
|
||||
|
||||
private constructor() {
|
||||
this.ws = new ReconnectingWebSocket(wsUri);
|
||||
|
|
@ -100,301 +101,287 @@ export class WebSocketService {
|
|||
|
||||
public userJoin() {
|
||||
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) {
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.Login, loginForm));
|
||||
public login(form: LoginForm) {
|
||||
this.ws.send(this.client.login(form));
|
||||
}
|
||||
|
||||
public register(registerForm: RegisterForm) {
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.Register, registerForm));
|
||||
public register(form: RegisterForm) {
|
||||
this.ws.send(this.client.register(form));
|
||||
}
|
||||
|
||||
public getCaptcha() {
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.GetCaptcha, {}));
|
||||
this.ws.send(this.client.getCaptcha());
|
||||
}
|
||||
|
||||
public createCommunity(form: CommunityForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.CreateCommunity, form));
|
||||
this.setAuth(form); // TODO all these setauths at some point would be good to make required
|
||||
this.ws.send(this.client.createCommunity(form));
|
||||
}
|
||||
|
||||
public editCommunity(form: CommunityForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.EditCommunity, form));
|
||||
this.ws.send(this.client.editCommunity(form));
|
||||
}
|
||||
|
||||
public deleteCommunity(form: DeleteCommunityForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.DeleteCommunity, form));
|
||||
this.ws.send(this.client.deleteCommunity(form));
|
||||
}
|
||||
|
||||
public removeCommunity(form: RemoveCommunityForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.RemoveCommunity, form));
|
||||
this.ws.send(this.client.removeCommunity(form));
|
||||
}
|
||||
|
||||
public followCommunity(followCommunityForm: FollowCommunityForm) {
|
||||
this.setAuth(followCommunityForm);
|
||||
this.ws.send(
|
||||
this.wsSendWrapper(UserOperation.FollowCommunity, followCommunityForm)
|
||||
);
|
||||
public followCommunity(form: FollowCommunityForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.client.followCommunity(form));
|
||||
}
|
||||
|
||||
public listCommunities(form: ListCommunitiesForm) {
|
||||
this.setAuth(form, false);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.ListCommunities, form));
|
||||
this.ws.send(this.client.listCommunities(form));
|
||||
}
|
||||
|
||||
public getFollowedCommunities() {
|
||||
let form: GetFollowedCommunitiesForm = { auth: UserService.Instance.auth };
|
||||
this.ws.send(
|
||||
this.wsSendWrapper(UserOperation.GetFollowedCommunities, form)
|
||||
);
|
||||
this.ws.send(this.client.getFollowedCommunities(form));
|
||||
}
|
||||
|
||||
public listCategories() {
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.ListCategories, {}));
|
||||
this.ws.send(this.client.listCategories());
|
||||
}
|
||||
|
||||
public createPost(form: PostForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.CreatePost, form));
|
||||
this.ws.send(this.client.createPost(form));
|
||||
}
|
||||
|
||||
public getPost(form: GetPostForm) {
|
||||
this.setAuth(form, false);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.GetPost, form));
|
||||
this.ws.send(this.client.getPost(form));
|
||||
}
|
||||
|
||||
public getCommunity(form: GetCommunityForm) {
|
||||
this.setAuth(form, false);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.GetCommunity, form));
|
||||
this.ws.send(this.client.getCommunity(form));
|
||||
}
|
||||
|
||||
public createComment(form: CommentForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.CreateComment, form));
|
||||
this.ws.send(this.client.createComment(form));
|
||||
}
|
||||
|
||||
public editComment(form: CommentForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.EditComment, form));
|
||||
this.ws.send(this.client.editComment(form));
|
||||
}
|
||||
|
||||
public deleteComment(form: DeleteCommentForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.DeleteComment, form));
|
||||
this.ws.send(this.client.deleteComment(form));
|
||||
}
|
||||
|
||||
public removeComment(form: RemoveCommentForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.RemoveComment, form));
|
||||
this.ws.send(this.client.removeComment(form));
|
||||
}
|
||||
|
||||
public markCommentAsRead(form: MarkCommentAsReadForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.MarkCommentAsRead, form));
|
||||
this.ws.send(this.client.markCommentAsRead(form));
|
||||
}
|
||||
|
||||
public likeComment(form: CommentLikeForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.CreateCommentLike, form));
|
||||
this.ws.send(this.client.likeComment(form));
|
||||
}
|
||||
|
||||
public saveComment(form: SaveCommentForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.SaveComment, form));
|
||||
this.ws.send(this.client.saveComment(form));
|
||||
}
|
||||
|
||||
public getPosts(form: GetPostsForm) {
|
||||
this.setAuth(form, false);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.GetPosts, form));
|
||||
this.ws.send(this.client.getPosts(form));
|
||||
}
|
||||
|
||||
public getComments(form: GetCommentsForm) {
|
||||
this.setAuth(form, false);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.GetComments, form));
|
||||
this.ws.send(this.client.getComments(form));
|
||||
}
|
||||
|
||||
public likePost(form: CreatePostLikeForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.CreatePostLike, form));
|
||||
this.ws.send(this.client.likePost(form));
|
||||
}
|
||||
|
||||
public editPost(form: PostForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.EditPost, form));
|
||||
this.ws.send(this.client.editPost(form));
|
||||
}
|
||||
|
||||
public deletePost(form: DeletePostForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.DeletePost, form));
|
||||
this.ws.send(this.client.deletePost(form));
|
||||
}
|
||||
|
||||
public removePost(form: RemovePostForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.RemovePost, form));
|
||||
this.ws.send(this.client.removePost(form));
|
||||
}
|
||||
|
||||
public lockPost(form: LockPostForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.LockPost, form));
|
||||
this.ws.send(this.client.lockPost(form));
|
||||
}
|
||||
|
||||
public stickyPost(form: StickyPostForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.StickyPost, form));
|
||||
this.ws.send(this.client.stickyPost(form));
|
||||
}
|
||||
|
||||
public savePost(form: SavePostForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.SavePost, form));
|
||||
this.ws.send(this.client.savePost(form));
|
||||
}
|
||||
|
||||
public banFromCommunity(form: BanFromCommunityForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.BanFromCommunity, form));
|
||||
this.ws.send(this.client.banFromCommunity(form));
|
||||
}
|
||||
|
||||
public addModToCommunity(form: AddModToCommunityForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.AddModToCommunity, form));
|
||||
this.ws.send(this.client.addModToCommunity(form));
|
||||
}
|
||||
|
||||
public transferCommunity(form: TransferCommunityForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.TransferCommunity, form));
|
||||
this.ws.send(this.client.transferCommunity(form));
|
||||
}
|
||||
|
||||
public transferSite(form: TransferSiteForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.TransferSite, form));
|
||||
this.ws.send(this.client.transferSite(form));
|
||||
}
|
||||
|
||||
public banUser(form: BanUserForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.BanUser, form));
|
||||
this.ws.send(this.client.banUser(form));
|
||||
}
|
||||
|
||||
public addAdmin(form: AddAdminForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.AddAdmin, form));
|
||||
this.ws.send(this.client.addAdmin(form));
|
||||
}
|
||||
|
||||
public getUserDetails(form: GetUserDetailsForm) {
|
||||
this.setAuth(form, false);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.GetUserDetails, form));
|
||||
this.ws.send(this.client.getUserDetails(form));
|
||||
}
|
||||
|
||||
public getReplies(form: GetRepliesForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.GetReplies, form));
|
||||
this.ws.send(this.client.getReplies(form));
|
||||
}
|
||||
|
||||
public getUserMentions(form: GetUserMentionsForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.GetUserMentions, form));
|
||||
this.ws.send(this.client.getUserMentions(form));
|
||||
}
|
||||
|
||||
public markUserMentionAsRead(form: MarkUserMentionAsReadForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.MarkUserMentionAsRead, form));
|
||||
this.ws.send(this.client.markUserMentionAsRead(form));
|
||||
}
|
||||
|
||||
public getModlog(form: GetModlogForm) {
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.GetModlog, form));
|
||||
this.ws.send(this.client.getModlog(form));
|
||||
}
|
||||
|
||||
public createSite(siteForm: SiteForm) {
|
||||
this.setAuth(siteForm);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.CreateSite, siteForm));
|
||||
public createSite(form: SiteForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.client.createSite(form));
|
||||
}
|
||||
|
||||
public editSite(siteForm: SiteForm) {
|
||||
this.setAuth(siteForm);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.EditSite, siteForm));
|
||||
public editSite(form: SiteForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.client.editSite(form));
|
||||
}
|
||||
|
||||
public getSite(form: GetSiteForm = {}) {
|
||||
this.setAuth(form, false);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.GetSite, form));
|
||||
this.ws.send(this.client.getSite(form));
|
||||
}
|
||||
|
||||
public getSiteConfig() {
|
||||
let siteConfig: GetSiteConfig = {};
|
||||
this.setAuth(siteConfig);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.GetSiteConfig, siteConfig));
|
||||
let form: GetSiteConfig = {};
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.client.getSiteConfig(form));
|
||||
}
|
||||
|
||||
public search(form: SearchForm) {
|
||||
this.setAuth(form, false);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.Search, form));
|
||||
this.ws.send(this.client.search(form));
|
||||
}
|
||||
|
||||
public markAllAsRead() {
|
||||
let form = {};
|
||||
let form: MarkAllAsReadForm;
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.MarkAllAsRead, form));
|
||||
this.ws.send(this.client.markAllAsRead(form));
|
||||
}
|
||||
|
||||
public saveUserSettings(userSettingsForm: UserSettingsForm) {
|
||||
this.setAuth(userSettingsForm);
|
||||
this.ws.send(
|
||||
this.wsSendWrapper(UserOperation.SaveUserSettings, userSettingsForm)
|
||||
);
|
||||
public saveUserSettings(form: UserSettingsForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.client.saveUserSettings(form));
|
||||
}
|
||||
|
||||
public deleteAccount(form: DeleteAccountForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.DeleteAccount, form));
|
||||
this.ws.send(this.client.deleteAccount(form));
|
||||
}
|
||||
|
||||
public passwordReset(form: PasswordResetForm) {
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.PasswordReset, form));
|
||||
this.ws.send(this.client.passwordReset(form));
|
||||
}
|
||||
|
||||
public passwordChange(form: PasswordChangeForm) {
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.PasswordChange, form));
|
||||
this.ws.send(this.client.passwordChange(form));
|
||||
}
|
||||
|
||||
public createPrivateMessage(form: PrivateMessageForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.CreatePrivateMessage, form));
|
||||
this.ws.send(this.client.createPrivateMessage(form));
|
||||
}
|
||||
|
||||
public editPrivateMessage(form: EditPrivateMessageForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.EditPrivateMessage, form));
|
||||
this.ws.send(this.client.editPrivateMessage(form));
|
||||
}
|
||||
|
||||
public deletePrivateMessage(form: DeletePrivateMessageForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.DeletePrivateMessage, form));
|
||||
this.ws.send(this.client.deletePrivateMessage(form));
|
||||
}
|
||||
|
||||
public markPrivateMessageAsRead(form: MarkPrivateMessageAsReadForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(
|
||||
this.wsSendWrapper(UserOperation.MarkPrivateMessageAsRead, form)
|
||||
);
|
||||
this.ws.send(this.client.markPrivateMessageAsRead(form));
|
||||
}
|
||||
|
||||
public getPrivateMessages(form: GetPrivateMessagesForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.GetPrivateMessages, form));
|
||||
this.ws.send(this.client.getPrivateMessages(form));
|
||||
}
|
||||
|
||||
public saveSiteConfig(form: SiteConfigForm) {
|
||||
this.setAuth(form);
|
||||
this.ws.send(this.wsSendWrapper(UserOperation.SaveSiteConfig, form));
|
||||
}
|
||||
|
||||
private wsSendWrapper(op: UserOperation, data: MessageType) {
|
||||
let send = { op: UserOperation[op], data: data };
|
||||
console.log(send);
|
||||
return JSON.stringify(send);
|
||||
this.ws.send(this.client.saveSiteConfig(form));
|
||||
}
|
||||
|
||||
private setAuth(obj: any, throwErr: boolean = true) {
|
||||
|
|
|
|||
38
ui/src/utils.ts
vendored
38
ui/src/utils.ts
vendored
|
|
@ -34,9 +34,7 @@ import {
|
|||
PrivateMessage,
|
||||
User,
|
||||
SortType,
|
||||
CommentSortType,
|
||||
ListingType,
|
||||
DataType,
|
||||
SearchType,
|
||||
WebSocketResponse,
|
||||
WebSocketJsonResponse,
|
||||
|
|
@ -44,7 +42,9 @@ import {
|
|||
SearchResponse,
|
||||
CommentResponse,
|
||||
PostResponse,
|
||||
} from './interfaces';
|
||||
} from 'lemmy-js-client';
|
||||
|
||||
import { CommentSortType, DataType } from './interfaces';
|
||||
import { UserService, WebSocketService } from './services';
|
||||
|
||||
import Tribute from 'tributejs/src/Tribute.js';
|
||||
|
|
@ -273,27 +273,11 @@ export function capitalizeFirstLetter(str: string): string {
|
|||
}
|
||||
|
||||
export function routeSortTypeToEnum(sort: string): SortType {
|
||||
if (sort == 'new') {
|
||||
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;
|
||||
}
|
||||
return SortType[sort];
|
||||
}
|
||||
|
||||
export function routeListingTypeToEnum(type: string): ListingType {
|
||||
return ListingType[capitalizeFirstLetter(type)];
|
||||
return ListingType[type];
|
||||
}
|
||||
|
||||
export function routeDataTypeToEnum(type: string): DataType {
|
||||
|
|
@ -730,8 +714,8 @@ function userSearch(text: string, cb: any) {
|
|||
if (text) {
|
||||
let form: SearchForm = {
|
||||
q: text,
|
||||
type_: SearchType[SearchType.Users],
|
||||
sort: SortType[SortType.TopAll],
|
||||
type_: SearchType.Users,
|
||||
sort: SortType.TopAll,
|
||||
page: 1,
|
||||
limit: mentionDropdownFetchLimit,
|
||||
};
|
||||
|
|
@ -767,8 +751,8 @@ function communitySearch(text: string, cb: any) {
|
|||
if (text) {
|
||||
let form: SearchForm = {
|
||||
q: text,
|
||||
type_: SearchType[SearchType.Communities],
|
||||
sort: SortType[SortType.TopAll],
|
||||
type_: SearchType.Communities,
|
||||
sort: SortType.TopAll,
|
||||
page: 1,
|
||||
limit: mentionDropdownFetchLimit,
|
||||
};
|
||||
|
|
@ -804,7 +788,7 @@ export function getListingTypeFromProps(props: any): ListingType {
|
|||
return props.match.params.listing_type
|
||||
? routeListingTypeToEnum(props.match.params.listing_type)
|
||||
: UserService.Instance.user
|
||||
? UserService.Instance.user.default_listing_type
|
||||
? Object.values(ListingType)[UserService.Instance.user.default_listing_type]
|
||||
: ListingType.All;
|
||||
}
|
||||
|
||||
|
|
@ -819,7 +803,7 @@ export function getSortTypeFromProps(props: any): SortType {
|
|||
return props.match.params.sort
|
||||
? routeSortTypeToEnum(props.match.params.sort)
|
||||
: UserService.Instance.user
|
||||
? UserService.Instance.user.default_sort_type
|
||||
? Object.values(SortType)[UserService.Instance.user.default_sort_type]
|
||||
: SortType.Active;
|
||||
}
|
||||
|
||||
|
|
|
|||
5
ui/yarn.lock
vendored
5
ui/yarn.lock
vendored
|
|
@ -4938,6 +4938,11 @@ lego-api@^1.0.7:
|
|||
dependencies:
|
||||
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:
|
||||
version "3.1.0"
|
||||
resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
|
||||
|
|
|
|||
Loading…
Reference in a new issue