) : (
- {this.selects()}
-
)}
@@ -404,17 +403,41 @@ export class Main extends Component
- {
i.state.loading = true;
i.setState(i.state);
i.updateUrl();
- i.fetchPosts();
+ i.fetchData();
window.scrollTo(0, 0);
}
@@ -507,28 +530,48 @@ export class Main extends Component {
this.state.loading = true;
this.setState(this.state);
this.updateUrl();
- this.fetchPosts();
+ this.fetchData();
window.scrollTo(0, 0);
}
- handleTypeChange(val: ListingType) {
- this.state.type_ = val;
+ handleListingTypeChange(val: ListingType) {
+ this.state.listingType = val;
this.state.page = 1;
this.state.loading = true;
this.setState(this.state);
this.updateUrl();
- this.fetchPosts();
+ this.fetchData();
window.scrollTo(0, 0);
}
- fetchPosts() {
- let getPostsForm: GetPostsForm = {
- page: this.state.page,
- limit: fetchLimit,
- sort: SortType[this.state.sort],
- type_: ListingType[this.state.type_],
- };
- WebSocketService.Instance.getPosts(getPostsForm);
+ handleDataTypeChange(val: DataType) {
+ this.state.dataType = val;
+ this.state.page = 1;
+ this.state.loading = true;
+ this.setState(this.state);
+ this.updateUrl();
+ this.fetchData();
+ window.scrollTo(0, 0);
+ }
+
+ fetchData() {
+ if (this.state.dataType == DataType.Post) {
+ let getPostsForm: GetPostsForm = {
+ page: this.state.page,
+ limit: fetchLimit,
+ sort: SortType[this.state.sort],
+ type_: ListingType[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],
+ };
+ WebSocketService.Instance.getComments(getCommentsForm);
+ }
}
parseMessage(msg: WebSocketJsonResponse) {
@@ -538,7 +581,7 @@ export class Main extends Component {
toast(i18n.t(msg.error), 'danger');
return;
} else if (msg.reconnect) {
- this.fetchPosts();
+ this.fetchData();
} else if (res.op == UserOperation.GetFollowedCommunities) {
let data = res.data as GetFollowedCommunitiesResponse;
this.state.subscribedCommunities = data.communities;
@@ -574,7 +617,7 @@ export class Main extends Component {
let data = res.data as PostResponse;
// If you're on subscribed, only push it if you're subscribed.
- if (this.state.type_ == ListingType.Subscribed) {
+ if (this.state.listingType == ListingType.Subscribed) {
if (
this.state.subscribedCommunities
.map(c => c.community_id)
@@ -589,26 +632,11 @@ export class Main extends Component {
this.setState(this.state);
} else if (res.op == UserOperation.EditPost) {
let data = res.data as PostResponse;
- let found = this.state.posts.find(c => c.id == data.post.id);
-
- found.url = data.post.url;
- found.name = data.post.name;
- found.nsfw = data.post.nsfw;
-
+ editPostFindRes(data, this.state.posts);
this.setState(this.state);
} else if (res.op == UserOperation.CreatePostLike) {
let data = res.data as PostResponse;
- let found = this.state.posts.find(c => c.id == data.post.id);
-
- found.score = data.post.score;
- found.upvotes = data.post.upvotes;
- found.downvotes = data.post.downvotes;
- if (data.post.my_vote !== null) {
- found.my_vote = data.post.my_vote;
- found.upvoteLoading = false;
- found.downvoteLoading = false;
- }
-
+ createPostLikeFindRes(data, this.state.posts);
this.setState(this.state);
} else if (res.op == UserOperation.AddAdmin) {
let data = res.data as AddAdminResponse;
@@ -632,6 +660,42 @@ export class Main extends Component {
.forEach(p => (p.banned = data.banned));
this.setState(this.state);
+ } else if (res.op == UserOperation.GetComments) {
+ let data = res.data as GetCommentsResponse;
+ this.state.comments = data.comments;
+ this.state.loading = false;
+ this.setState(this.state);
+ } else if (res.op == UserOperation.EditComment) {
+ let data = res.data as CommentResponse;
+ editCommentRes(data, this.state.comments);
+ this.setState(this.state);
+ } else if (res.op == UserOperation.CreateComment) {
+ let data = res.data as CommentResponse;
+
+ // Necessary since it might be a user reply
+ if (data.recipient_ids.length == 0) {
+ // If you're on subscribed, only push it if you're subscribed.
+ if (this.state.listingType == ListingType.Subscribed) {
+ if (
+ this.state.subscribedCommunities
+ .map(c => c.community_id)
+ .includes(data.comment.community_id)
+ ) {
+ this.state.comments.unshift(data.comment);
+ }
+ } else {
+ this.state.comments.unshift(data.comment);
+ }
+ this.setState(this.state);
+ }
+ } else if (res.op == UserOperation.SaveComment) {
+ let data = res.data as CommentResponse;
+ saveCommentRes(data, this.state.comments);
+ this.setState(this.state);
+ } else if (res.op == UserOperation.CreateCommentLike) {
+ let data = res.data as CommentResponse;
+ createCommentLikeRes(data, this.state.comments);
+ this.setState(this.state);
}
}
}
diff --git a/ui/src/components/navbar.tsx b/ui/src/components/navbar.tsx
index c675cfe7b..75cdd5549 100644
--- a/ui/src/components/navbar.tsx
+++ b/ui/src/components/navbar.tsx
@@ -60,8 +60,10 @@ export class Navbar extends Component {
// Subscribe to user changes
this.userSub = UserService.Instance.sub.subscribe(user => {
this.state.isLoggedIn = user.user !== undefined;
- this.state.unreadCount = user.unreadCount;
- this.requestNotificationPermission();
+ if (this.state.isLoggedIn) {
+ this.state.unreadCount = user.user.unreadCount;
+ this.requestNotificationPermission();
+ }
this.setState(this.state);
});
@@ -304,9 +306,9 @@ export class Navbar extends Component {
}
sendUnreadCount() {
+ UserService.Instance.user.unreadCount = this.state.unreadCount;
UserService.Instance.sub.next({
user: UserService.Instance.user,
- unreadCount: this.state.unreadCount,
});
}
diff --git a/ui/src/components/post-form.tsx b/ui/src/components/post-form.tsx
index 5d9c0f3cb..d502330b4 100644
--- a/ui/src/components/post-form.tsx
+++ b/ui/src/components/post-form.tsx
@@ -35,8 +35,11 @@ import {
} from '../utils';
import autosize from 'autosize';
import Tribute from 'tributejs/src/Tribute.js';
+import Selectr from 'mobius1-selectr';
import { i18n } from '../i18next';
+const MAX_POST_TITLE_LENGTH = 200;
+
interface PostFormProps {
post?: Post; // If a post is given, that means this is an edit
params?: PostFormParams;
@@ -232,7 +235,7 @@ export class PostForm extends Component {
required
rows={2}
minLength={3}
- maxLength={100}
+ maxLength={MAX_POST_TITLE_LENGTH}
/>
{this.state.suggestedPosts.length > 0 && (
<>
@@ -360,7 +363,10 @@ export class PostForm extends Component {
}
copySuggestedTitle(i: PostForm) {
- i.state.postForm.name = i.state.suggestedTitle;
+ i.state.postForm.name = i.state.suggestedTitle.substring(
+ 0,
+ MAX_POST_TITLE_LENGTH
+ );
i.state.suggestedTitle = undefined;
i.setState(i.state);
}
@@ -509,14 +515,27 @@ export class PostForm extends Component {
this.state.postForm.community_id = data.communities[0].id;
}
this.setState(this.state);
+
+ // Set up select searching
+ let selectId: any = document.getElementById('post-community');
+ if (selectId) {
+ let selector = new Selectr(selectId, { nativeDropdown: false });
+ selector.on('selectr.select', option => {
+ this.state.postForm.community_id = Number(option.value);
+ });
+ }
} else if (res.op == UserOperation.CreatePost) {
let data = res.data as PostResponse;
- this.state.loading = false;
- this.props.onCreate(data.post.id);
+ if (data.post.creator_id == UserService.Instance.user.id) {
+ this.state.loading = false;
+ this.props.onCreate(data.post.id);
+ }
} else if (res.op == UserOperation.EditPost) {
let data = res.data as PostResponse;
- this.state.loading = false;
- this.props.onEdit(data.post);
+ if (data.post.creator_id == UserService.Instance.user.id) {
+ this.state.loading = false;
+ this.props.onEdit(data.post);
+ }
} else if (res.op == UserOperation.Search) {
let data = res.data as SearchResponse;
diff --git a/ui/src/components/post-listing.tsx b/ui/src/components/post-listing.tsx
index 9b3141c42..56c1f0d9c 100644
--- a/ui/src/components/post-listing.tsx
+++ b/ui/src/components/post-listing.tsx
@@ -15,9 +15,11 @@ import {
AddAdminForm,
TransferSiteForm,
TransferCommunityForm,
+ FramelyData,
} from '../interfaces';
import { MomentTime } from './moment-time';
import { PostForm } from './post-form';
+import { IFramelyCard } from './iframely-card';
import {
mdToHtml,
canMod,
@@ -43,8 +45,13 @@ interface PostListingState {
showConfirmTransferCommunity: boolean;
imageExpanded: boolean;
viewSource: boolean;
- upvoteLoading: boolean;
- downvoteLoading: boolean;
+ my_vote: number;
+ score: number;
+ upvotes: number;
+ downvotes: number;
+ url: string;
+ iframely: FramelyData;
+ thumbnail: string;
}
interface PostListingProps {
@@ -68,8 +75,13 @@ export class PostListing extends Component {
showConfirmTransferCommunity: false,
imageExpanded: false,
viewSource: false,
- upvoteLoading: this.props.post.upvoteLoading,
- downvoteLoading: this.props.post.downvoteLoading,
+ my_vote: this.props.post.my_vote,
+ score: this.props.post.score,
+ upvotes: this.props.post.upvotes,
+ downvotes: this.props.post.downvotes,
+ url: this.props.post.url,
+ iframely: null,
+ thumbnail: null,
};
constructor(props: any, context: any) {
@@ -80,18 +92,31 @@ export class PostListing extends Component {
this.handlePostDisLike = this.handlePostDisLike.bind(this);
this.handleEditPost = this.handleEditPost.bind(this);
this.handleEditCancel = this.handleEditCancel.bind(this);
+
+ if (this.state.url) {
+ this.setThumbnail();
+ this.fetchIframely();
+ }
}
componentWillReceiveProps(nextProps: PostListingProps) {
- if (
- nextProps.post.upvoteLoading !== this.state.upvoteLoading ||
- nextProps.post.downvoteLoading !== this.state.downvoteLoading
- ) {
- this.setState({
- upvoteLoading: false,
- downvoteLoading: false,
- });
+ this.state.my_vote = nextProps.post.my_vote;
+ this.state.upvotes = nextProps.post.upvotes;
+ this.state.downvotes = nextProps.post.downvotes;
+ this.state.score = nextProps.post.score;
+
+ if (nextProps.post.url !== this.state.url) {
+ this.state.url = nextProps.post.url;
+ if (this.state.url) {
+ this.setThumbnail();
+ this.fetchIframely();
+ } else {
+ this.state.iframely = null;
+ this.state.thumbnail = null;
+ }
}
+
+ this.setState(this.state);
}
render() {
@@ -112,62 +137,76 @@ export class PostListing extends Component {
);
}
+ imgThumbnail() {
+ let post = this.props.post;
+ return (
+
+ );
+ }
+
listing() {
let post = this.props.post;
return (
})
-
+ {this.state.thumbnail && !this.state.imageExpanded && (
+
-
- {post.url && isImage(post.url) && !this.state.imageExpanded && (
-
- {post.score}
+ {this.state.score}
{WebSocketService.Instance.site.enable_downvotes && (
)}
+ {isImage(this.state.url) ? (
+
+ {this.imgThumbnail()}
+
+
+ ) : (
+
+ {this.imgThumbnail()}
+
+
+ )}
+
)}
- {post.url && isVideo(post.url) && (
+ {this.state.url && isVideo(this.state.url) && (
)}
- {
xmlnsXlink="http://www.w3.org/1999/xlink"
>
+
+ image
+
+
+ external-link
+
coffee1
{
comments() {
return (
{
this.setState(this.state);
} else if (res.op == UserOperation.EditComment) {
let data = res.data as CommentResponse;
-
- let found = this.state.comments.find(c => c.id == data.comment.id);
- found.content = data.comment.content;
- found.updated = data.comment.updated;
- found.removed = data.comment.removed;
- found.deleted = data.comment.deleted;
- found.upvotes = data.comment.upvotes;
- found.downvotes = data.comment.downvotes;
- found.score = data.comment.score;
-
+ editCommentRes(data, this.state.comments);
this.setState(this.state);
} else if (res.op == UserOperation.CreateComment) {
- // let res: CommentResponse = msg;
- toast(i18n.t('reply_sent'));
- // this.state.comments.unshift(res.comment); // TODO do this right
- // this.setState(this.state);
+ let data = res.data as CommentResponse;
+ if (
+ UserService.Instance.user &&
+ data.comment.creator_id == UserService.Instance.user.id
+ ) {
+ toast(i18n.t('reply_sent'));
+ }
} else if (res.op == UserOperation.SaveComment) {
let data = res.data as CommentResponse;
- let found = this.state.comments.find(c => c.id == data.comment.id);
- found.saved = data.comment.saved;
+ saveCommentRes(data, this.state.comments);
this.setState(this.state);
} else if (res.op == UserOperation.CreateCommentLike) {
let data = res.data as CommentResponse;
- let found: Comment = this.state.comments.find(
- c => c.id === data.comment.id
- );
- found.score = data.comment.score;
- found.upvotes = data.comment.upvotes;
- found.downvotes = data.comment.downvotes;
- if (data.comment.my_vote !== null) found.my_vote = data.comment.my_vote;
+ createCommentLikeRes(data, this.state.comments);
this.setState(this.state);
} else if (res.op == UserOperation.CreatePostLike) {
let data = res.data as PostResponse;
- let found = this.state.posts.find(c => c.id == data.post.id);
- found.my_vote = data.post.my_vote;
- found.score = data.post.score;
- found.upvotes = data.post.upvotes;
- found.downvotes = data.post.downvotes;
+ createPostLikeFindRes(data, this.state.posts);
this.setState(this.state);
} else if (res.op == UserOperation.BanUser) {
let data = res.data as BanUserResponse;
diff --git a/ui/src/i18next.ts b/ui/src/i18next.ts
index 0d3ab177a..4311b09f9 100644
--- a/ui/src/i18next.ts
+++ b/ui/src/i18next.ts
@@ -13,6 +13,7 @@ import { it } from './translations/it';
import { fi } from './translations/fi';
import { ca } from './translations/ca';
import { fa } from './translations/fa';
+import { pt_BR } from './translations/pt_br';
// https://github.com/nimbusec-oss/inferno-i18next/blob/master/tests/T.test.js#L66
const resources = {
@@ -29,6 +30,7 @@ const resources = {
fi,
ca,
fa,
+ pt_BR,
};
function format(value: any, format: any, lng: any): any {
diff --git a/ui/src/index.html b/ui/src/index.html
index 09f13097d..24bed7247 100644
--- a/ui/src/index.html
+++ b/ui/src/index.html
@@ -13,6 +13,7 @@
+
diff --git a/ui/src/index.tsx b/ui/src/index.tsx
index 8a9aa3c38..c56f6c4ea 100644
--- a/ui/src/index.tsx
+++ b/ui/src/index.tsx
@@ -41,7 +41,7 @@ class Index extends Component {
{
;
}
@@ -187,6 +193,7 @@ export interface Comment {
published: string;
updated?: string;
community_id: number;
+ community_name: string;
banned: boolean;
banned_from_community: boolean;
creator_name: string;
@@ -194,13 +201,13 @@ export interface Comment {
score: number;
upvotes: number;
downvotes: number;
+ hot_rank: number;
user_id?: number;
my_vote?: number;
+ subscribed?: number;
saved?: boolean;
user_mention_id?: number; // For mention type
recipient_id?: number;
- upvoteLoading?: boolean;
- downvoteLoading?: boolean;
}
export interface Category {
@@ -659,6 +666,19 @@ export interface GetPostsResponse {
posts: Array;
}
+export interface GetCommentsForm {
+ type_: string;
+ sort: string;
+ page?: number;
+ limit: number;
+ community_id?: number;
+ auth?: string;
+}
+
+export interface GetCommentsResponse {
+ comments: Array;
+}
+
export interface CreatePostLikeForm {
post_id: number;
score: number;
@@ -856,3 +876,18 @@ export interface WebSocketJsonResponse {
error?: string;
reconnect?: boolean;
}
+
+export interface FramelyData {
+ url: string;
+ type: string;
+ version?: string;
+ title: string;
+ author?: string;
+ author_url?: string;
+ provider_name?: string;
+ thumbnail_url?: string;
+ thumbnail_width?: number;
+ thumbnail_height?: number;
+ description?: string;
+ html?: string;
+}
diff --git a/ui/src/services/UserService.ts b/ui/src/services/UserService.ts
index 03380e593..47e28c73e 100644
--- a/ui/src/services/UserService.ts
+++ b/ui/src/services/UserService.ts
@@ -7,9 +7,8 @@ import { Subject } from 'rxjs';
export class UserService {
private static _instance: UserService;
public user: User;
- public sub: Subject<{ user: User; unreadCount: number }> = new Subject<{
+ public sub: Subject<{ user: User }> = new Subject<{
user: User;
- unreadCount: number;
}>();
private constructor() {
@@ -32,7 +31,7 @@ export class UserService {
this.user = undefined;
Cookies.remove('jwt');
setTheme();
- this.sub.next({ user: undefined, unreadCount: 0 });
+ this.sub.next({ user: undefined });
console.log('Logged out.');
}
@@ -45,7 +44,7 @@ export class UserService {
if (this.user.theme != 'darkly') {
setTheme(this.user.theme);
}
- this.sub.next({ user: this.user, unreadCount: 0 });
+ this.sub.next({ user: this.user });
console.log(this.user);
}
diff --git a/ui/src/services/WebSocketService.ts b/ui/src/services/WebSocketService.ts
index 6d951618a..3df69457a 100644
--- a/ui/src/services/WebSocketService.ts
+++ b/ui/src/services/WebSocketService.ts
@@ -38,6 +38,7 @@ import {
PrivateMessageForm,
EditPrivateMessageForm,
GetPrivateMessagesForm,
+ GetCommentsForm,
UserJoinForm,
MessageType,
WebSocketJsonResponse,
@@ -172,6 +173,11 @@ export class WebSocketService {
this.ws.send(this.wsSendWrapper(UserOperation.GetPosts, form));
}
+ public getComments(form: GetCommentsForm) {
+ this.setAuth(form, false);
+ this.ws.send(this.wsSendWrapper(UserOperation.GetComments, form));
+ }
+
public likePost(form: CreatePostLikeForm) {
this.setAuth(form);
this.ws.send(this.wsSendWrapper(UserOperation.CreatePostLike, form));
diff --git a/ui/src/translations/de.ts b/ui/src/translations/de.ts
index 7a1b0f5d1..d8a4a8500 100644
--- a/ui/src/translations/de.ts
+++ b/ui/src/translations/de.ts
@@ -150,6 +150,7 @@ export const de = {
sponsor_message:
'Lemmy ist freie <1>Open-Source Software, also ohne Werbung, Monetarisierung oder Venturekapital, Punkt. Deine Spenden gehen direkt an die Vollzeit Entwicklung des Projekts. Vielen Dank an die folgenden Personen:',
support_on_patreon: 'Auf Patreon unterstützen',
+ support_on_liberapay: 'Auf Liberapay unterstützen',
general_sponsors:
'Allgemeine Sponsoren sind die, die zwischen $10 und $39 zu Lemmy beitragen.',
crypto: 'Kryptowährung',
diff --git a/ui/src/translations/en.ts b/ui/src/translations/en.ts
index e103df7ec..788bce798 100644
--- a/ui/src/translations/en.ts
+++ b/ui/src/translations/en.ts
@@ -171,6 +171,7 @@ export const en = {
sponsor_message:
'Lemmy is free, <1>open-source software, meaning no advertising, monetizing, or venture capital, ever. Your donations directly support full-time development of the project. Thank you to the following people:',
support_on_patreon: 'Support on Patreon',
+ support_on_liberapay: 'Support on Liberapay',
donate_to_lemmy: 'Donate to Lemmy',
donate: 'Donate',
general_sponsors:
@@ -200,6 +201,7 @@ export const en = {
couldnt_like_comment: "Couldn't like comment.",
couldnt_update_comment: "Couldn't update comment.",
couldnt_save_comment: "Couldn't save comment.",
+ couldnt_get_comments: "Couldn't get comments.",
no_comment_edit_allowed: 'Not allowed to edit comment.',
no_post_edit_allowed: 'Not allowed to edit post.',
no_community_edit_allowed: 'Not allowed to edit community.',
@@ -210,6 +212,7 @@ export const en = {
community_follower_already_exists: 'Community follower already exists.',
community_user_already_banned: 'Community user already banned.',
couldnt_create_post: "Couldn't create post.",
+ post_title_too_long: 'Post title too long.',
couldnt_like_post: "Couldn't like post.",
couldnt_find_post: "Couldn't find post.",
couldnt_get_posts: "Couldn't get posts",
diff --git a/ui/src/translations/es.ts b/ui/src/translations/es.ts
index 53d7636d8..1b1b5d67c 100644
--- a/ui/src/translations/es.ts
+++ b/ui/src/translations/es.ts
@@ -169,6 +169,7 @@ export const es = {
sponsor_message:
'Lemmy es software libre y de <1>código abierto, lo que significa que no tendrá publicidades, monetización, ni capitales emprendedores, nunca. Tus donaciones apoyan directamente el desarrollo a tiempo completo del proyecto. Muchas gracias a las siguientes personas:',
support_on_patreon: 'Apoyo en Patreon',
+ support_on_liberapay: 'Apoyo en Liberapay',
donate_to_lemmy: 'Donar a Lemmy',
donate: 'Donar',
general_sponsors:
diff --git a/ui/src/translations/fr.ts b/ui/src/translations/fr.ts
index 771f44e8d..7a957271b 100644
--- a/ui/src/translations/fr.ts
+++ b/ui/src/translations/fr.ts
@@ -9,7 +9,8 @@ export const fr = {
posts: 'Publications',
related_posts: 'Ces sujets peuvent être corrélés',
cross_posts: 'Ce sujet a également été posté sur :',
- cross_post: 'crosspost',
+ cross_post: 'publication croisée',
+ cross_posted_to: 'publication croisée à',
comments: 'Commentaires',
number_of_comments: '{{count}} Commentaires',
remove_comment: 'Supprimer le commentaire',
@@ -23,11 +24,18 @@ export const fr = {
list_of_communities: 'Liste des communautés',
number_of_communities: '{{count}} communautés',
community_reqs: 'en minuscule, sans espace et avec tiret du bas.',
+ create_private_message: 'Créer un message privé',
+ send_secure_message: 'Envoyer le message sécurisé',
+ send_message: 'Enovyer le message',
+ message: 'Message',
edit: 'éditer',
reply: 'répondre',
cancel: 'Annuler',
preview: 'prévisualiser',
upload_image: 'envoyer une image',
+ avatar: 'Avatar',
+ upload_avatar: 'Télécharger une avatar',
+ show_avatars: 'Afficher les avatars',
formatting_help: 'aide au formattage',
view_source: 'voir la source',
unlock: 'débloquer',
@@ -35,6 +43,7 @@ export const fr = {
sticky: 'épingler',
unsticky: 'décrocher',
link: 'lien',
+ archive_link: 'archiver le lien',
mod: 'modérateur',
mods: 'modérateurs',
moderates: 'Modérer',
@@ -89,6 +98,7 @@ export const fr = {
sort_type: 'Trier',
hot: 'Tendances',
new: 'Nouveaux',
+ old: 'Ancien',
top_day: 'Top du jour',
week: 'Semaine',
month: 'Mois',
@@ -96,12 +106,16 @@ export const fr = {
all: 'Tout',
top: 'Top',
api: 'API',
+ docs: 'Documentations',
inbox: 'Boîte de réception',
inbox_for: 'Boîte de réception de <1>{{user}}',
mark_all_as_read: 'Tout marquer comme lu',
type: 'Type',
unread: 'Non-lu',
+ replies: 'Réponses',
+ mentions: 'Mentions',
reply_sent: 'Réponse envoyée',
+ message_sent: 'Message envoyé',
search: 'Rechercher',
overview: 'Général',
view: 'Voir',
@@ -112,11 +126,29 @@ export const fr = {
notifications_error:
'Les notifications de bureau ne sont pas discponibles sur votre navigateur. Essayez Firefox ou Chrome.',
unread_messages: 'Messages non-lu',
+ messages: 'Messages',
password: 'Mot de passe',
verify_password: 'Vérifiez le mot de passe',
+ old_password: 'Ancien mot de passe',
+ forgot_password: 'Mot de passe oublié',
+ reset_password_mail_sent: 'Un email a été envoyé pour réinitialiser votre mot de passe.',
+ password_change: 'Changement de mot de passe',
+ new_password: 'Nouveau mot de passe',
+ no_email_setup: "Ce serveur n'a pas correctement configuré la messagerie de email.",
email: 'Email',
+ matrix_user_id: 'Utilisateur Matrix',
+ private_message_disclaimer:
+ "Attention: les messages privés en Matrix ne sont pas sécurisés. S'il vous plait, créer un compte de <1>Riot.im pour des messages sécurisés.",
+ send_notifications_to_email: 'Envoyer des notifications par email',
optional: 'Optionnel',
expires: 'Expire',
+ language: 'Langue',
+ browser_default: 'Défaut pour le navigateur',
+ downvotes_disabled: 'Votes négatifs désactivés',
+ enable_downvotes: 'Votes négatifs activés',
+ open_registration: 'Ouvrir la regestration',
+ registration_closed: 'Régestration fermée',
+ enable_nsfw: 'Activer NSFW',
url: 'URL',
body: 'Texte',
copy_suggested_title: 'Ajouter le titre suggéré: {{title}}',
@@ -139,8 +171,10 @@ export const fr = {
sponsor_message:
"Lemmy est gratuit et <1>open-source, c'est à dire sans publicité et sans monétisation. Pour toujours. Vos dons soutiennent directement le développement du projet. Merci à nos soutiens.",
support_on_patreon: 'Soutenir sur Patreon',
- general_sponsors:
- 'General Sponsors are those that pledged $10 to $39 to Lemmy.',
+ support_on_liberapay: 'Soutenir sur Liberapay',
+ donate_to_lemmy: 'Faire un don à Lemmy',
+ donate: 'Faire un don',
+ general_sponsors: 'Les sponsors généraux sont ceux garantissant de 10 à 39$.',
crypto: 'Cryptomonnaies',
bitcoin: 'Bitcoin',
ethereum: 'Ethereum',
@@ -149,6 +183,7 @@ export const fr = {
joined: 'Membre depuis',
by: 'par',
to: 'vers',
+ from: 'de',
transfer_community: 'transférer la communauté',
transfer_site: 'transférer le site',
are_you_sure: 'Êtes-vous sûr ?',
@@ -158,12 +193,14 @@ export const fr = {
landing_0:
'Lemmy est un <1>aggrégateur de lien, similaire à reddit et conçu pour fonctionner sur le <2>fédiverse.<3>Il est auto-hébergeable, se met à jour en direct et est léger (<4>~80kB). La fédération via Activitypub est prévue. <5>Lemmy est une <6>version beta très précoce, et de nombreuses fonctionnalités sont manquantes ou non fonctionnelles. <7>Vous pouvez rapporter des bugs et suggérez de nouvelles fonctionnalités <8>ici.<9>Crée avec <10>Rust, <11>Actix, <12>Inferno, <13>Typescript.',
not_logged_in: "Vous n'êtes pas connecté.",
+ logged_in: 'Vous êtes connecté.',
community_ban: 'Vous avez été banni de cette communauté.',
site_ban: 'Vous avez été banni du site',
couldnt_create_comment: 'Impossible de poster le commentaire.',
couldnt_like_comment: "Impossible d'aimer le commentaire.",
couldnt_update_comment: 'Impossible de mettre à jour le commentaire.',
couldnt_save_comment: 'Impossible de sauvegarder le commentaire.',
+ couldnt_get_comments: 'Impossible de obtenir les commentaires.',
no_comment_edit_allowed:
"Vous n'êtes pas autorisé à éditer ce commentaire.",
no_post_edit_allowed: "Vous n'êtes pas autorisé à éditer sujet.",
@@ -176,6 +213,7 @@ export const fr = {
community_follower_already_exists: 'Ce membre est déjà abonné.',
community_user_already_banned: 'Ce membre est déjà banni.',
couldnt_create_post: 'Impossible de créer le sujet.',
+ post_title_too_long: 'Sujet titre trop long.',
couldnt_like_post: "Impossible d'aimer le sujet.",
couldnt_find_post: 'Impossible de trouver le sujet.',
couldnt_get_posts: "Impossible d'obtenir les sujets",
@@ -191,8 +229,14 @@ export const fr = {
passwords_dont_match: 'Les mots de passes ne correspondent pas..',
admin_already_created: 'Désolé, il y a déjà un admin.',
user_already_exists: "L'utilisateur existe déjà.",
+ email_already_exists: "L'email existe déjà",
couldnt_update_user: "Impossible de mettre à jour l'utilisateur.",
system_err_login:
'Erreur système. Essayez de vous déconneter puis de vous reconnecter.',
+ couldnt_create_private_message: 'Impossible de créer un message privé.',
+ no_private_message_edit_allowed: 'Pas autorisé à modifier un message privé.',
+ couldnt_update_private_message: 'Impossible de modifier un message privé.',
+ time: 'Temps',
+ action: 'Action',
},
};
diff --git a/ui/src/translations/it.ts b/ui/src/translations/it.ts
index db22eeb45..53d1894df 100644
--- a/ui/src/translations/it.ts
+++ b/ui/src/translations/it.ts
@@ -138,6 +138,7 @@ export const it = {
sponsors_of_lemmy: 'Sponsors di Lemmy',
sponsor_message: 'Lemmy è un software gratuito e <1>open-source, il che significa nessuna pubblicità, monetizzazione o investitori esterni, per sempre. Le tue donazioni supportano direttamente lo sviluppo full-time del progetto. Si ringraziano le seguenti persone:',
support_on_patreon: 'Supporta su Patreon',
+ support_on_liberapay: 'Supporta su Liberapay',
general_sponsors: 'I "General Sponsors" sono quelli che hanno investito dai 10$ ai 39$ su Lemmy.',
crypto: 'Crypto',
bitcoin: 'Bitcoin',
diff --git a/ui/src/translations/nl.ts b/ui/src/translations/nl.ts
index 41aa24385..4bf1fae5f 100644
--- a/ui/src/translations/nl.ts
+++ b/ui/src/translations/nl.ts
@@ -125,6 +125,7 @@ export const nl = {
sponsor_message:
'Lemmy is vrije, <1>open-source software, dus zonder reclame, winstoogmerk en durfkapitaal, punt. Jouw donaties gaan direct naar de full-time-ontwikkeling van het project. Met veel dank aan de volgende mensen:',
support_on_patreon: 'Ondersteun op Patreon',
+ support_on_liberapay: 'Ondersteun op Liberapay',
general_sponsors:
'Algemene sponsors zijn sponsors die tussen de $10 en $39 hebben gegeven aan Lemmy.',
crypto: 'Cryptovaluta',
diff --git a/ui/src/translations/pt_br.ts b/ui/src/translations/pt_br.ts
new file mode 100644
index 000000000..aed781e87
--- /dev/null
+++ b/ui/src/translations/pt_br.ts
@@ -0,0 +1,241 @@
+export const pt_BR = {
+ translation: {
+ post: 'publicação',
+ remove_post: 'Apagar publicação',
+ no_posts: 'Sem publicações.',
+ create_a_post: 'Criar uma publicação',
+ create_post: 'Criar publicação',
+ number_of_posts: '{{count}} publicações',
+ posts: 'Publicações',
+ related_posts: 'Essas publicações podem estar relacionadas',
+ cross_posts: 'Esse link também foi publicado em:',
+ cross_post: 're-publicar',
+ cross_posted_to: 'Publicado também em: ',
+ comments: 'Comentários',
+ number_of_comments: '{{count}} comentários',
+ remove_comment: 'Apagar comentário',
+ communities: 'Comunidades',
+ users: 'Usuários',
+ create_a_community: 'Criar uma comunidade',
+ create_community: 'Criar comunidade',
+ remove_community: 'Apagar comunidade',
+ subscribed_to_communities: 'Inscrito em <1>comunidades',
+ trending_communities: '<1>Comunidades em tendência',
+ list_of_communities: 'Lista de comunidades',
+ number_of_communities: '{{count}} comunidades',
+ community_reqs: 'minúsculas, sublinhados e sem espaços.',
+ create_private_message: 'Criar mensagem privada',
+ send_secure_message: 'Enviar mensagem segura',
+ send_message: 'Enviar mensagem',
+ message: 'Mensagem',
+ edit: 'editar',
+ reply: 'responder',
+ cancel: 'Cancelar',
+ preview: 'Pré-visualização',
+ upload_image: 'fazer upload de imagem',
+ avatar: 'Avatar',
+ upload_avatar: 'Fazer upload de avatar',
+ show_avatars: 'Mostrar Avatars',
+ formatting_help: 'ajuda de formatação',
+ view_source: 'ver fonte',
+ unlock: 'desbloquear',
+ lock: 'bloquear',
+ sticky: 'fixar',
+ unsticky: 'desafixar',
+ link: 'link',
+ archive_link: 'arquivar link',
+ mod: 'moderador',
+ mods: 'moderadores',
+ moderates: 'Modera',
+ settings: 'Configurações',
+ remove_as_mod: 'remover como moderador',
+ appoint_as_mod: 'designar como moderador',
+ modlog: 'Registro de moderação',
+ admin: 'administrador',
+ admins: 'administradores',
+ remove_as_admin: 'remover como administrador',
+ appoint_as_admin: 'designar como administrador',
+ remove: 'remover',
+ removed: 'removido',
+ locked: 'trancado',
+ stickied: 'fixado',
+ reason: 'Motivo',
+ mark_as_read: 'marcar como lido',
+ mark_as_unread: 'marcar como não lido',
+ delete: 'apagar',
+ deleted: 'apagado',
+ delete_account: 'Apagar conta',
+ delete_account_confirm:
+ 'Aviso: isso vai apagar seus dados de forma permanente. Escreva sua senha para confirmar.',
+ restore: 'restaurar',
+ ban: 'banir',
+ ban_from_site: 'banido do site',
+ unban: 'readmitido',
+ unban_from_site: 'readmitido ao site',
+ banned: 'banido',
+ save: 'guardar',
+ unsave: 'descartar',
+ create: 'criar',
+ creator: 'criador',
+ username: 'nome de usuário',
+ email_or_username: 'E-mail ou nome de usuário',
+ number_of_users: '{{count}} usuários',
+ number_of_subscribers: '{{count}} inscritos',
+ number_of_points: '{{count}} pontos',
+ number_online: '{{count}} usuários online',
+ name: 'Nome',
+ title: 'Título',
+ category: 'Categoria',
+ subscribers: 'Inscritos',
+ both: 'Ambos',
+ saved: 'Guardado',
+ unsubscribe: 'Cancelar inscrição',
+ subscribe: 'Inscrever-se',
+ subscribed: 'Inscrito',
+ prev: 'Anterior',
+ next: 'Próximo',
+ sidebar: 'Barra lateral',
+ sort_type: 'Ordenação',
+ hot: 'Popular',
+ new: 'Novo',
+ old: 'Velho',
+ top_day: 'Top do dia',
+ week: 'Semana',
+ month: 'Mês',
+ year: 'Ano',
+ all: 'Tudo',
+ top: 'Top',
+ api: 'API',
+ docs: 'Docs',
+ inbox: 'Caixa de entrada',
+ inbox_for: 'Caixa de entrada de <1>{{user}}',
+ mark_all_as_read: 'marcar tudo como lido',
+ type: 'Tipo',
+ unread: 'Não lido',
+ replies: 'Respostas',
+ mentions: 'Menções',
+ reply_sent: 'Resposta enviada',
+ message_sent: 'Mensagem enviada',
+ search: 'Busca',
+ overview: 'Visão geral',
+ view: 'Visualização',
+ logout: 'Sair',
+ login_sign_up: 'Entrar / Inscrever-se',
+ login: 'Entrar',
+ sign_up: 'Inscrever-se',
+ notifications_error:
+ 'Seu navegador não oferece notificações para a área de trabalho. Tente o Firefox ou o Chrome.',
+ unread_messages: 'Mensagens não lidas',
+ messages: 'Mensagens',
+ password: 'Senha',
+ verify_password: 'Verifique a senha',
+ old_password: 'Senha antiga',
+ forgot_password: 'esqueci a senha',
+ reset_password_mail_sent: 'Enviado um e-mail para a alteração da senha.',
+ password_change: 'Alteração de senha',
+ new_password: 'Nova senha',
+ no_email_setup: 'Esse servidor não configurou corretamente o e-mail.',
+ email: 'E-mail',
+ matrix_user_id: 'Usuário Matrix',
+ private_message_disclaimer:
+ 'Aviso: mensagens privadas no Lemmy não são seguras. Crie uma conta em <1>Riot.im para troca segura de mensagens.',
+ send_notifications_to_email: 'Enviar notificações para o e-mail',
+ optional: 'Opcional',
+ expires: 'Expira',
+ language: 'Idioma',
+ browser_default: 'Padrão do navegador',
+ downvotes_disabled: 'Votos negativos desativados',
+ enable_downvotes: 'Permitir votos negativos',
+ open_registration: 'Permitir registro',
+ registration_closed: 'Registros desativados',
+ enable_nsfw: 'Permitir NSFW',
+ url: 'URL',
+ body: 'Conteúdo',
+ copy_suggested_title: 'copiar título sugerido: {{title}}',
+ community: 'Comunidade',
+ expand_here: 'Expandir aqui',
+ subscribe_to_communities: 'Inscreva-se em algumas <1>comunidades.',
+ chat: 'Chat',
+ recent_comments: 'Últimos comentários',
+ no_results: 'Nenhum resultado.',
+ setup: 'Instalação',
+ lemmy_instance_setup: 'Criação de instância Lemmy',
+ setup_admin: 'Configurar administrador do site',
+ your_site: 'seu site',
+ modified: 'modificado',
+ nsfw: 'NSFW',
+ show_nsfw: 'Mostrar conteúdo NSFW',
+ theme: 'Tema',
+ sponsors: 'Patrocinadores',
+ sponsors_of_lemmy: 'Patrocinadores do Lemmy',
+ sponsor_message:
+ 'Lemmy é um programa livre e de código aberto, o que significa que não haverá publicidade, monetização ou capital de risco, jamais. Suas doações apoiam de forma direta o desenvolvimento em tempo integral do projeto. Muitos agradecimentos às sequintes pessoas:',
+ support_on_patreon: 'Colabore no Patreon',
+ support_on_liberapay: 'Colabore no Liberapay',
+ donate_to_lemmy: 'Faça uma doação ao Lemmy',
+ donate: 'Doar',
+ general_sponsors:
+ 'Patrocinadores são aqueles que doaram entre $10 e $39 ao Lemmy.',
+ crypto: 'Crypto',
+ bitcoin: 'Bitcoin',
+ ethereum: 'Ethereum',
+ monero: 'Monero',
+ code: 'Code',
+ joined: 'Entrou',
+ by: 'por',
+ to: 'para',
+ from: 'de',
+ transfer_community: 'transferir comunidade',
+ transfer_site: 'transferir site',
+ are_you_sure: 'tem certeza?',
+ yes: 'sim',
+ no: 'não',
+ powered_by: 'Powered by',
+ landing_0:
+ 'Lemmy é um <1>agregador de links / alternativa ao reddit, com a intenção de funcionar junto ao <2>fediverso.<3>Pode ser hospedado em servidor próprio, tem atualização de comentários em tempo real e é minúsculo (<4>~80kB). A federação com a rede ActivityPub está no roteiro do projeto. <5>Esta é uma <6>versão beta bastante antecipada, e muitas funcionalidades ainda estão quebradas ou ausentes. <7>Sugira novas funcionalidades ou reporte erros <8>aqui.<9>Feito com <10>Rust, <11>Actix, <12>Inferno, <13>Typescript.',
+ not_logged_in: 'Não autenticado.',
+ logged_in: 'Autenticado.',
+ community_ban: 'Você foi banido desta comunidade.',
+ site_ban: 'Você foi banido do site',
+ couldnt_create_comment: 'Não foi possível criar o comentário.',
+ couldnt_like_comment: 'Não foi possível curtir o comentário.',
+ couldnt_update_comment: 'Não foi possível atualizar o comentário.',
+ couldnt_save_comment: 'Não foi possível guardar o comentário.',
+ no_comment_edit_allowed: 'Sem permissão para editar de comentário.',
+ no_post_edit_allowed: 'Sem permissão para editar publicação.',
+ no_community_edit_allowed: 'Sem permissão para editar comunidade.',
+ couldnt_find_community: 'Não foi possível encontrar a comunidade.',
+ couldnt_update_community: 'Não foi possível atualizar a comunidade.',
+ community_already_exists: 'Esta comunidade já existe.',
+ community_moderator_already_exists:
+ 'Este moderador da comunidade já existe.',
+ community_follower_already_exists: 'Este seguidor da comunidade já existe.',
+ community_user_already_banned: 'Este usuário da comunidade já foi banido.',
+ couldnt_create_post: 'Não foi possível criar a publicação.',
+ couldnt_like_post: 'Não foi possível curtir a publicação.',
+ couldnt_find_post: 'Não foi possível encontrar a publicação.',
+ couldnt_get_posts: 'Não foi possível obter as publicações',
+ couldnt_update_post: 'Não foi possível atualizar a publicação',
+ couldnt_save_post: 'Não foi possível guardar a publicação.',
+ no_slurs: 'Sem insultos.',
+ not_an_admin: 'Não é administrador.',
+ site_already_exists: 'O site já existe.',
+ couldnt_update_site: 'Não foi possível atualizar o site.',
+ couldnt_find_that_username_or_email:
+ 'Não foi possível encontrar esse usuário ou e-mail.',
+ password_incorrect: 'Senha incorreta.',
+ passwords_dont_match: 'As senhas não são iguais.',
+ admin_already_created: 'Desculpe, já há um administrador.',
+ user_already_exists: 'Este usuário já existe.',
+ email_already_exists: 'Este e-mail já existe.',
+ couldnt_update_user: 'Não foi possível atualizar o usuário.',
+ system_err_login: 'Erro no sistema. Tente sair e autenticar-se outra vez.',
+ couldnt_create_private_message: 'Não foi possível criar mensagem privada.',
+ no_private_message_edit_allowed:
+ 'Sem permissão para editar mensagem privada.',
+ couldnt_update_private_message:
+ 'Não foi possível atualizar a mensagem privada.',
+ time: 'Tempo',
+ action: 'Ação',
+ },
+};
diff --git a/ui/src/translations/zh.ts b/ui/src/translations/zh.ts
index 52fdfabfd..e4111996d 100644
--- a/ui/src/translations/zh.ts
+++ b/ui/src/translations/zh.ts
@@ -116,6 +116,7 @@ export const zh = {
sponsor_message:
'Lemmy is free, <1>open-source software, meaning no advertising, monetizing, or venture capital, ever. Your donations directly support full-time development of the project. Thank you to the following people:',
support_on_patreon: '在 Patreon 赞助',
+ support_on_liberapay: '在 on 赞助',
general_sponsors:
'General Sponsors are those that pledged $10 to $39 to Lemmy.',
crypto: '加密',
diff --git a/ui/src/utils.ts b/ui/src/utils.ts
index 19cb28a20..d329dcd58 100644
--- a/ui/src/utils.ts
+++ b/ui/src/utils.ts
@@ -10,19 +10,26 @@ import 'moment/locale/it';
import 'moment/locale/fi';
import 'moment/locale/ca';
import 'moment/locale/fa';
+import 'moment/locale/pt-br';
import {
UserOperation,
Comment,
+ CommentNode,
+ Post,
PrivateMessage,
User,
SortType,
+ CommentSortType,
ListingType,
+ DataType,
SearchType,
WebSocketResponse,
WebSocketJsonResponse,
SearchForm,
SearchResponse,
+ CommentResponse,
+ PostResponse,
} from './interfaces';
import { UserService, WebSocketService } from './services';
@@ -35,7 +42,7 @@ import emojiShortName from 'emoji-short-name';
import Toastify from 'toastify-js';
export const repoUrl = 'https://github.com/dessalines/lemmy';
-export const markdownHelpUrl = 'https://commonmark.org/help/';
+export const markdownHelpUrl = '/docs/about_guide.html';
export const archiveUrl = 'https://archive.is';
export const postRefetchSeconds: number = 60 * 1000;
@@ -87,15 +94,22 @@ md.renderer.rules.emoji = function(token, idx) {
return twemoji.parse(token[idx].content);
};
-export function hotRank(comment: Comment): number {
- // Rank = ScaleFactor * sign(Score) * log(1 + abs(Score)) / (Time + 2)^Gravity
+export function hotRankComment(comment: Comment): number {
+ return hotRank(comment.score, comment.published);
+}
- let date: Date = new Date(comment.published + 'Z'); // Add Z to convert from UTC date
+export function hotRankPost(post: Post): number {
+ return hotRank(post.score, post.newest_activity_time);
+}
+
+export function hotRank(score: number, timeStr: string): number {
+ // Rank = ScaleFactor * sign(Score) * log(1 + abs(Score)) / (Time + 2)^Gravity
+ let date: Date = new Date(timeStr + 'Z'); // Add Z to convert from UTC date
let now: Date = new Date();
let hoursElapsed: number = (now.getTime() - date.getTime()) / 36e5;
let rank =
- (10000 * Math.log10(Math.max(1, 3 + comment.score))) /
+ (10000 * Math.log10(Math.max(1, 3 + score))) /
Math.pow(hoursElapsed + 2, 1.8);
// console.log(`Comment: ${comment.content}\nRank: ${rank}\nScore: ${comment.score}\nHours: ${hoursElapsed}`);
@@ -197,14 +211,18 @@ export function routeListingTypeToEnum(type: string): ListingType {
return ListingType[capitalizeFirstLetter(type)];
}
+export function routeDataTypeToEnum(type: string): DataType {
+ return DataType[capitalizeFirstLetter(type)];
+}
+
export function routeSearchTypeToEnum(type: string): SearchType {
return SearchType[capitalizeFirstLetter(type)];
}
export async function getPageTitle(url: string) {
- let res = await fetch(`https://textance.herokuapp.com/title/${url}`);
- let data = await res.text();
- return data;
+ let res = await fetch(`/iframely/oembed?url=${url}`).then(res => res.json());
+ let title = await res.title;
+ return title;
}
export function debounce(
@@ -260,6 +278,7 @@ export const languages = [
{ code: 'es', name: 'Español' },
{ code: 'de', name: 'Deutsch' },
{ code: 'fa', name: 'فارسی' },
+ { code: 'pt_BR', name: 'Português Brasileiro' },
{ code: 'zh', name: '中文' },
{ code: 'fi', name: 'Suomi' },
{ code: 'fr', name: 'Français' },
@@ -310,6 +329,8 @@ export function getMomentLanguage(): string {
lang = 'ca';
} else if (lang.startsWith('fa')) {
lang = 'fa';
+ } else if (lang.startsWith('pt')) {
+ lang = 'pt-br';
} else {
lang = 'en';
}
@@ -365,7 +386,7 @@ export function objectFlip(obj: any) {
export function pictshareAvatarThumbnail(src: string): string {
// sample url: http://localhost:8535/pictshare/gs7xuu.jpg
let split = src.split('pictshare');
- let out = `${split[0]}pictshare/96x96${split[1]}`;
+ let out = `${split[0]}pictshare/96${split[1]}`;
return out;
}
@@ -380,7 +401,7 @@ export function showAvatars(): boolean {
export function imageThumbnailer(url: string): string {
let split = url.split('pictshare');
if (split.length > 1) {
- let out = `${split[0]}pictshare/140x140${split[1]}`;
+ let out = `${split[0]}pictshare/192${split[1]}`;
return out;
} else {
return url;
@@ -515,3 +536,206 @@ function communitySearch(text: string, cb: any) {
cb([]);
}
}
+
+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
+ : ListingType.All;
+}
+
+// TODO might need to add a user setting for this too
+export function getDataTypeFromProps(props: any): DataType {
+ return props.match.params.data_type
+ ? routeDataTypeToEnum(props.match.params.data_type)
+ : DataType.Post;
+}
+
+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
+ : SortType.Hot;
+}
+
+export function getPageFromProps(props: any): number {
+ return props.match.params.page ? Number(props.match.params.page) : 1;
+}
+
+export function editCommentRes(
+ data: CommentResponse,
+ comments: Array
+) {
+ let found = comments.find(c => c.id == data.comment.id);
+ if (found) {
+ found.content = data.comment.content;
+ found.updated = data.comment.updated;
+ found.removed = data.comment.removed;
+ found.deleted = data.comment.deleted;
+ found.upvotes = data.comment.upvotes;
+ found.downvotes = data.comment.downvotes;
+ found.score = data.comment.score;
+ }
+}
+
+export function saveCommentRes(
+ data: CommentResponse,
+ comments: Array
+) {
+ let found = comments.find(c => c.id == data.comment.id);
+ if (found) {
+ found.saved = data.comment.saved;
+ }
+}
+
+export function createCommentLikeRes(
+ data: CommentResponse,
+ comments: Array
+) {
+ let found: Comment = comments.find(c => c.id === data.comment.id);
+ if (found) {
+ found.score = data.comment.score;
+ found.upvotes = data.comment.upvotes;
+ found.downvotes = data.comment.downvotes;
+ if (data.comment.my_vote !== null) {
+ found.my_vote = data.comment.my_vote;
+ }
+ }
+}
+
+export function createPostLikeFindRes(data: PostResponse, posts: Array) {
+ let found = posts.find(c => c.id == data.post.id);
+ if (found) {
+ createPostLikeRes(data, found);
+ }
+}
+
+export function createPostLikeRes(data: PostResponse, post: Post) {
+ if (post) {
+ post.score = data.post.score;
+ post.upvotes = data.post.upvotes;
+ post.downvotes = data.post.downvotes;
+ if (data.post.my_vote !== null) {
+ post.my_vote = data.post.my_vote;
+ }
+ }
+}
+
+export function editPostFindRes(data: PostResponse, posts: Array) {
+ let found = posts.find(c => c.id == data.post.id);
+ if (found) {
+ editPostRes(data, found);
+ }
+}
+
+export function editPostRes(data: PostResponse, post: Post) {
+ if (post) {
+ post.url = data.post.url;
+ post.name = data.post.name;
+ post.nsfw = data.post.nsfw;
+ }
+}
+
+export function commentsToFlatNodes(
+ comments: Array
+): Array {
+ let nodes: Array = [];
+ for (let comment of comments) {
+ nodes.push({ comment: comment });
+ }
+ return nodes;
+}
+
+export function commentSort(tree: Array, sort: CommentSortType) {
+ // First, put removed and deleted comments at the bottom, then do your other sorts
+ if (sort == CommentSortType.Top) {
+ tree.sort(
+ (a, b) =>
+ +a.comment.removed - +b.comment.removed ||
+ +a.comment.deleted - +b.comment.deleted ||
+ b.comment.score - a.comment.score
+ );
+ } else if (sort == CommentSortType.New) {
+ tree.sort(
+ (a, b) =>
+ +a.comment.removed - +b.comment.removed ||
+ +a.comment.deleted - +b.comment.deleted ||
+ b.comment.published.localeCompare(a.comment.published)
+ );
+ } else if (sort == CommentSortType.Old) {
+ tree.sort(
+ (a, b) =>
+ +a.comment.removed - +b.comment.removed ||
+ +a.comment.deleted - +b.comment.deleted ||
+ a.comment.published.localeCompare(b.comment.published)
+ );
+ } else if (sort == CommentSortType.Hot) {
+ tree.sort(
+ (a, b) =>
+ +a.comment.removed - +b.comment.removed ||
+ +a.comment.deleted - +b.comment.deleted ||
+ hotRankComment(b.comment) - hotRankComment(a.comment)
+ );
+ }
+
+ // Go through the children recursively
+ for (let node of tree) {
+ if (node.children) {
+ commentSort(node.children, sort);
+ }
+ }
+}
+
+export function commentSortSortType(tree: Array, sort: SortType) {
+ commentSort(tree, convertCommentSortType(sort));
+}
+
+function convertCommentSortType(sort: SortType): CommentSortType {
+ if (
+ sort == SortType.TopAll ||
+ sort == SortType.TopDay ||
+ sort == SortType.TopWeek ||
+ sort == SortType.TopMonth ||
+ sort == SortType.TopYear
+ ) {
+ return CommentSortType.Top;
+ } else if (sort == SortType.New) {
+ return CommentSortType.New;
+ } else if (sort == SortType.Hot) {
+ return CommentSortType.Hot;
+ } else {
+ return CommentSortType.Hot;
+ }
+}
+
+export function postSort(posts: Array, sort: SortType) {
+ // First, put removed and deleted comments at the bottom, then do your other sorts
+ if (
+ sort == SortType.TopAll ||
+ sort == SortType.TopDay ||
+ sort == SortType.TopWeek ||
+ sort == SortType.TopMonth ||
+ sort == SortType.TopYear
+ ) {
+ posts.sort(
+ (a, b) =>
+ +a.removed - +b.removed || +a.deleted - +b.deleted || b.score - a.score
+ );
+ } else if (sort == SortType.New) {
+ posts.sort(
+ (a, b) =>
+ +a.removed - +b.removed ||
+ +a.deleted - +b.deleted ||
+ b.published.localeCompare(a.published)
+ );
+ } else if (sort == SortType.Hot) {
+ posts.sort(
+ (a, b) =>
+ +a.removed - +b.removed ||
+ +a.deleted - +b.deleted ||
+ hotRankPost(b) - hotRankPost(a)
+ );
+ }
+}
diff --git a/ui/src/version.ts b/ui/src/version.ts
index f851d7188..78b06fe35 100644
--- a/ui/src/version.ts
+++ b/ui/src/version.ts
@@ -1 +1 @@
-export const version: string = 'v0.6.11';
+export const version: string = 'v0.6.25';
diff --git a/ui/translation_report.ts b/ui/translation_report.ts
index 1956b7921..c010aee0e 100644
--- a/ui/translation_report.ts
+++ b/ui/translation_report.ts
@@ -11,6 +11,7 @@ import { nl } from './src/translations/nl';
import { it } from './src/translations/it';
import { fi } from './src/translations/fi';
import { ca } from './src/translations/ca';
+import { pt_BR } from './src/translations/pt_br';
import fs from 'fs';
const files = [
@@ -23,6 +24,7 @@ const files = [
{ t: fr, n: 'fr' },
{ t: it, n: 'it' },
{ t: nl, n: 'nl' },
+ { t: pt_BR, n: 'pt-br' },
{ t: ru, n: 'ru' },
{ t: sv, n: 'sv' },
{ t: zh, n: 'zh' },
diff --git a/ui/yarn.lock b/ui/yarn.lock
index 64493e39f..4cbc90d95 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -1079,10 +1079,10 @@ emoji-regex@^8.0.0:
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-emoji-short-name@^0.1.0:
- version "0.1.4"
- resolved "https://registry.yarnpkg.com/emoji-short-name/-/emoji-short-name-0.1.4.tgz#125a452adc22a399b089f802f9d8d46ecb6e5b08"
- integrity sha512-VTjEKkhN1UARtHLqlK70N5K3SwxuZAkmdm5sXvSjkV677kr0jt/O7mvB5eQqM+3rKCa+w3Qb5G7wwU/fezonKQ==
+emoji-short-name@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/emoji-short-name/-/emoji-short-name-1.0.0.tgz#82e6f543b6c68984d69bdc80eac735104fdd4af8"
+ integrity sha512-+tiniHvgRR7XMI1jAaGveumWg5LALE/nWkFD6CcOn6M5IDM9w4PkMs8UwzLTMoZtDLdTdQmzxGvLOxHVIjPzjg==
encodeurl@~1.0.2:
version "1.0.2"
@@ -3076,6 +3076,11 @@ mkdirp@^0.5.1:
dependencies:
minimist "0.0.8"
+mobius1-selectr@^2.4.13:
+ version "2.4.13"
+ resolved "https://registry.yarnpkg.com/mobius1-selectr/-/mobius1-selectr-2.4.13.tgz#0019dfd9f984840d6e40f70683ab3ec78ce3b5df"
+ integrity sha512-Mk9qDrvU44UUL0EBhbAA1phfQZ7aMZPjwtL7wkpiBzGh8dETGqfsh50mWoX9EkjDlkONlErWXArHCKfoxVg0Bw==
+
moment@^2.24.0:
version "2.24.0"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
@@ -3731,10 +3736,10 @@ realm-utils@^1.0.9:
app-root-path "^1.3.0"
mkdirp "^0.5.1"
-reconnecting-websocket@^4.3.0:
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/reconnecting-websocket/-/reconnecting-websocket-4.3.0.tgz#aaefbc7629a89450aa45324b89aec2276e728cc5"
- integrity sha512-3eaHIEVYB9Zb0GfYy1xdEHKJLA2JaawAegByZ1AZ8Npb3AiRgUN5l89cvE2H+pHTsFcoC88t32ky9qET6DJ75Q==
+reconnecting-websocket@^4.4.0:
+ version "4.4.0"
+ resolved "https://registry.yarnpkg.com/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz#3b0e5b96ef119e78a03135865b8bb0af1b948783"
+ integrity sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng==
regenerate-unicode-properties@^8.1.0:
version "8.1.0"
+
- {post.url ? (
+ {this.props.showBody && this.state.url ? (
{post.name}
@@ -202,19 +241,25 @@ export class PostListing extends Component
- {post.url && (
-
-
- {new URL(post.url).hostname}
-
-
- )}
- {post.url && isImage(post.url) && (
+ {this.state.url &&
+ !(
+ new URL(this.state.url).hostname == window.location.hostname
+ ) && (
+
+
+ {new URL(this.state.url).hostname}
+
+
+
+ )}
+ {this.state.thumbnail && (
<>
{!this.state.imageExpanded ? (
{
class="pointer"
onClick={linkEvent(this, this.handleImageExpandClick)}
>
- 
+
@@ -315,9 +367,9 @@ export class PostListing extends Component {
- (+{post.upvotes}
+ (+{this.state.upvotes}
|
- -{post.downvotes}
+ -{this.state.downvotes}
)
@@ -596,6 +648,9 @@ export class PostListing extends Component {
)}
+ {this.state.url && this.props.showBody && this.state.iframely && (
+
diff --git a/ui/src/components/symbols.tsx b/ui/src/components/symbols.tsx
index 829201e4c..559a97072 100644
--- a/ui/src/components/symbols.tsx
+++ b/ui/src/components/symbols.tsx
@@ -15,6 +15,16 @@ export class Symbols extends Component
- {post.url ? (
+ {this.props.showBody && this.state.url ? (
{post.name}
@@ -202,19 +241,25 @@ export class PostListing extends Component {
)}
- {post.url && (
-
-
- {new URL(post.url).hostname}
-
-
- )}
- {post.url && isImage(post.url) && (
+ {this.state.url &&
+ !(
+ new URL(this.state.url).hostname == window.location.hostname
+ ) && (
+
+
+ {new URL(this.state.url).hostname}
+
+
+
+ )}
+ {this.state.thumbnail && (
<>
{!this.state.imageExpanded ? (
{
class="pointer"
onClick={linkEvent(this, this.handleImageExpandClick)}
>
-
- {this.state.comments.map(comment => (
-
);
}
@@ -1032,44 +1035,27 @@ export class User extends Component