grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'dev' and similar_post_fetch

Browse source 
- Fixes #131
This commit is contained in:
Dessalines 2019-08-22 16:18:26 -07:00
commit 77bba69eab
15 changed files with 191 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
server/src/api/post.rs
View file

@ -254,6 +254,7 @@ impl Perform<GetPostsResponse> for Oper<GetPosts> {
data.community_id,
None,
None,
None,
user_id,
show_nsfw,
false,

20
server/src/api/site.rs
View file

@ -23,6 +23,7 @@ pub struct Search {
#[derive(Serialize, Deserialize)]
pub struct SearchResponse {
op: String,
type_: String,
comments: Vec<CommentView>,
posts: Vec<PostView>,
communities: Vec<CommunityView>,
@ -289,6 +290,7 @@ impl Perform<SearchResponse> for Oper<Search> {
None,
Some(data.q.to_owned()),
None,
None,
true,
false,
false,
@ -334,6 +336,7 @@ impl Perform<SearchResponse> for Oper<Search> {
None,
Some(data.q.to_owned()),
None,
None,
true,
false,
false,
@ -363,6 +366,22 @@ impl Perform<SearchResponse> for Oper<Search> {
Some(data.q.to_owned()),
data.page,
data.limit)?;
},
SearchType::Url => {
posts = PostView::list(
&conn,
PostListingType::All,
&sort,
data.community_id,
None,
None,
Some(data.q.to_owned()),
None,
true,
false,
false,
data.page,
data.limit)?;
}
};
@ -371,6 +390,7 @@ impl Perform<SearchResponse> for Oper<Search> {
Ok(
SearchResponse {
op: self.op.to_string(),
type_: data.type_.to_owned(),
comments: comments,
posts: posts,
communities: communities,

2
server/src/api/user.rs
View file

@ -318,6 +318,7 @@ impl Perform<GetUserDetailsResponse> for Oper<GetUserDetails> {
data.community_id,
None,
None,
None,
Some(user_details_id),
show_nsfw,
data.saved_only,
@ -332,6 +333,7 @@ impl Perform<GetUserDetailsResponse> for Oper<GetUserDetails> {
data.community_id,
Some(user_details_id),
None,
None,
user_id,
show_nsfw,
data.saved_only,

2
server/src/db/mod.rs
View file

@ -67,7 +67,7 @@ pub enum SortType {
#[derive(EnumString,ToString,Debug, Serialize, Deserialize)]
pub enum SearchType {
All, Comments, Posts, Communities, Users
All, Comments, Posts, Communities, Users, Url
}
pub fn fuzzy_search(q: &str) -> String {

56
server/src/db/post_view.rs
View file

@ -79,6 +79,7 @@ impl PostView {
for_community_id: Option<i32>,
for_creator_id: Option<i32>,
search_term: Option<String>,
url_search: Option<String>,
my_user_id: Option<i32>,
show_nsfw: bool,
saved_only: bool,
@ -104,6 +105,10 @@ impl PostView {
query = query.filter(name.ilike(fuzzy_search(&search_term)));
};
if let Some(url_search) = url_search {
query = query.filter(url.eq(url_search));
};
// TODO these are wrong, bc they'll only show saved for your logged in user, not theirs
if saved_only {
query = query.filter(saved.eq(true));
@ -326,29 +331,34 @@ mod tests {
};
let read_post_listings_with_user = PostView::list(&conn,
PostListingType::Community,
&SortType::New, Some(inserted_community.id),
None,
None,
Some(inserted_user.id),
false,
false,
false,
None,
None).unwrap();
let read_post_listings_no_user = PostView::list(&conn,
PostListingType::Community,
&SortType::New,
Some(inserted_community.id),
None,
None,
None,
false,
false,
false,
None,
None).unwrap();
let read_post_listings_with_user = PostView::list(
&conn,
PostListingType::Community,
&SortType::New,
Some(inserted_community.id),
None,
None,
None,
Some(inserted_user.id),
false,
false,
false,
None,
None).unwrap();
let read_post_listings_no_user = PostView::list(
&conn,
PostListingType::Community,
&SortType::New,
Some(inserted_community.id),
None,
None,
None,
None,
false,
false,
false,
None,
None).unwrap();
let read_post_listing_no_user = PostView::read(&conn, inserted_post.id, None).unwrap();
let read_post_listing_with_user = PostView::read(&conn, inserted_post.id, Some(inserted_user.id)).unwrap();

1
server/src/websocket/server.rs
View file

@ -142,6 +142,7 @@ impl ChatServer {
None,
None,
None,
None,
false,
false,
false,

15
ui/src/components/create-post.tsx
View file

@ -1,6 +1,7 @@
import { Component } from 'inferno';
import { PostForm } from './post-form';
import { WebSocketService } from '../services';
import { PostFormParams } from '../interfaces';
import { i18n } from '../i18next';
import { T } from 'inferno-i18next';
@ -21,13 +22,25 @@ export class CreatePost extends Component<any, any> {
<div class="row">
<div class="col-12 col-lg-6 offset-lg-3 mb-4">
<h5><T i18nKey="create_post">#</T></h5>
<PostForm onCreate={this.handlePostCreate} prevCommunityName={this.prevCommunityName} />
<PostForm onCreate={this.handlePostCreate} params={this.params} />
</div>
</div>
</div>
)
}
get params(): PostFormParams {
let urlParams = new URLSearchParams(this.props.location.search);
let params: PostFormParams = {
name: urlParams.get("name"),
community: urlParams.get("community") || this.prevCommunityName,
body: urlParams.get("body"),
url: urlParams.get("url"),
};
return params;
}
get prevCommunityName(): string {
if (this.props.match.params.name) {
return this.props.match.params.name;

66
ui/src/components/post-form.tsx
View file

@ -2,7 +2,7 @@ import { Component, linkEvent } from 'inferno';
import { PostListings } from './post-listings';
import { Subscription } from "rxjs";
import { retryWhen, delay, take } from 'rxjs/operators';
import { PostForm as PostFormI, Post, PostResponse, UserOperation, Community, ListCommunitiesResponse, ListCommunitiesForm, SortType, SearchForm, SearchType, SearchResponse } from '../interfaces';
import { PostForm as PostFormI, PostFormParams, Post, PostResponse, UserOperation, Community, ListCommunitiesResponse, ListCommunitiesForm, SortType, SearchForm, SearchType, SearchResponse } from '../interfaces';
import { WebSocketService, UserService } from '../services';
import { msgOp, getPageTitle, debounce, validURL, capitalizeFirstLetter } from '../utils';
import * as autosize from 'autosize';
@ -11,7 +11,7 @@ import { T } from 'inferno-i18next';
interface PostFormProps {
post?: Post; // If a post is given, that means this is an edit
prevCommunityName?: string;
params?: PostFormParams;
onCancel?(): any;
onCreate?(id: number): any;
onEdit?(post: Post): any;
@ -23,6 +23,7 @@ interface PostFormState {
loading: boolean;
suggestedTitle: string;
suggestedPosts: Array<Post>;
crossPosts: Array<Post>;
}
export class PostForm extends Component<PostFormProps, PostFormState> {
@ -40,6 +41,7 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
loading: false,
suggestedTitle: undefined,
suggestedPosts: [],
crossPosts: [],
}
constructor(props: any, context: any) {
@ -60,20 +62,30 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
}
}
if (this.props.params) {
this.state.postForm.name = this.props.params.name;
if (this.props.params.url) {
this.state.postForm.url = this.props.params.url;
}
if (this.props.params.body) {
this.state.postForm.body = this.props.params.body;
}
}
this.subscription = WebSocketService.Instance.subject
.pipe(retryWhen(errors => errors.pipe(delay(3000), take(10))))
.subscribe(
(msg) => this.parseMessage(msg),
.pipe(retryWhen(errors => errors.pipe(delay(3000), take(10))))
.subscribe(
(msg) => this.parseMessage(msg),
(err) => console.error(err),
() => console.log('complete')
);
);
let listCommunitiesForm: ListCommunitiesForm = {
sort: SortType[SortType.TopAll],
limit: 9999,
}
let listCommunitiesForm: ListCommunitiesForm = {
sort: SortType[SortType.TopAll],
limit: 9999,
}
WebSocketService.Instance.listCommunities(listCommunitiesForm);
WebSocketService.Instance.listCommunities(listCommunitiesForm);
}
componentDidMount() {
@ -95,6 +107,12 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
{this.state.suggestedTitle &&
<div class="mt-1 text-muted small font-weight-bold pointer" onClick={linkEvent(this, this.copySuggestedTitle)}><T i18nKey="copy_suggested_title" interpolation={{title: this.state.suggestedTitle}}>#</T></div>
}
{this.state.crossPosts.length > 0 &&
<>
<div class="my-1 text-muted small font-weight-bold"><T i18nKey="cross_posts">#</T></div>
<PostListings showCommunity posts={this.state.crossPosts} />
</>
}
</div>
</div>
<div class="form-group row">
@ -115,7 +133,6 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
<textarea value={this.state.postForm.body} onInput={linkEvent(this, this.handlePostBodyChange)} class="form-control" rows={4} maxLength={10000} />
</div>
</div>
{/* Cant change a community from an edit */}
{!this.props.post &&
<div class="form-group row">
<label class="col-sm-2 col-form-label"><T i18nKey="community">#</T></label>
@ -170,13 +187,27 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
handlePostUrlChange(i: PostForm, event: any) {
i.state.postForm.url = event.target.value;
if (validURL(i.state.postForm.url)) {
let form: SearchForm = {
q: i.state.postForm.url,
type_: SearchType[SearchType.Url],
sort: SortType[SortType.TopAll],
page: 1,
limit: 6,
};
WebSocketService.Instance.search(form);
// Fetch the page title
getPageTitle(i.state.postForm.url).then(d => {
i.state.suggestedTitle = d;
i.setState(i.state);
});
} else {
i.state.suggestedTitle = undefined;
i.state.crossPosts = [];
}
i.setState(i.state);
}
@ -231,8 +262,8 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
this.state.communities = res.communities;
if (this.props.post) {
this.state.postForm.community_id = this.props.post.community_id;
} else if (this.props.prevCommunityName) {
let foundCommunityId = res.communities.find(r => r.name == this.props.prevCommunityName).id;
} else if (this.props.params && this.props.params.community) {
let foundCommunityId = res.communities.find(r => r.name == this.props.params.community).id;
this.state.postForm.community_id = foundCommunityId;
} else {
this.state.postForm.community_id = res.communities[0].id;
@ -248,7 +279,12 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
this.props.onEdit(res.post);
} else if (op == UserOperation.Search) {
let res: SearchResponse = msg;
this.state.suggestedPosts = res.posts;
if (res.type_ == SearchType[SearchType.Posts]) {
this.state.suggestedPosts = res.posts;
} else if (res.type_ == SearchType[SearchType.Url]) {
this.state.crossPosts = res.posts;
}
this.setState(this.state);
}
}

14
ui/src/components/post-listing.tsx
View file

@ -150,6 +150,9 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
<li className="list-inline-item mr-2">
<span class="pointer" onClick={linkEvent(this, this.handleSavePostClick)}>{post.saved ? i18n.t('unsave') : i18n.t('save')}</span>
</li>
<li className="list-inline-item mr-2">
<Link className="text-muted" to={`/create_post${this.crossPostParams}`}><T i18nKey="cross_post">#</T></Link>
</li>
{this.myPost &&
<>
<li className="list-inline-item">
@ -270,6 +273,17 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
WebSocketService.Instance.savePost(form);
}
get crossPostParams(): string {
let params = `?name=${this.props.post.name}`;
if (this.props.post.url) {
params += `&url=${this.props.post.url}`;
}
if (this.props.post.body) {
params += `&body=${this.props.post.body}`;
}
return params;
}
handleModRemoveShow(i: PostListing) {
i.state.showRemoveDialog = true;
i.setState(i.state);

44
ui/src/components/post.tsx
View file

@ -1,10 +1,11 @@
import { Component, linkEvent } from 'inferno';
import { Subscription } from "rxjs";
import { retryWhen, delay, take } from 'rxjs/operators';
import { UserOperation, Community, Post as PostI, GetPostResponse, PostResponse, Comment, CommentForm as CommentFormI, CommentResponse, CommentSortType, CreatePostLikeResponse, CommunityUser, CommunityResponse, CommentNode as CommentNodeI, BanFromCommunityResponse, BanUserResponse, AddModToCommunityResponse, AddAdminResponse, UserView } from '../interfaces';
import { UserOperation, Community, Post as PostI, GetPostResponse, PostResponse, Comment, CommentForm as CommentFormI, CommentResponse, CommentSortType, CreatePostLikeResponse, CommunityUser, CommunityResponse, CommentNode as CommentNodeI, BanFromCommunityResponse, BanUserResponse, AddModToCommunityResponse, AddAdminResponse, UserView, SearchType, SortType, SearchForm, SearchResponse } from '../interfaces';
import { WebSocketService, UserService } from '../services';
import { msgOp, hotRank } from '../utils';
import { PostListing } from './post-listing';
import { PostListings } from './post-listings';
import { Sidebar } from './sidebar';
import { CommentForm } from './comment-form';
import { CommentNodes } from './comment-nodes';
@ -22,6 +23,7 @@ interface PostState {
scrolled?: boolean;
scrolled_comment_id?: number;
loading: boolean;
crossPosts: Array<PostI>;
}
export class Post extends Component<any, PostState> {
@ -35,7 +37,8 @@ export class Post extends Component<any, PostState> {
moderators: [],
admins: [],
scrolled: false,
loading: true
loading: true,
crossPosts: [],
}
constructor(props: any, context: any) {
@ -75,6 +78,19 @@ export class Post extends Component<any, PostState> {
this.state.scrolled = true;
this.markScrolledAsRead(this.state.scrolled_comment_id);
}
// Necessary if you are on a post and you click another post (same route)
if (_lastProps.location.pathname !== _lastProps.history.location.pathname) {
// Couldnt get a refresh working. This does for now.
location.reload();
// let currentId = this.props.match.params.id;
// WebSocketService.Instance.getPost(currentId);
// this.context.router.history.push('/sponsors');
// this.context.refresh();
// this.context.router.history.push(_lastProps.location.pathname);
}
}
markScrolledAsRead(commentId: number) {
@ -112,6 +128,12 @@ export class Post extends Component<any, PostState> {
moderators={this.state.moderators}
admins={this.state.admins}
/>
{this.state.crossPosts.length > 0 &&
<>
<div class="my-1 text-muted small font-weight-bold"><T i18nKey="cross_posts">#</T></div>
<PostListings showCommunity posts={this.state.crossPosts} />
</>
}
<div className="mb-2" />
<CommentForm postId={this.state.post.id} disabled={this.state.post.locked} />
{this.sortRadios()}
@ -249,13 +271,25 @@ export class Post extends Component<any, PostState> {
} else if (op == UserOperation.GetPost) {
let res: GetPostResponse = msg;
this.state.post = res.post;
this.state.post = res.post;
this.state.comments = res.comments;
this.state.community = res.community;
this.state.moderators = res.moderators;
this.state.admins = res.admins;
this.state.loading = false;
document.title = `${this.state.post.name} - ${WebSocketService.Instance.site.name}`;
// Get cross-posts
if (this.state.post.url) {
let form: SearchForm = {
q: this.state.post.url,
type_: SearchType[SearchType.Url],
sort: SortType[SortType.TopAll],
page: 1,
limit: 6,
};
WebSocketService.Instance.search(form);
}
this.setState(this.state);
} else if (op == UserOperation.CreateComment) {
let res: CommentResponse = msg;
@ -332,6 +366,10 @@ export class Post extends Component<any, PostState> {
let res: AddAdminResponse = msg;
this.state.admins = res.admins;
this.setState(this.state);
} else if (op == UserOperation.Search) {
let res: SearchResponse = msg;
this.state.crossPosts = res.posts.filter(p => p.id != this.state.post.id);
this.setState(this.state);
}
}

1
ui/src/components/search.tsx
View file

@ -29,6 +29,7 @@ export class Search extends Component<any, SearchState> {
page: 1,
searchResponse: {
op: null,
type_: null,
posts: [],
comments: [],
communities: [],

2
ui/src/components/sidebar.tsx
View file

@ -121,7 +121,7 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
)}
</ul>
<Link class={`btn btn-sm btn-secondary btn-block mb-3 ${(community.deleted || community.removed) && 'no-click'}`}
to={`/create_post/c/${community.name}`}><T i18nKey="create_a_post">#</T></Link>
to={`/create_post?community=${community.name}`}><T i18nKey="create_a_post">#</T></Link>
<div>
{community.subscribed
? <button class="btn btn-sm btn-secondary btn-block" onClick={linkEvent(community.id, this.handleUnsubscribe)}><T i18nKey="unsubscribe">#</T></button>

1
ui/src/index.tsx
View file

@ -44,7 +44,6 @@ class Index extends Component<any, any> {
<Route path={`/home/type/:type/sort/:sort/page/:page`} component={Main} />
<Route exact path={`/`} component={Main} />
<Route path={`/login`} component={Login} />
<Route path={`/create_post/c/:name`} component={CreatePost} />
<Route path={`/create_post`} component={CreatePost} />
<Route path={`/create_community`} component={CreateCommunity} />
<Route path={`/communities/page/:page`} component={Communities} />

10
ui/src/interfaces.ts
View file

@ -15,7 +15,7 @@ export enum SortType {
}
export enum SearchType {
All, Comments, Posts, Communities, Users
All, Comments, Posts, Communities, Users, Url
}
export interface User {
@ -412,6 +412,13 @@ export interface PostForm {
auth: string;
}
export interface PostFormParams {
name: string;
url?: string;
body?: string;
community?: string;
}
export interface GetPostResponse {
op: string;
post: Post;
@ -551,6 +558,7 @@ export interface SearchForm {
export interface SearchResponse {
op: string;
type_: string;
posts?: Array<Post>;
comments?: Array<Comment>;
communities: Array<Community>;

2
ui/src/translations/en.ts
View file

@ -8,6 +8,8 @@ export const en = {
number_of_posts:'{{count}} Posts',
posts: 'Posts',
related_posts: 'These posts might be related',
cross_posts: 'This link has also been posted to:',
cross_post: 'cross-post',
comments: 'Comments',
number_of_comments:'{{count}} Comments',
remove_comment: 'Remove Comment',