From e41117c8785e414f543501dd4c50c96d5485d694 Mon Sep 17 00:00:00 2001 From: Ricardo de Arruda Date: Wed, 1 Jul 2020 00:30:23 +0300 Subject: [PATCH 01/74] Replace search button to input field at navbar. * Search input not rendered at /search path. * Navbar wrapped with withRouter for accessing history props. * Flex-grow/shrink control the width of the input element dynamically. --- ui/assets/css/main.css | 8 ++++++ ui/src/components/navbar.tsx | 49 ++++++++++++++++++++++++++++++------ ui/src/index.tsx | 2 +- 3 files changed, 50 insertions(+), 9 deletions(-) diff --git a/ui/assets/css/main.css b/ui/assets/css/main.css index c1f004d7a..4d9a099fa 100644 --- a/ui/assets/css/main.css +++ b/ui/assets/css/main.css @@ -249,3 +249,11 @@ pre { white-space: pre-wrap; word-break: keep-all; } + +.search-bar { + flex-basis: 10%; + flex-shrink: 3; + flex-grow: 0.3; + max-width: 33%; + min-width: 11em; +} \ No newline at end of file diff --git a/ui/src/components/navbar.tsx b/ui/src/components/navbar.tsx index 4cb74391b..175f590d3 100644 --- a/ui/src/components/navbar.tsx +++ b/ui/src/components/navbar.tsx @@ -1,5 +1,5 @@ import { Component, linkEvent } from 'inferno'; -import { Link } from 'inferno-router'; +import { Link, withRouter } from 'inferno-router'; import { Subscription } from 'rxjs'; import { retryWhen, delay, take } from 'rxjs/operators'; import { WebSocketService, UserService } from '../services'; @@ -12,6 +12,7 @@ import { GetPrivateMessagesForm, PrivateMessagesResponse, SortType, + SearchType, GetSiteResponse, Comment, CommentResponse, @@ -19,6 +20,7 @@ import { UserView, PrivateMessageResponse, WebSocketJsonResponse, + SearchForm, } from '../interfaces'; import { wsJsonToRes, @@ -42,9 +44,10 @@ interface NavbarState { unreadCount: number; siteName: string; admins: Array; + searchParam: string; } -export class Navbar extends Component { +class Navbar extends Component { private wsSub: Subscription; private userSub: Subscription; emptyState: NavbarState = { @@ -56,6 +59,7 @@ export class Navbar extends Component { expanded: false, siteName: undefined, admins: [], + searchParam: '', }; constructor(props: any, context: any) { @@ -87,6 +91,25 @@ export class Navbar extends Component { } WebSocketService.Instance.getSite(); + + this.handleSearchParam = this.handleSearchParam.bind(this); + } + + handleSearchParam(i: Navbar, event: any) { + i.state.searchParam = event.target.value; + i.setState(i.state); + } + + updateUrl() { + this.props.history.push( + `/search/q/${this.state.searchParam}/type/all/sort/topall/page/1` + ); + this.setState({ searchParam: '' }); + } + + handleSearchSubmit(i: Navbar, event: any) { + event.preventDefault(); + i.updateUrl(); } render() { @@ -143,11 +166,6 @@ export class Navbar extends Component { {i18n.t('communities')} -
  • - - {i18n.t('search')} - -
  • {
    • -
      + {!this.props.history.location.pathname.match(/^\/search/) && ( +
      +
      + +
      +
      + )} +
        {this.canAdmin && (
      • { } } } + +export default withRouter(Navbar); diff --git a/ui/src/index.tsx b/ui/src/index.tsx index 8e49df9fb..09d3aec6e 100644 --- a/ui/src/index.tsx +++ b/ui/src/index.tsx @@ -2,7 +2,7 @@ import { render, Component } from 'inferno'; import { BrowserRouter, Route, Switch } from 'inferno-router'; import { Provider } from 'inferno-i18next'; import { Main } from './components/main'; -import { Navbar } from './components/navbar'; +import Navbar from './components/navbar'; import { Footer } from './components/footer'; import { Login } from './components/login'; import { CreatePost } from './components/create-post'; From 0350f4bbebd0e9afd952611b377941bca269fb3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20T=C3=B6tterman?= Date: Fri, 3 Jul 2020 13:08:01 +0300 Subject: [PATCH 02/74] Fix ansible for Ubuntu 20.04 Focal (#856) * Fix ansible for Ubuntu 20.04 Focal * Use proper version comparison * Changes based on feedback --- ansible/lemmy.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ansible/lemmy.yml b/ansible/lemmy.yml index 5c8a5f911..a73f72933 100644 --- a/ansible/lemmy.yml +++ b/ansible/lemmy.yml @@ -11,6 +11,7 @@ when: lemmy_base_dir is not defined - name: install python for Ansible + # python2-minimal instead of python-minimal for ubuntu 20.04 and up raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal python-setuptools) args: executable: /bin/bash @@ -27,7 +28,18 @@ - 'docker-compose' - 'docker.io' - 'certbot' + + - name: install certbot-nginx on ubuntu < 20 + apt: + pkg: - 'python-certbot-nginx' + when: ansible_distribution == 'Ubuntu' and ansible_distribution_version|version_compare('20.04', '<') + + - name: install certbot-nginx on ubuntu > 20 + apt: + pkg: + - 'python3-certbot-nginx' + when: ansible_distribution == 'Ubuntu' and ansible_distribution_version|version_compare('20.04', '>=') - name: request initial letsencrypt certificate command: certbot certonly --nginx --agree-tos -d '{{ domain }}' -m '{{ letsencrypt_contact_email }}' From 916592944af8e32f2044c9acf0d57eb7991427a5 Mon Sep 17 00:00:00 2001 From: Riley Date: Fri, 3 Jul 2020 12:22:39 -0500 Subject: [PATCH 03/74] Verify activitypub payload digests (#885) --- server/Cargo.lock | 4 ++-- server/Cargo.toml | 2 +- server/src/routes/federation.rs | 12 +++++++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/server/Cargo.lock b/server/Cargo.lock index c54419e10..7b0d9a88c 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -1413,9 +1413,9 @@ dependencies = [ [[package]] name = "http-signature-normalization-actix" -version = "0.4.0-alpha.0" +version = "0.4.0-alpha.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09afff6987c7edbed101d1cddd2185786fb0af0dd9c06b654aca73a0a763680f" +checksum = "1c6efbc3e600cdd617585f4f15be3726c6942fb2eba3c8c79474c5d3159ad7c0" dependencies = [ "actix-http", "actix-web", diff --git a/server/Cargo.toml b/server/Cargo.toml index 8daf72c4a..225079940 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -43,7 +43,7 @@ percent-encoding = "2.1.0" comrak = "0.7" openssl = "0.10" http = "0.2.1" -http-signature-normalization-actix = { version = "0.4.0-alpha.0", default-features = false, features = ["sha-2"] } +http-signature-normalization-actix = { version = "0.4.0-alpha.1", default-features = false, features = ["sha-2"] } base64 = "0.12.1" tokio = "0.2.21" futures = "0.3.5" diff --git a/server/src/routes/federation.rs b/server/src/routes/federation.rs index fe6e33657..20b5dc834 100644 --- a/server/src/routes/federation.rs +++ b/server/src/routes/federation.rs @@ -12,6 +12,8 @@ use crate::{ settings::Settings, }; use actix_web::*; +use http_signature_normalization_actix::digest::middleware::VerifyDigest; +use sha2::{Digest, Sha256}; pub fn config(cfg: &mut web::ServiceConfig) { if Settings::get().federation.enabled { @@ -38,8 +40,12 @@ pub fn config(cfg: &mut web::ServiceConfig) { .route("/comment/{comment_id}", web::get().to(get_apub_comment)), ) // Inboxes dont work with the header guard for some reason. - .route("/c/{community_name}/inbox", web::post().to(community_inbox)) - .route("/u/{user_name}/inbox", web::post().to(user_inbox)) - .route("/inbox", web::post().to(shared_inbox)); + .service( + web::scope("/") + .wrap(VerifyDigest::new(Sha256::new())) + .route("/c/{community_name}/inbox", web::post().to(community_inbox)) + .route("/u/{user_name}/inbox", web::post().to(user_inbox)) + .route("/inbox", web::post().to(shared_inbox)), + ); } } From 8aa9cc11eb22f29ae5205afa638d36bf4d6f7a9c Mon Sep 17 00:00:00 2001 From: Dessalines Date: Fri, 3 Jul 2020 14:17:21 -0400 Subject: [PATCH 04/74] Fixing federation testing docs. Fixes #878 (#879) * Fixing federation testing docs. Fixes #878 * Removing extra clone. --- .../contributing_federation_development.md | 44 ++++++++++++------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/docs/src/contributing_federation_development.md b/docs/src/contributing_federation_development.md index 520a61275..143ae9f8b 100644 --- a/docs/src/contributing_federation_development.md +++ b/docs/src/contributing_federation_development.md @@ -5,14 +5,7 @@ If you don't have a local clone of the Lemmy repo yet, just run the following command: ```bash -git clone https://github.com/LemmyNet/lemmy -b federation -``` - -If you already have the Lemmy repo cloned, you need to add a new remote: -```bash -git remote add federation https://github.com/LemmyNet/lemmy -git checkout federation -git pull federation federation +git clone https://github.com/LemmyNet/lemmy ``` ## Running locally @@ -26,18 +19,34 @@ You need to have the following packages installed, the Docker service needs to b Then run the following ```bash -cd dev/federation-test -./run-federation-test.bash +cd docker/federation +./run-federation-test.bash -yarn ``` -After the build is finished and the docker-compose setup is running, open [127.0.0.1:8540](http://127.0.0.1:8540) and -[127.0.0.1:8550](http://127.0.0.1:8550) in your browser to use the test instances. You can login as admin with -username `lemmy_alpha` and `lemmy_beta` respectively, with password `lemmy`. +The federation test sets up 3 instances: + +Instance / Username | Location +--- | --- +lemmy_alpha | [127.0.0.1:8540](http://127.0.0.1:8540) +lemmy_beta | [127.0.0.1:8550](http://127.0.0.1:8550) +lemmy_gamma | [127.0.0.1:8560](http://127.0.0.1:8560) + +You can log into each using the instance name, and `lemmy` as the password, IE (`lemmy_alpha`, `lemmy`). + +Firefox containers are a good way to test them interacting. + +## Integration tests + +To run a suite of suite of federation integration tests: + +```bash +cd docker/federation-test +./run-tests.sh +``` ## Running on a server -Note that federation is currently in alpha. Only use it for testing, not on any production server, and be aware -that you might have to wipe the instance data at one point or another. +Note that federation is currently in alpha. **Only use it for testing**, not on any production server, and be aware that turning on federation may break your instance. Follow the normal installation instructions, either with [Ansible](administration_install_ansible.md) or [manually](administration_install_docker.md). Then replace the line `image: dessalines/lemmy:v0.x.x` in @@ -47,11 +56,12 @@ Follow the normal installation instructions, either with [Ansible](administratio ``` federation: { enabled: true - allowed_instances: example.com + tls_enabled: true, + allowed_instances: example.com, } ``` -Afterwards, and whenver you want to update to the latest version, run these commands on the server: +Afterwards, and whenever you want to update to the latest version, run these commands on the server: ``` cd /lemmy/ From 284f00249a8365fb8e5877aef41adae634cfb428 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Fri, 3 Jul 2020 14:19:24 -0400 Subject: [PATCH 05/74] Going back from jolt to dogbin iframely. jolt one had problems. (#900) --- ansible/templates/docker-compose.yml | 2 +- docker/dev/docker-compose.yml | 2 +- docker/federation/docker-compose.yml | 2 +- docker/prod/docker-compose.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/templates/docker-compose.yml b/ansible/templates/docker-compose.yml index 76c53463c..f4c94fd71 100644 --- a/ansible/templates/docker-compose.yml +++ b/ansible/templates/docker-compose.yml @@ -35,7 +35,7 @@ services: restart: always iframely: - image: jolt/iframely:v1.4.3 + image: dogbin/iframely:latest ports: - "127.0.0.1:8061:80" volumes: diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index fc6e21056..51a3ecdab 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -40,7 +40,7 @@ services: restart: always iframely: - image: jolt/iframely:v1.4.3 + image: dogbin/iframely:latest ports: - "127.0.0.1:8061:80" volumes: diff --git a/docker/federation/docker-compose.yml b/docker/federation/docker-compose.yml index 51a37b919..cbc648e65 100644 --- a/docker/federation/docker-compose.yml +++ b/docker/federation/docker-compose.yml @@ -107,6 +107,6 @@ services: - ./volumes/postgres_gamma:/var/lib/postgresql/data iframely: - image: jolt/iframely:v1.4.3 + image: dogbin/iframely:latest volumes: - ../iframely.config.local.js:/iframely/config.local.js:ro diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 5ccb1ec56..bc05a2b45 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -35,7 +35,7 @@ services: restart: always iframely: - image: jolt/iframely:v1.4.3 + image: dogbin/iframely:latest ports: - "127.0.0.1:8061:80" volumes: From e0b278984059d2927ff195cccd63f5a2afca3d07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=ABr=C3=AB=20R=C3=ABr=C3=AB?= Date: Fri, 3 Jul 2020 18:21:25 +0000 Subject: [PATCH 06/74] Translated using Weblate (Albanian) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/sq/ Translated using Weblate (Albanian) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/sq/ Translated using Weblate (Albanian) Currently translated at 55.8% (139 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/sq/ --- ui/translations/sq.json | 184 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 168 insertions(+), 16 deletions(-) diff --git a/ui/translations/sq.json b/ui/translations/sq.json index 0526fa267..5e296460e 100644 --- a/ui/translations/sq.json +++ b/ui/translations/sq.json @@ -1,8 +1,8 @@ { "remove_post": "Hiqe Postimin", "no_posts": "Nuk ka Postime.", - "create_a_post": "Krijo një postim", - "create_post": "Krijo Postimin", + "create_a_post": "Krijo Postim", + "create_post": "Krijo Postim", "posts": "Postime", "related_posts": "Këto postime mund të jenë të lidhura", "cross_posts": "Ky link është postuar edhe te:", @@ -12,16 +12,16 @@ "remove_comment": "Fshije Komentin", "communities": "Komunitetet", "users": "Përdoruesit", - "create_a_community": "Krijo një komunitet", + "create_a_community": "Krijo Komunitet", "select_a_community": "Përzgjedh një komunitet", - "create_community": "Krijo komunitetin", + "create_community": "Krijo Komunitet", "remove_community": "Fshije Komunitetin", - "subscribed_to_communities": "I abonuar në", - "trending_communities": "Trendi", + "subscribed_to_communities": "Jeni abonuar në", + "trending_communities": "Komunitetet në trend <1>communities", "list_of_communities": "Lista e komuniteteve", "community_reqs": "gërma të vogla, nënvizim, dhe pa hapësira.", "invalid_community_name": "Emër invalid.", - "create_private_message": "Krijo Mesazh Privat", + "create_private_message": "Shkruaji Mesazh Privat", "send_secure_message": "Dërgo Mesazh të Sigurtë", "send_message": "Dërgo Mesazh", "message": "Mesazh", @@ -63,15 +63,15 @@ "delete_account": "Fshije Account-in", "click_to_delete_picture": "Shtyp për të fshirë imazhin.", "picture_deleted": "Imazhi është fshirë.", - "restore": "rikthe", - "ban": "", - "ban_from_site": "", + "restore": "riktheje", + "ban": "dëboje", + "ban_from_site": "dëboje nga faqja", "save": "ruaj", - "unsave": "anulo ruajtjen", + "unsave": "hiqe", "create": "krijo", "creator": "krijuesi", - "username": "Emri virtual", - "email_or_username": "Email-i ose Emri virtual", + "username": "Emri Virtual", + "email_or_username": "Email-i ose Emri Virtual", "number_of_users": "{{count}} Përdorues", "number_of_users_plural": "{{count}} Përdoruesa", "number_of_subscribers": "{{count}} i abonuar", @@ -89,7 +89,7 @@ "subscribe": "Abonohu", "subscribed": "Jeni abonuar", "next": "Tjetra", - "post": "postim", + "post": "publiko", "number_of_posts": "{{count}} Postim", "number_of_posts_plural": "{{count}} Postime", "number_of_comments": "{{count}} Koment", @@ -103,6 +103,158 @@ "remove_as_admin": "largoje si administrator", "deleted": "është fshirë nga krijuesi", "delete_account_confirm": "Paralajmërim: kjo do të fshij të gjitha të dhënat e juaja përgjithmonë. Shtyp fjalëkalimin tënd për ta konfirmuar.", - "unsubscribe": "Çabonohu", - "prev": "E mëparshme" + "unsubscribe": "Ndalo Abonimin", + "prev": "E mëparshmja", + "to": "në", + "by": "nga", + "joined": "U anëtarësuat", + "code": "Kod", + "monero": "Monero", + "bitcoin": "Bitcoin", + "crypto": "Crypto", + "general_sponsors": "Sponsorët General janë ata që dhuruan $10 deri $39 për Lemmy.", + "donate": "Dhuroni", + "donate_to_lemmy": "Dhuroji Lemmy-it", + "support_on_open_collective": "Na përkrahni në OpenCollective", + "support_on_liberapay": "Na përkrahni në Liberapay", + "support_on_patreon": "Na përkrahni në Patreon", + "sponsors_of_lemmy": "Sponsorët e Lemmy-it", + "sponsors": "Sponsorët", + "show_nsfw": "Shfaq përmbajtjen NSFW", + "modified": "e modifikuar", + "your_site": "faqja jote", + "couldnt_update_community": "Komuniteti nuk mundi të përditësohej.", + "couldnt_find_community": "Komuniteti nuk mund të gjendej.", + "no_post_edit_allowed": "Nuk lejohet redaktimi i postimit.", + "no_comment_edit_allowed": "Nuk të lejohet redaktimi i komentit.", + "couldnt_get_comments": "Nuk mund të merrnim komentet.", + "couldnt_update_comment": "Përditësimi i komentit nuk ishte i mundshëm.", + "couldnt_like_comment": "Pëlqimi i komentit nuk ishte i mundshëm.", + "couldnt_create_comment": "Krijimi i komentit nuk ishte i mundshëm.", + "site_saved": "Faqja është ruajtur.", + "logged_in": "Jeni kyçur.", + "not_logged_in": "Nuk jeni kyçur.", + "powered_by": "Fuqizuar nga", + "no": "jo", + "yes": "po", + "are_you_sure": "a je i sigurt?", + "transfer_site": "faqe transferimi", + "transfer_community": "komunitet transferimi", + "block_leaving": "A je i sigurt se do të dalësh?", + "emoji_picker": "Zgjedh Emoji", + "action": "Veprim", + "time": "Koha", + "couldnt_update_private_message": "Nuk mundëm të përditësonim mesazhin privat.", + "no_private_message_edit_allowed": "Nuk lejohet redaktimi i mesazhit privat.", + "couldnt_create_private_message": "Nuk mund të krijohej mesazhi privat.", + "system_err_login": "Gabim sistemi. Provo të shkyçesh dhe të kyçesh përsëri.", + "couldnt_update_user": "Përditësimi i përdoruesit nuk ishte i mundshëm.", + "invalid_username": "Emri virtual është invalid.", + "passwords_dont_match": "Fjalëkalimet nuk janë të njëjta.", + "password_incorrect": "Fjalëkalimi është i pasaktë.", + "couldnt_find_that_username_or_email": "Nuk mund të gjendej ky emër virtual ose email.", + "couldnt_update_site": "Faqja nuk mund të përditësohej.", + "not_an_admin": "Nuk je administrator.", + "no_slurs": "Nuk lejohen sharjet.", + "couldnt_save_post": "Postimi nuk u ruajt.", + "couldnt_update_post": "Postimi nuk mundi të përditësohej", + "couldnt_get_posts": "Nuk mund të merreshin postimet", + "couldnt_find_post": "Nuk mund të gjendeshin postimet.", + "couldnt_like_post": "Nuk mund të pëlqehej postimi.", + "post_title_too_long": "Titulli i postimit ishte shumë i gjatë.", + "couldnt_create_post": "Nuk mund të krijohej postimi.", + "no_community_edit_allowed": "Nuk të lejohet redaktimi i komunitetit.", + "couldnt_save_comment": "Ruajtja e komentit nuk ishte e mundshme.", + "landing": "Lemmy është një <1>grumbullues linqesh / alternativë e reddit-it, e hartuar që të punoj në <2>fediverse-in.<3>Është self-hostable, ka komente që përditësohen në kohë reale, dhe është shumë i vogël (<4>~80kB). Federimi në ActivityPub është i planifikuar në të ardhmen e afërt. <5>Ky është <6>një version shumë i hershëm beta, dhe shumë funksione janë të prishura ose mungojnë. <7>Jep sugjerime të reja ose raporto probleme <8>këtu.<9>Krijuar me <10>Rust, <11>Actix, <12>Inferno, <13>Typescript.", + "from": "nga", + "ethereum": "Ethereum", + "silver_sponsors": "Sponsorët e Argjendtë janë ata që dhuruan $40 për Lemmy.", + "sponsor_message": "Lemmy është softuer <1>open-source, falas, pa reklama, pagesë, apo kapital të sipërmarrjes, përgjithmonë. Donacionet tuaja mbështesin zhvillimin konstant të projektit. Falënderojmë njerëzit në vijim:", + "unban": "anuloje dëbimin", + "unban_from_site": "anuloje dëbimin nga faqja", + "banned_users": "Pëdoruesit e dëbuar", + "banned": "të dëbuar", + "sidebar": "Informatat anësore", + "sort_type": "Radhit sipas", + "new": "Të rejat", + "old": "Të vjetrat", + "week": "Javës", + "month": "Muajit", + "year": "Vitit", + "api": "API", + "inbox": "Kutia e njoftimeve", + "inbox_for": "Kutia e njoftimeve për <1>{{user}}", + "type": "Lloji", + "unread": "Të palexuara", + "message_sent": "Mesazhi u dërgua", + "search": "Kërko", + "view": "Shiko", + "logout": "Shkyçu", + "top": "Më të pëqlyerat", + "login_sign_up": "Kyçu / Regjistrohu", + "login": "Kyçu", + "sign_up": "Regjistrohu", + "hot": "Popullore", + "top_day": "Më të pëlqyerat e ditës", + "docs": "Dokumentimi", + "replies": "Përgjigjet", + "mentions": "Përmendur", + "reply_sent": "Përgjigja u dërgua", + "messages": "Mesazhet", + "password": "Fjalëkalimi", + "old_password": "Fjalëkalimi i vjetër", + "forgot_password": "harrova fjalëkalimin", + "password_change": "Ndrysho Fjalëkalimin", + "new_password": "Fjalëkalimi i ri", + "no_email_setup": "Ky server nuk e ka konfiguruar Email-in saktësisht.", + "email": "Email", + "matrix_user_id": "Përdorues i Matrix-it", + "send_notifications_to_email": "Dërgo njoftimet në Email", + "expires": "Skadon", + "language": "Gjuha", + "enable_downvotes": "Lejo votat negative", + "number_of_upvotes": "{{count}} Votë pozitive", + "number_of_upvotes_plural": "{{count}} Vota pozitive", + "number_of_downvotes": "{{count}} Votë negative", + "number_of_downvotes_plural": "{{count}} Vota negative", + "open_registration": "Hape regjistrimin", + "enable_nsfw": "Lejo përmbajtje NSFW", + "url": "URL", + "body": "Teksti", + "community": "Komuniteti", + "expand_here": "Zgjero këtu", + "subscribe_to_communities": "Abonohu në disa <1>communities.", + "verify_password": "Konfirmo Fjalëkalimin", + "optional": "E padetyrueshme", + "browser_default": "Parazgjedhur nga shfletuesi", + "downvotes_disabled": "Votat negative janë të çaktivizuara", + "upvote": "Votë pozitive", + "downvote": "Votë negative", + "registration_closed": "Regjistrimi u mbyll", + "chat": "Chat", + "recent_comments": "Komentet më të reja", + "no_results": "S'ka rezultate.", + "setup": "Konfigurimi", + "setup_admin": "Krijo një administrator të faqes", + "nsfw": "NSFW", + "theme": "Pamja", + "lemmy_instance_setup": "Konfigurimi i një instance të Lemmy-it", + "community_ban": "Jeni dëbuar nga ky komunitet.", + "site_ban": "Jeni dëbuar nga kjo faqe", + "community_already_exists": "Komuniteti ekziston më.", + "community_moderator_already_exists": "Moderatori i komunitetit ekziston më.", + "community_follower_already_exists": "Ndjekësi i komunitetit ekziston më.", + "community_user_already_banned": "Anëtari i komunitetit është dëbuar më.", + "site_already_exists": "Faqja ekziston më.", + "user_already_exists": "Përdoruesi tashmë ekziston.", + "email_already_exists": "Email-i tashmë ekziston.", + "admin_already_created": "Kërkojmë ndjesë, por tashmë është një administrator.", + "all": "Të gjitha", + "mark_all_as_read": "shëno të gjitha si të lexuara", + "overview": "Shiko në përgjithësi", + "notifications_error": "Njoftimet në desktop nuk janë të mundshme në shfletuesin tuaj. Provoni Firefox ose Chrome.", + "unread_messages": "Mesazhet e palexuara", + "reset_password_mail_sent": "Një Email është dërguar për të ndryshuar fjalëkalimin tuaj.", + "private_message_disclaimer": "Paralajmërim: Mesazhet private në Lemmy nuk janë të siguruara. Ju lutem krijoni një account në <1>Riot.im për të dërguar mesazhe të sigurta.", + "copy_suggested_title": "kopjo titullin e sugjeruar: {{title}}" } From f074e23c8077d268c65d27a95281c192c524a085 Mon Sep 17 00:00:00 2001 From: Cee Date: Fri, 3 Jul 2020 18:21:25 +0000 Subject: [PATCH 07/74] Translated using Weblate (Chinese (Simplified)) Currently translated at 98.7% (246 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/zh_Hans/ Translated using Weblate (Chinese (Simplified)) Currently translated at 98.7% (246 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/zh_Hans/ --- ui/translations/zh.json | 66 ++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/ui/translations/zh.json b/ui/translations/zh.json index def3b05cb..ddf402226 100644 --- a/ui/translations/zh.json +++ b/ui/translations/zh.json @@ -24,29 +24,29 @@ "unlock": "解锁", "lock": "加锁", "link": "链接", - "mod": "监管人", - "mods": "监管人", + "mod": "社群管理", + "mods": "社群管理", "moderates": "监管", - "remove_as_mod": "添加监管人", - "appoint_as_mod": "移除监管人", - "modlog": "监管记录", - "admin": "管理权限", - "admins": "管理权限", - "remove_as_admin": "移除管理权限", - "appoint_as_admin": "添加管理权限", + "remove_as_mod": "删除社群管理", + "appoint_as_mod": "任命为社群管理", + "modlog": "审核记录", + "admin": "总管理员", + "admins": "总管理员", + "remove_as_admin": "移除管理员权限", + "appoint_as_admin": "添加管理员权限", "remove": "移除", - "removed": "已被管理员移除", - "locked": "已加锁", + "removed": "已被社群管理移除", + "locked": "已锁定", "reason": "原因", - "mark_as_read": "标记未读", - "mark_as_unread": "标记已读", + "mark_as_read": "标记为已读", + "mark_as_unread": "标记为未读", "delete": "删除", "deleted": "作者已删除", "restore": "恢复", "ban": "禁止", "ban_from_site": "禁止此站点", - "unban": "取消", - "unban_from_site": "取消禁止", + "unban": "取消禁止", + "unban_from_site": "取消禁止网站", "save": "保存", "unsave": "取消保存", "create": "创建", @@ -54,7 +54,7 @@ "email_or_username": "邮箱或用户名", "number_of_users": "{{count}} 名用户", "number_of_subscribers": "{{count}} 名订阅者", - "number_of_points": "{{count}} 点数", + "number_of_points": "{{count}} 积分", "name": "名字", "title": "标题", "category": "分类", @@ -70,13 +70,13 @@ "sort_type": "排序方式", "hot": "最热", "new": "最新", - "top_day": "今日", + "top_day": "每日推荐", "week": "周", "month": "月", "year": "年", "all": "所有", - "top": "最热", - "api": "应用程式介面", + "top": "推荐", + "api": "API", "inbox": "收件箱", "inbox_for": "<1>{{user}} 收件箱", "mark_all_as_read": "标记所有已读", @@ -97,7 +97,7 @@ "email": "邮箱", "optional": "选项", "expires": "过期", - "url": "网址", + "url": "相关网址", "body": "内容", "copy_suggested_title": "复制建议的标题: {{title}}", "community": "社群", @@ -160,7 +160,7 @@ "show_nsfw": "显示工作场所不宜内容", "theme": "主题", "from": "由", - "donate_to_lemmy": "向Lemmy捐赠", + "donate_to_lemmy": "向 Lemmy 捐赠", "donate": "捐赠", "monero": "门罗币", "to": "发布到", @@ -185,21 +185,21 @@ "unsticky": "取消固定", "archive_link": "链接归档", "settings": "设定", - "stickied": "已固定", + "stickied": "已置顶", "delete_account": "删除账号", - "delete_account_confirm": "警告：此操作将永久删除你的数据。输入密码进行确认。", + "delete_account_confirm": "警告！此操作将永久删除你的数据，请输入密码进行确认。", "cross_posts": "此链接也已被发布到：", "cross_post": "复数发布", "cross_posted_to": "已被复数发布到： ", "users": "用户", "banned": "已被禁止", - "creator": "发布者", + "creator": "作者", "number_of_communities": "{{count}} 个社群", - "old": "最旧", + "old": "最早", "docs": "文档", "upload_avatar": "上传头像", "replies": "回复", - "number_online": "{{count}}名在线用户", + "number_online": "{{count}} 名在线用户", "mentions": "提到", "message_sent": "已发送信息", "old_password": "当前密码", @@ -214,12 +214,12 @@ "send_notifications_to_email": "向邮箱发送通知", "language": "语言", "browser_default": "浏览器默认语言", - "downvotes_disabled": "点踩功能已禁用", - "enable_downvotes": "启用点踩功能", + "downvotes_disabled": "反对投票已禁用", + "enable_downvotes": "启用反对投票功能", "upvote": "点赞", "number_of_upvotes": "{{count}} 个赞", - "downvote": "点踩", - "number_of_downvotes": "{{count}} 个踩", + "downvote": "反对", + "number_of_downvotes": "{{count}} 个反对", "open_registration": "开放注册", "registration_closed": "注册功能已关闭", "recent_comments": "最新评论", @@ -241,5 +241,9 @@ "banned_users": "被禁止用户", "site_saved": "网站已保存", "emoji_picker": "选择表情", - "invalid_username": "用户名无效" + "invalid_username": "用户名无效", + "invalid_community_name": "无效的名称", + "click_to_delete_picture": "点击删除图片", + "picture_deleted": "图片已删除", + "select_a_community": "选择一个社群" } From 1f1ea68f459f1c8c2fc7d264cc299e5993e55ebf Mon Sep 17 00:00:00 2001 From: ButterflyOfFire Date: Fri, 3 Jul 2020 18:21:26 +0000 Subject: [PATCH 08/74] Translated using Weblate (Arabic) Currently translated at 75.1% (187 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/ar/ --- ui/translations/ar.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ui/translations/ar.json b/ui/translations/ar.json index f963439ef..99140cdf0 100644 --- a/ui/translations/ar.json +++ b/ui/translations/ar.json @@ -44,12 +44,12 @@ "remove_as_admin": "إزالة كمدير", "appoint_as_admin": "تعيين كمدير", "remove": "إزالة", - "removed": "تمت إزالته", + "removed": "أزاله المشرف", "reason": "السبب", "mark_as_read": "تعيين كمقروء", "mark_as_unread": "تعيين كغير مقروء بعد", "delete": "حذف", - "deleted": "تم حذفه", + "deleted": "حذفه صاحبه", "restore": "استعادة", "ban": "طرد", "ban_from_site": "طرده مِن الموقع", @@ -219,5 +219,6 @@ "banned_users": "المستخدمون المحظورون", "reset_password_mail_sent": "لقد أرسِلت إليك رسالة إلكترونية لتصفير كلمتك السرية.", "upvote": "صوّت إيجابيا", - "downvote": "صوّت سلبيا" + "downvote": "صوّت سلبيا", + "select_a_community": "اختر مجتمعًا" } From 2f54532be0da984c0444280ae23e1b3d8bcaf2a2 Mon Sep 17 00:00:00 2001 From: Ricardo de Arruda Date: Fri, 3 Jul 2020 23:20:44 +0300 Subject: [PATCH 09/74] Modify search button to be expandable. * Accordingly issue#814. * Input contract if un-focus input element * Search text data persisted when contracted/expanded --- ui/assets/css/main.css | 21 +++++++---- ui/src/components/navbar.tsx | 71 +++++++++++++++++++++++++++++------- ui/src/index.tsx | 2 +- 3 files changed, 72 insertions(+), 22 deletions(-) diff --git a/ui/assets/css/main.css b/ui/assets/css/main.css index 4d9a099fa..a05f5a8ba 100644 --- a/ui/assets/css/main.css +++ b/ui/assets/css/main.css @@ -250,10 +250,17 @@ pre { word-break: keep-all; } -.search-bar { - flex-basis: 10%; - flex-shrink: 3; - flex-grow: 0.3; - max-width: 33%; - min-width: 11em; -} \ No newline at end of file +.form-control.search-input { + float: right !important; + transition: width 0.5s ease-out 0s !important; +} + +.show-input { + width: 13em !important; + +} +.hide-input { + background: transparent !important; + width: 0px !important; + padding: 0 !important; + } \ No newline at end of file diff --git a/ui/src/components/navbar.tsx b/ui/src/components/navbar.tsx index 175f590d3..7c72d6cd0 100644 --- a/ui/src/components/navbar.tsx +++ b/ui/src/components/navbar.tsx @@ -1,5 +1,5 @@ -import { Component, linkEvent } from 'inferno'; -import { Link, withRouter } from 'inferno-router'; +import { Component, linkEvent, createRef, RefObject } from 'inferno'; +import { Link } from 'inferno-router'; import { Subscription } from 'rxjs'; import { retryWhen, delay, take } from 'rxjs/operators'; import { WebSocketService, UserService } from '../services'; @@ -45,11 +45,13 @@ interface NavbarState { siteName: string; admins: Array; searchParam: string; + toggleSearch: boolean; } -class Navbar extends Component { +export class Navbar extends Component { private wsSub: Subscription; private userSub: Subscription; + private searchTextField: RefObject; emptyState: NavbarState = { isLoggedIn: UserService.Instance.user !== undefined, unreadCount: 0, @@ -60,6 +62,7 @@ class Navbar extends Component { siteName: undefined, admins: [], searchParam: '', + toggleSearch: false, }; constructor(props: any, context: any) { @@ -92,7 +95,7 @@ class Navbar extends Component { WebSocketService.Instance.getSite(); - this.handleSearchParam = this.handleSearchParam.bind(this); + this.searchTextField = createRef(); } handleSearchParam(i: Navbar, event: any) { @@ -101,10 +104,16 @@ class Navbar extends Component { } updateUrl() { - this.props.history.push( - `/search/q/${this.state.searchParam}/type/all/sort/topall/page/1` - ); + const searchParam = this.state.searchParam; this.setState({ searchParam: '' }); + this.setState({ toggleSearch: false }); + if (searchParam === '') { + this.context.router.history.push(`/search/`); + } else { + this.context.router.history.push( + `/search/q/${searchParam}/type/all/sort/topall/page/1` + ); + } } handleSearchSubmit(i: Navbar, event: any) { @@ -112,6 +121,24 @@ class Navbar extends Component { i.updateUrl(); } + handleSearchBtn(i: Navbar, event: any) { + event.preventDefault(); + i.setState({ toggleSearch: true }); + + i.searchTextField.current.focus(); + const offsetWidth = i.searchTextField.current.offsetWidth; + if (i.state.searchParam && offsetWidth > 100) { + i.updateUrl(); + } + } + + handleSearchBlur(i: Navbar, event: any) { + if (!(event.relatedTarget && event.relatedTarget.name !== 'search-btn')) { + i.state.toggleSearch = false; + i.setState(i.state); + } + } + render() { return this.navbar(); } @@ -199,16 +226,34 @@ class Navbar extends Component {
      - {!this.props.history.location.pathname.match(/^\/search/) && ( -
      -
      + {!this.context.router.history.location.pathname.match( + /^\/search/ + ) && ( +
      + +
      + +
      )} @@ -457,5 +502,3 @@ class Navbar extends Component { } } } - -export default withRouter(Navbar); diff --git a/ui/src/index.tsx b/ui/src/index.tsx index 09d3aec6e..8e49df9fb 100644 --- a/ui/src/index.tsx +++ b/ui/src/index.tsx @@ -2,7 +2,7 @@ import { render, Component } from 'inferno'; import { BrowserRouter, Route, Switch } from 'inferno-router'; import { Provider } from 'inferno-i18next'; import { Main } from './components/main'; -import Navbar from './components/navbar'; +import { Navbar } from './components/navbar'; import { Footer } from './components/footer'; import { Login } from './components/login'; import { CreatePost } from './components/create-post'; From aab68f0bafacb88f6c542a98d2a0f3cdb0de20b3 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Fri, 3 Jul 2020 17:56:50 -0400 Subject: [PATCH 10/74] Adding to sponsors list. --- ui/src/components/sponsors.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/src/components/sponsors.tsx b/ui/src/components/sponsors.tsx index 4561bc304..31a4ee5ef 100644 --- a/ui/src/components/sponsors.tsx +++ b/ui/src/components/sponsors.tsx @@ -10,6 +10,7 @@ interface SilverUser { } let general = [ + 'dude in phx', 'twilight loki', 'Andrew Plaza', 'Jonathan Cremin', From 69df9cecca357989ef4a5c056b67bd252641df01 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Fri, 3 Jul 2020 22:00:51 -0400 Subject: [PATCH 11/74] Adding a search icon, and a faster transition. --- ui/assets/css/main.css | 4 ++-- ui/src/components/navbar.tsx | 25 +++++++++++++------------ ui/src/components/symbols.tsx | 4 ++-- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/ui/assets/css/main.css b/ui/assets/css/main.css index a05f5a8ba..fd65148c7 100644 --- a/ui/assets/css/main.css +++ b/ui/assets/css/main.css @@ -252,7 +252,7 @@ pre { .form-control.search-input { float: right !important; - transition: width 0.5s ease-out 0s !important; + transition: width 0.2s ease-out 0s !important; } .show-input { @@ -263,4 +263,4 @@ pre { background: transparent !important; width: 0px !important; padding: 0 !important; - } \ No newline at end of file + } diff --git a/ui/src/components/navbar.tsx b/ui/src/components/navbar.tsx index 7c72d6cd0..53b085e5b 100644 --- a/ui/src/components/navbar.tsx +++ b/ui/src/components/navbar.tsx @@ -245,21 +245,22 @@ export class Navbar extends Component { placeholder={i18n.t('search')} onBlur={linkEvent(this, this.handleSearchBlur)} > -
      - -
      +
      )} -
        +
          {this.canAdmin && ( -
        • +
        • { )} {this.state.isLoggedIn ? ( <> -
        • +
        • diff --git a/ui/src/components/symbols.tsx b/ui/src/components/symbols.tsx index cdb7436a4..77d7a0860 100644 --- a/ui/src/components/symbols.tsx +++ b/ui/src/components/symbols.tsx @@ -159,8 +159,8 @@ export class Symbols extends Component { /> - - + + From e95992b704be7132e3d482cec4c7117e3172c4b1 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Fri, 3 Jul 2020 22:26:49 -0400 Subject: [PATCH 12/74] Version v0.7.9 --- ansible/VERSION | 2 +- docker/prod/docker-compose.yml | 2 +- server/src/version.rs | 2 +- ui/src/version.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/VERSION b/ansible/VERSION index 151a6866b..a502cc623 100644 --- a/ansible/VERSION +++ b/ansible/VERSION @@ -1 +1 @@ -v0.7.8 +v0.7.9 diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index bc05a2b45..fe91084bf 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.7.8 + image: dessalines/lemmy:v0.7.9 ports: - "127.0.0.1:8536:8536" restart: always diff --git a/server/src/version.rs b/server/src/version.rs index 83d604cd3..c5c41270e 100644 --- a/server/src/version.rs +++ b/server/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "v0.7.8"; +pub const VERSION: &str = "v0.7.9"; diff --git a/ui/src/version.ts b/ui/src/version.ts index 709137efd..69dc42817 100644 --- a/ui/src/version.ts +++ b/ui/src/version.ts @@ -1 +1 @@ -export const version: string = 'v0.7.8'; +export const version: string = 'v0.7.9'; From 1bd7218a7e750f430497720e6dd6ae9cd68acff8 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Fri, 3 Jul 2020 23:39:43 -0400 Subject: [PATCH 13/74] Adding an issue template. --- .github/ISSUE_TEMPLATE/BUG_REPORT.md | 27 +++++++++++++++ .github/ISSUE_TEMPLATE/FEATURE_REQUEST.md | 42 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/QUESTION.md | 11 ++++++ 3 files changed, 80 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/BUG_REPORT.md create mode 100644 .github/ISSUE_TEMPLATE/FEATURE_REQUEST.md create mode 100644 .github/ISSUE_TEMPLATE/QUESTION.md diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md new file mode 100644 index 000000000..e9cceb718 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md @@ -0,0 +1,27 @@ +--- +name: "🐞 Bug Report" +about: Create a report to help us improve Lemmy +title: '' +labels: 'type:bug' +assignees: '' + +--- + +Found a bug? Please fill out the sections below. 👍 + +### Issue Summary + +A summary of the bug. + + +### Steps to Reproduce + +1. (for example) I clicked login, and an endless spinner show up. +2. I tried to install lemmy via this guide, and I'm getting this error. +3. ... + +### Technical details + +* Please post your log: `sudo docker-compose logs > lemmy_log.out`. +* What OS are you trying to install lemmy on? +* Any browser console errors? diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md new file mode 100644 index 000000000..d26125603 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md @@ -0,0 +1,42 @@ +--- +name: "🚀 Feature request" +about: Suggest an idea for improving Lemmy +title: '' +labels: 'type:enhancement' +assignees: '' + +--- + +### Is your proposal related to a problem? + + + +(Write your answer here.) + +### Describe the solution you'd like + + + +(Describe your proposed solution here.) + +### Describe alternatives you've considered + + + +(Write your answer here.) + +### Additional context + + + +(Write your answer here.) diff --git a/.github/ISSUE_TEMPLATE/QUESTION.md b/.github/ISSUE_TEMPLATE/QUESTION.md new file mode 100644 index 000000000..e81ee01de --- /dev/null +++ b/.github/ISSUE_TEMPLATE/QUESTION.md @@ -0,0 +1,11 @@ +--- +name: "? Question" +about: General questions about Lemmy +title: '' +labels: 'type:question' +assignees: '' + +--- + +What's the question you have about lemmy? + From 00870dfb5e371483ad20247aefa2004a61fa385d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=ABr=C3=AB=20R=C3=ABr=C3=AB?= Date: Sat, 4 Jul 2020 09:17:24 +0000 Subject: [PATCH 14/74] Translated using Weblate (Albanian) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/sq/ Translated using Weblate (Albanian) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/sq/ Translated using Weblate (Albanian) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/sq/ Translated using Weblate (Albanian) Currently translated at 55.8% (139 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/sq/ --- ui/translations/sq.json | 186 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 169 insertions(+), 17 deletions(-) diff --git a/ui/translations/sq.json b/ui/translations/sq.json index 0526fa267..2b5254450 100644 --- a/ui/translations/sq.json +++ b/ui/translations/sq.json @@ -1,8 +1,8 @@ { "remove_post": "Hiqe Postimin", "no_posts": "Nuk ka Postime.", - "create_a_post": "Krijo një postim", - "create_post": "Krijo Postimin", + "create_a_post": "Krijo Postim", + "create_post": "Krijo Postim", "posts": "Postime", "related_posts": "Këto postime mund të jenë të lidhura", "cross_posts": "Ky link është postuar edhe te:", @@ -12,16 +12,16 @@ "remove_comment": "Fshije Komentin", "communities": "Komunitetet", "users": "Përdoruesit", - "create_a_community": "Krijo një komunitet", + "create_a_community": "Krijo një Komunitet", "select_a_community": "Përzgjedh një komunitet", - "create_community": "Krijo komunitetin", + "create_community": "Krijo Komunitet", "remove_community": "Fshije Komunitetin", - "subscribed_to_communities": "I abonuar në", - "trending_communities": "Trendi", + "subscribed_to_communities": "Jeni abonuar në <1>communities", + "trending_communities": "Komunitetet në trend <1>communities", "list_of_communities": "Lista e komuniteteve", "community_reqs": "gërma të vogla, nënvizim, dhe pa hapësira.", "invalid_community_name": "Emër invalid.", - "create_private_message": "Krijo Mesazh Privat", + "create_private_message": "Shkruaji Mesazh Privat", "send_secure_message": "Dërgo Mesazh të Sigurtë", "send_message": "Dërgo Mesazh", "message": "Mesazh", @@ -63,15 +63,15 @@ "delete_account": "Fshije Account-in", "click_to_delete_picture": "Shtyp për të fshirë imazhin.", "picture_deleted": "Imazhi është fshirë.", - "restore": "rikthe", - "ban": "", - "ban_from_site": "", + "restore": "riktheje", + "ban": "dëboje", + "ban_from_site": "dëboje nga faqja", "save": "ruaj", - "unsave": "anulo ruajtjen", + "unsave": "hiqe", "create": "krijo", "creator": "krijuesi", - "username": "Emri virtual", - "email_or_username": "Email-i ose Emri virtual", + "username": "Emri Virtual", + "email_or_username": "Email-i ose Emri Virtual", "number_of_users": "{{count}} Përdorues", "number_of_users_plural": "{{count}} Përdoruesa", "number_of_subscribers": "{{count}} i abonuar", @@ -89,7 +89,7 @@ "subscribe": "Abonohu", "subscribed": "Jeni abonuar", "next": "Tjetra", - "post": "postim", + "post": "publiko", "number_of_posts": "{{count}} Postim", "number_of_posts_plural": "{{count}} Postime", "number_of_comments": "{{count}} Koment", @@ -101,8 +101,160 @@ "moderates": "Moderon", "admin_settings": "Konfigurimet administrative", "remove_as_admin": "largoje si administrator", - "deleted": "është fshirë nga krijuesi", + "deleted": "është fshirë nga autori", "delete_account_confirm": "Paralajmërim: kjo do të fshij të gjitha të dhënat e juaja përgjithmonë. Shtyp fjalëkalimin tënd për ta konfirmuar.", - "unsubscribe": "Çabonohu", - "prev": "E mëparshme" + "unsubscribe": "Ndalo Abonimin", + "prev": "E mëparshmja", + "to": "në", + "by": "nga", + "joined": "U anëtarësuat", + "code": "Kodi", + "monero": "Monero", + "bitcoin": "Bitcoin", + "crypto": "Crypto", + "general_sponsors": "Sponsorët General janë ata që dhuruan $10 deri $39 për Lemmy.", + "donate": "Dhuroni", + "donate_to_lemmy": "Dhuroji Lemmy-it", + "support_on_open_collective": "Na përkrahni në OpenCollective", + "support_on_liberapay": "Na përkrahni në Liberapay", + "support_on_patreon": "Na përkrahni në Patreon", + "sponsors_of_lemmy": "Sponsorët e Lemmy", + "sponsors": "Sponsorët", + "show_nsfw": "Shfaq përmbajtje NSFW", + "modified": "e modifikuar", + "your_site": "faqja jote", + "couldnt_update_community": "Komuniteti nuk mundi të përditësohej.", + "couldnt_find_community": "Komuniteti nuk mund të gjendej.", + "no_post_edit_allowed": "Nuk lejohet redaktimi i postimit.", + "no_comment_edit_allowed": "Nuk të lejohet redaktimi i komentit.", + "couldnt_get_comments": "Nuk mund të merrnim komentet.", + "couldnt_update_comment": "Përditësimi i komentit nuk ishte i mundshëm.", + "couldnt_like_comment": "Pëlqimi i komentit nuk ishte i mundshëm.", + "couldnt_create_comment": "Krijimi i komentit nuk ishte i mundshëm.", + "site_saved": "Faqja është ruajtur.", + "logged_in": "Jeni kyçur.", + "not_logged_in": "Nuk jeni kyçur.", + "powered_by": "Fuqizuar nga", + "no": "jo", + "yes": "po", + "are_you_sure": "a je i sigurt?", + "transfer_site": "faqe transferimi", + "transfer_community": "komunitet transferimi", + "block_leaving": "A je i sigurt se do të dalësh?", + "emoji_picker": "Zgjedh Emoji", + "action": "Veprim", + "time": "Koha", + "couldnt_update_private_message": "Nuk mundëm të përditësonim mesazhin privat.", + "no_private_message_edit_allowed": "Nuk lejohet redaktimi i mesazhit privat.", + "couldnt_create_private_message": "Nuk mund të krijohej mesazhi privat.", + "system_err_login": "Gabim sistemi. Provo të shkyçesh dhe të kyçesh përsëri.", + "couldnt_update_user": "Përditësimi i përdoruesit nuk ishte i mundshëm.", + "invalid_username": "Emri virtual është invalid.", + "passwords_dont_match": "Fjalëkalimet nuk janë të njëjta.", + "password_incorrect": "Fjalëkalimi është i pasaktë.", + "couldnt_find_that_username_or_email": "Nuk mund të gjendej ky emër virtual ose email.", + "couldnt_update_site": "Faqja nuk mund të përditësohej.", + "not_an_admin": "Nuk je administrator.", + "no_slurs": "Nuk lejohen sharjet.", + "couldnt_save_post": "Postimi nuk u ruajt.", + "couldnt_update_post": "Postimi nuk mundi të përditësohej", + "couldnt_get_posts": "Nuk mund të merreshin postimet", + "couldnt_find_post": "Nuk mund të gjendeshin postimet.", + "couldnt_like_post": "Nuk mund të pëlqehej postimi.", + "post_title_too_long": "Titulli i postimit ishte shumë i gjatë.", + "couldnt_create_post": "Nuk mund të krijohej postimi.", + "no_community_edit_allowed": "Nuk të lejohet redaktimi i komunitetit.", + "couldnt_save_comment": "Ruajtja e komentit nuk ishte e mundshme.", + "landing": "Lemmy është një <1>grumbullues linqesh / alternativë e reddit-it, e hartuar që të punoj në <2>fediverse-in.<3>Është self-hostable, ka komente që përditësohen në kohë reale, dhe është shumë i vogël (<4>~80kB). Federimi në ActivityPub është i planifikuar në të ardhmen e afërt. <5>Ky është <6>një version shumë i hershëm beta, dhe shumë funksione janë të prishura ose mungojnë. <7>Jep sugjerime të reja ose raporto probleme <8>këtu.<9>Krijuar me <10>Rust, <11>Actix, <12>Inferno, <13>Typescript.", + "from": "nga", + "ethereum": "Ethereum", + "silver_sponsors": "Sponsorët e Argjendtë janë ata që dhuruan $40 për Lemmy.", + "sponsor_message": "Lemmy është softuer <1>open-source, falas, pa reklama, pagesë, apo kapital të sipërmarrjes, përgjithmonë. Donacionet tuaja mbështesin zhvillimin konstant të projektit. Falënderojmë njerëzit në vijim:", + "unban": "anuloje dëbimin", + "unban_from_site": "anuloje dëbimin nga faqja", + "banned_users": "Pëdoruesit e dëbuar", + "banned": "të dëbuar", + "sidebar": "Informatat anësore", + "sort_type": "Radhit sipas", + "new": "Të rejat", + "old": "Të vjetrat", + "week": "Javës", + "month": "Muajit", + "year": "Vitit", + "api": "API", + "inbox": "Kutia e njoftimeve", + "inbox_for": "Kutia e njoftimeve për <1>{{user}}", + "type": "Lloji", + "unread": "Të palexuara", + "message_sent": "Mesazhi u dërgua", + "search": "Kërko", + "view": "Shiko", + "logout": "Shkyçu", + "top": "Top", + "login_sign_up": "Kyçu / Regjistrohu", + "login": "Kyçu", + "sign_up": "Regjistrohu", + "hot": "Popullore", + "top_day": "Më të pëlqyerat e ditës", + "docs": "Dokumentimi", + "replies": "Përgjigjet", + "mentions": "Përmendur", + "reply_sent": "Përgjigja u dërgua", + "messages": "Mesazhet", + "password": "Fjalëkalimi", + "old_password": "Fjalëkalimi i vjetër", + "forgot_password": "harrova fjalëkalimin", + "password_change": "Ndrysho Fjalëkalimin", + "new_password": "Fjalëkalimi i ri", + "no_email_setup": "Ky server nuk e ka konfiguruar Email-in saktësisht.", + "email": "Email", + "matrix_user_id": "Përdorues i Matrix-it", + "send_notifications_to_email": "Dërgo njoftimet në Email", + "expires": "Skadon", + "language": "Gjuha", + "enable_downvotes": "Lejo votat negative", + "number_of_upvotes": "{{count}} Votë pozitive", + "number_of_upvotes_plural": "{{count}} Vota pozitive", + "number_of_downvotes": "{{count}} Votë negative", + "number_of_downvotes_plural": "{{count}} Vota negative", + "open_registration": "Hape regjistrimin", + "enable_nsfw": "Lejo përmbajtje NSFW", + "url": "URL", + "body": "Teksti", + "community": "Komuniteti", + "expand_here": "Zgjero këtu", + "subscribe_to_communities": "Abonohu në disa <1>communities.", + "verify_password": "Konfirmo Fjalëkalimin", + "optional": "E padetyrueshme", + "browser_default": "Parazgjedhur nga shfletuesi", + "downvotes_disabled": "Votat negative janë të çaktivizuara", + "upvote": "Votë pozitive", + "downvote": "Votë negative", + "registration_closed": "Regjistrimi u mbyll", + "chat": "Chat", + "recent_comments": "Komentet më të reja", + "no_results": "S'ka rezultate.", + "setup": "Konfigurimi", + "setup_admin": "Emëro një administrator të faqes", + "nsfw": "NSFW", + "theme": "Pamja", + "lemmy_instance_setup": "Konfigurimi i një instance të Lemmy-it", + "community_ban": "Jeni dëbuar nga ky komunitet.", + "site_ban": "Jeni dëbuar nga kjo faqe", + "community_already_exists": "Komuniteti ekziston më.", + "community_moderator_already_exists": "Moderatori i komunitetit tashmë ekziston.", + "community_follower_already_exists": "Ndjekësi i komunitetit tashmë ekziston.", + "community_user_already_banned": "Anëtari i komunitetit tashmë është dëbuar.", + "site_already_exists": "Faqja tashmë ekziston.", + "user_already_exists": "Përdoruesi tashmë ekziston.", + "email_already_exists": "Email-i tashmë ekziston.", + "admin_already_created": "Kërkojmë ndjesë, por tashmë është një administrator.", + "all": "Gjithçka", + "mark_all_as_read": "shëno të gjitha si të lexuara", + "overview": "Shiko në përgjithësi", + "notifications_error": "Njoftimet në desktop nuk janë të mundshme në shfletuesin tuaj. Provoni Firefox ose Chrome.", + "unread_messages": "Mesazhet e palexuara", + "reset_password_mail_sent": "Një Email është dërguar për të ndryshuar fjalëkalimin tuaj.", + "private_message_disclaimer": "Paralajmërim: Mesazhet private në Lemmy nuk janë të siguruara. Ju lutem krijoni një account në <1>Riot.im për të dërguar mesazhe të sigurta.", + "copy_suggested_title": "kopjo titullin e sugjeruar: {{title}}" } From cc438980d1175fa51567b26bafe438fe69124bf2 Mon Sep 17 00:00:00 2001 From: Cee Date: Sat, 4 Jul 2020 09:17:24 +0000 Subject: [PATCH 15/74] Translated using Weblate (Chinese (Simplified)) Currently translated at 98.7% (246 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/zh_Hans/ Translated using Weblate (Chinese (Simplified)) Currently translated at 98.7% (246 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/zh_Hans/ --- ui/translations/zh.json | 66 ++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/ui/translations/zh.json b/ui/translations/zh.json index def3b05cb..ddf402226 100644 --- a/ui/translations/zh.json +++ b/ui/translations/zh.json @@ -24,29 +24,29 @@ "unlock": "解锁", "lock": "加锁", "link": "链接", - "mod": "监管人", - "mods": "监管人", + "mod": "社群管理", + "mods": "社群管理", "moderates": "监管", - "remove_as_mod": "添加监管人", - "appoint_as_mod": "移除监管人", - "modlog": "监管记录", - "admin": "管理权限", - "admins": "管理权限", - "remove_as_admin": "移除管理权限", - "appoint_as_admin": "添加管理权限", + "remove_as_mod": "删除社群管理", + "appoint_as_mod": "任命为社群管理", + "modlog": "审核记录", + "admin": "总管理员", + "admins": "总管理员", + "remove_as_admin": "移除管理员权限", + "appoint_as_admin": "添加管理员权限", "remove": "移除", - "removed": "已被管理员移除", - "locked": "已加锁", + "removed": "已被社群管理移除", + "locked": "已锁定", "reason": "原因", - "mark_as_read": "标记未读", - "mark_as_unread": "标记已读", + "mark_as_read": "标记为已读", + "mark_as_unread": "标记为未读", "delete": "删除", "deleted": "作者已删除", "restore": "恢复", "ban": "禁止", "ban_from_site": "禁止此站点", - "unban": "取消", - "unban_from_site": "取消禁止", + "unban": "取消禁止", + "unban_from_site": "取消禁止网站", "save": "保存", "unsave": "取消保存", "create": "创建", @@ -54,7 +54,7 @@ "email_or_username": "邮箱或用户名", "number_of_users": "{{count}} 名用户", "number_of_subscribers": "{{count}} 名订阅者", - "number_of_points": "{{count}} 点数", + "number_of_points": "{{count}} 积分", "name": "名字", "title": "标题", "category": "分类", @@ -70,13 +70,13 @@ "sort_type": "排序方式", "hot": "最热", "new": "最新", - "top_day": "今日", + "top_day": "每日推荐", "week": "周", "month": "月", "year": "年", "all": "所有", - "top": "最热", - "api": "应用程式介面", + "top": "推荐", + "api": "API", "inbox": "收件箱", "inbox_for": "<1>{{user}} 收件箱", "mark_all_as_read": "标记所有已读", @@ -97,7 +97,7 @@ "email": "邮箱", "optional": "选项", "expires": "过期", - "url": "网址", + "url": "相关网址", "body": "内容", "copy_suggested_title": "复制建议的标题: {{title}}", "community": "社群", @@ -160,7 +160,7 @@ "show_nsfw": "显示工作场所不宜内容", "theme": "主题", "from": "由", - "donate_to_lemmy": "向Lemmy捐赠", + "donate_to_lemmy": "向 Lemmy 捐赠", "donate": "捐赠", "monero": "门罗币", "to": "发布到", @@ -185,21 +185,21 @@ "unsticky": "取消固定", "archive_link": "链接归档", "settings": "设定", - "stickied": "已固定", + "stickied": "已置顶", "delete_account": "删除账号", - "delete_account_confirm": "警告：此操作将永久删除你的数据。输入密码进行确认。", + "delete_account_confirm": "警告！此操作将永久删除你的数据，请输入密码进行确认。", "cross_posts": "此链接也已被发布到：", "cross_post": "复数发布", "cross_posted_to": "已被复数发布到： ", "users": "用户", "banned": "已被禁止", - "creator": "发布者", + "creator": "作者", "number_of_communities": "{{count}} 个社群", - "old": "最旧", + "old": "最早", "docs": "文档", "upload_avatar": "上传头像", "replies": "回复", - "number_online": "{{count}}名在线用户", + "number_online": "{{count}} 名在线用户", "mentions": "提到", "message_sent": "已发送信息", "old_password": "当前密码", @@ -214,12 +214,12 @@ "send_notifications_to_email": "向邮箱发送通知", "language": "语言", "browser_default": "浏览器默认语言", - "downvotes_disabled": "点踩功能已禁用", - "enable_downvotes": "启用点踩功能", + "downvotes_disabled": "反对投票已禁用", + "enable_downvotes": "启用反对投票功能", "upvote": "点赞", "number_of_upvotes": "{{count}} 个赞", - "downvote": "点踩", - "number_of_downvotes": "{{count}} 个踩", + "downvote": "反对", + "number_of_downvotes": "{{count}} 个反对", "open_registration": "开放注册", "registration_closed": "注册功能已关闭", "recent_comments": "最新评论", @@ -241,5 +241,9 @@ "banned_users": "被禁止用户", "site_saved": "网站已保存", "emoji_picker": "选择表情", - "invalid_username": "用户名无效" + "invalid_username": "用户名无效", + "invalid_community_name": "无效的名称", + "click_to_delete_picture": "点击删除图片", + "picture_deleted": "图片已删除", + "select_a_community": "选择一个社群" } From f8789689f87da44670c0417cba0e5a2110ea422d Mon Sep 17 00:00:00 2001 From: ButterflyOfFire Date: Sat, 4 Jul 2020 09:17:24 +0000 Subject: [PATCH 16/74] Translated using Weblate (Arabic) Currently translated at 75.1% (187 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/ar/ --- ui/translations/ar.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ui/translations/ar.json b/ui/translations/ar.json index f963439ef..99140cdf0 100644 --- a/ui/translations/ar.json +++ b/ui/translations/ar.json @@ -44,12 +44,12 @@ "remove_as_admin": "إزالة كمدير", "appoint_as_admin": "تعيين كمدير", "remove": "إزالة", - "removed": "تمت إزالته", + "removed": "أزاله المشرف", "reason": "السبب", "mark_as_read": "تعيين كمقروء", "mark_as_unread": "تعيين كغير مقروء بعد", "delete": "حذف", - "deleted": "تم حذفه", + "deleted": "حذفه صاحبه", "restore": "استعادة", "ban": "طرد", "ban_from_site": "طرده مِن الموقع", @@ -219,5 +219,6 @@ "banned_users": "المستخدمون المحظورون", "reset_password_mail_sent": "لقد أرسِلت إليك رسالة إلكترونية لتصفير كلمتك السرية.", "upvote": "صوّت إيجابيا", - "downvote": "صوّت سلبيا" + "downvote": "صوّت سلبيا", + "select_a_community": "اختر مجتمعًا" } From 9530dba2c2cf6d9639ab12f7337013ba2389988c Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sat, 4 Jul 2020 07:38:20 -0400 Subject: [PATCH 17/74] Update issue templates --- .github/ISSUE_TEMPLATE/BUG_REPORT.md | 4 ++-- .github/ISSUE_TEMPLATE/FEATURE_REQUEST.md | 4 ++-- .github/ISSUE_TEMPLATE/QUESTION.md | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md index e9cceb718..b57e0e125 100644 --- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md +++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md @@ -1,8 +1,8 @@ --- -name: "🐞 Bug Report" +name: "\U0001F41E Bug Report" about: Create a report to help us improve Lemmy title: '' -labels: 'type:bug' +labels: bug assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md index d26125603..957f4cdfc 100644 --- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md +++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md @@ -1,8 +1,8 @@ --- -name: "🚀 Feature request" +name: "\U0001F680 Feature request" about: Suggest an idea for improving Lemmy title: '' -labels: 'type:enhancement' +labels: enhancement assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/QUESTION.md b/.github/ISSUE_TEMPLATE/QUESTION.md index e81ee01de..b45f8f1e5 100644 --- a/.github/ISSUE_TEMPLATE/QUESTION.md +++ b/.github/ISSUE_TEMPLATE/QUESTION.md @@ -2,10 +2,9 @@ name: "? Question" about: General questions about Lemmy title: '' -labels: 'type:question' +labels: question assignees: '' --- What's the question you have about lemmy? - From bca62cbf0fa3aab4301a0a417e16e7dcbe9a7567 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sat, 4 Jul 2020 07:42:29 -0400 Subject: [PATCH 18/74] Version v0.7.10 --- ansible/VERSION | 2 +- docker/prod/docker-compose.yml | 2 +- server/src/version.rs | 2 +- ui/src/version.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/VERSION b/ansible/VERSION index a502cc623..72ddead90 100644 --- a/ansible/VERSION +++ b/ansible/VERSION @@ -1 +1 @@ -v0.7.9 +v0.7.10 diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index fe91084bf..e8d49c493 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.7.9 + image: dessalines/lemmy:v0.7.10 ports: - "127.0.0.1:8536:8536" restart: always diff --git a/server/src/version.rs b/server/src/version.rs index c5c41270e..a289956aa 100644 --- a/server/src/version.rs +++ b/server/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "v0.7.9"; +pub const VERSION: &str = "v0.7.10"; diff --git a/ui/src/version.ts b/ui/src/version.ts index 69dc42817..d247fe933 100644 --- a/ui/src/version.ts +++ b/ui/src/version.ts @@ -1 +1 @@ -export const version: string = 'v0.7.9'; +export const version: string = 'v0.7.10'; From c51c5b3c445fb2457b37c60c0736be3fdecbc15b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20T=C3=B6tterman?= Date: Sat, 4 Jul 2020 14:46:08 +0300 Subject: [PATCH 19/74] Fix version_compare to version for ansible 2.9 (#902) --- ansible/lemmy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/lemmy.yml b/ansible/lemmy.yml index a73f72933..3520c4042 100644 --- a/ansible/lemmy.yml +++ b/ansible/lemmy.yml @@ -33,13 +33,13 @@ apt: pkg: - 'python-certbot-nginx' - when: ansible_distribution == 'Ubuntu' and ansible_distribution_version|version_compare('20.04', '<') + when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('20.04', '<') - name: install certbot-nginx on ubuntu > 20 apt: pkg: - 'python3-certbot-nginx' - when: ansible_distribution == 'Ubuntu' and ansible_distribution_version|version_compare('20.04', '>=') + when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('20.04', '>=') - name: request initial letsencrypt certificate command: certbot certonly --nginx --agree-tos -d '{{ domain }}' -m '{{ letsencrypt_contact_email }}' From de63ff6d2a233a0d8637b7fbffc11968d8c66703 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sat, 4 Jul 2020 11:35:38 -0400 Subject: [PATCH 20/74] Some navbar fixes. --- ui/src/components/navbar.tsx | 90 +++++++++++++++++++----------------- 1 file changed, 47 insertions(+), 43 deletions(-) diff --git a/ui/src/components/navbar.tsx b/ui/src/components/navbar.tsx index 53b085e5b..489f1b935 100644 --- a/ui/src/components/navbar.tsx +++ b/ui/src/components/navbar.tsx @@ -12,7 +12,6 @@ import { GetPrivateMessagesForm, PrivateMessagesResponse, SortType, - SearchType, GetSiteResponse, Comment, CommentResponse, @@ -20,7 +19,6 @@ import { UserView, PrivateMessageResponse, WebSocketJsonResponse, - SearchForm, } from '../interfaces'; import { wsJsonToRes, @@ -183,7 +181,7 @@ export class Navbar extends Component {
          -
            +
            • { {!this.context.router.history.location.pathname.match( /^\/search/ ) && ( -
              -
              + + -
              -
              + + + + + )}
                {this.canAdmin && ( @@ -272,8 +268,10 @@ export class Navbar extends Component { )} - {this.state.isLoggedIn ? ( - <> +
              + {this.state.isLoggedIn ? ( + <> +
              • @@ -286,6 +284,8 @@ export class Navbar extends Component { )}
                • +
              +
              • {
                • - - ) : ( - - {i18n.t('login_sign_up')} - - )} -
              +
            + + ) : ( +
              +
            • + + {i18n.t('login_sign_up')} + +
              • +
            + )}
          ); From 6780855b1ffa15fba01ef703f6bcb514ff49c616 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sat, 4 Jul 2020 11:37:04 -0400 Subject: [PATCH 21/74] Version v0.7.11 --- ansible/VERSION | 2 +- docker/prod/docker-compose.yml | 2 +- server/src/version.rs | 2 +- ui/src/version.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/VERSION b/ansible/VERSION index 72ddead90..076cd4b2b 100644 --- a/ansible/VERSION +++ b/ansible/VERSION @@ -1 +1 @@ -v0.7.10 +v0.7.11 diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index e8d49c493..698d2ba6b 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.7.10 + image: dessalines/lemmy:v0.7.11 ports: - "127.0.0.1:8536:8536" restart: always diff --git a/server/src/version.rs b/server/src/version.rs index a289956aa..ca1a5dc73 100644 --- a/server/src/version.rs +++ b/server/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "v0.7.10"; +pub const VERSION: &str = "v0.7.11"; diff --git a/ui/src/version.ts b/ui/src/version.ts index d247fe933..942ebfbed 100644 --- a/ui/src/version.ts +++ b/ui/src/version.ts @@ -1 +1 @@ -export const version: string = 'v0.7.10'; +export const version: string = 'v0.7.11'; From 3e6508f484f0d1e97519e424d86fc389af18945c Mon Sep 17 00:00:00 2001 From: Mischa Spiegelmock Date: Sun, 5 Jul 2020 16:07:43 +0300 Subject: [PATCH 22/74] Fix capitalization of Ukrainian language (#910) --- ui/src/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/utils.ts b/ui/src/utils.ts index 48d2095df..747be7cdf 100644 --- a/ui/src/utils.ts +++ b/ui/src/utils.ts @@ -86,7 +86,7 @@ export const languages = [ { code: 'sv', name: 'Svenska' }, { code: 'sq', name: 'Shqip' }, { code: 'tr', name: 'Türkçe' }, - { code: 'uk', name: 'українська мова' }, + { code: 'uk', name: 'Українська Mова' }, { code: 'ru', name: 'Русский' }, { code: 'nl', name: 'Nederlands' }, { code: 'it', name: 'Italiano' }, From ce8e22ae3b7899a2d07e59bfd4895e1cd1b13124 Mon Sep 17 00:00:00 2001 From: Riley Date: Sun, 5 Jul 2020 15:01:21 -0500 Subject: [PATCH 23/74] Improve import script UI, errors (#887) * Improve import script UI, errors * Fix jq check * Add space between ! and which --- docker/prod/migrate-pictshare-to-pictrs.bash | 46 +++++++++++++++++--- 1 file changed, 39 insertions(+), 7 deletions(-) diff --git a/docker/prod/migrate-pictshare-to-pictrs.bash b/docker/prod/migrate-pictshare-to-pictrs.bash index 8229eb28c..667183a03 100644 --- a/docker/prod/migrate-pictshare-to-pictrs.bash +++ b/docker/prod/migrate-pictshare-to-pictrs.bash @@ -1,16 +1,21 @@ #!/bin/bash set -e -if [[ $(id -u) != 0 ]]; then +if [[ $(id -u) != 0 ]]; then echo "This migration needs to be run as root" exit fi -if [[ ! -f docker-compose.yml ]]; then +if [[ ! -f docker-compose.yml ]]; then echo "No docker-compose.yml found in current directory. Is this the right folder?" exit fi +if ! which jq > /dev/null; then + echo "jq must be installed to run this migration. On ubuntu systems, try 'sudo apt-get install jq'" + exit +fi + # Fixing pictrs permissions mkdir -p volumes/pictrs sudo chown -R 991:991 volumes/pictrs @@ -26,6 +31,8 @@ fi # echo "Stopping Lemmy so that users dont upload new images during the migration" # docker-compose stop lemmy +CRASHED_ON=() + pushd volumes/pictshare/ echo "Importing pictshare images to pict-rs..." IMAGE_NAMES=* @@ -34,11 +41,36 @@ for image in $IMAGE_NAMES; do if [[ ! -f $IMAGE_PATH ]]; then continue fi - echo -e "\nImporting $IMAGE_PATH" - ret=0 - curl --silent --fail -F "images[]=@$IMAGE_PATH" http://127.0.0.1:8537/import || ret=$? - if [[ $ret != 0 ]]; then - echo "Error for $IMAGE_PATH : $ret" + res=$(curl -s -F "images[]=@$IMAGE_PATH" http://127.0.0.1:8537/import | jq .msg) + if [ "${res}" == "" ]; then + echo -n "C" >&2 + echo "" + CRASHED_ON+=("${IMAGE_PATH}") + echo "Failed to import $IMAGE_PATH with no error message" + echo " assuming crash, sleeping" + sleep 10 + continue + fi + if [ "${res}" != "\"ok\"" ]; then + echo -n "F" >&2 + echo "" + echo "Failed to import $IMAGE_PATH" + echo " Reason: ${res}" + else + echo -n "." >&2 + fi +done + +for image in ${CRASHED_ON[@]}; do + echo "Retrying ${image}" + res=$(curl -s -F "images[]=@$IMAGE_PATH" http://127.0.0.1:8537/import | jq .msg) + if [ "${res}" != "\"ok\"" ]; then + echo -n "F" >&2 + echo "" + echo "Failed to upload ${image} on 2nd attempt" + echo " Reason: ${res}" + else + echo -n "." >&2 fi done From bf69d595b40def7ecc622adf2425e185105bab78 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sun, 5 Jul 2020 16:01:41 -0400 Subject: [PATCH 24/74] Adding to sponsors list. --- ui/src/components/sponsors.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/src/components/sponsors.tsx b/ui/src/components/sponsors.tsx index 31a4ee5ef..d0f163e58 100644 --- a/ui/src/components/sponsors.tsx +++ b/ui/src/components/sponsors.tsx @@ -10,6 +10,7 @@ interface SilverUser { } let general = [ + 'ybaumy', 'dude in phx', 'twilight loki', 'Andrew Plaza', From ba348e5af471338002a23e2e5546c1453ec449cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=ABr=C3=AB=20R=C3=ABr=C3=AB?= Date: Mon, 6 Jul 2020 11:27:56 +0000 Subject: [PATCH 25/74] Translated using Weblate (Albanian) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/sq/ --- ui/translations/sq.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/translations/sq.json b/ui/translations/sq.json index 8504a1b97..3a45389fc 100644 --- a/ui/translations/sq.json +++ b/ui/translations/sq.json @@ -1,11 +1,11 @@ { "remove_post": "Hiqe Postimin", "no_posts": "Nuk ka Postime.", - "create_a_post": "Krijo Postim", + "create_a_post": "Krijo një Postim", "create_post": "Krijo Postim", "posts": "Postime", "related_posts": "Këto postime mund të jenë të lidhura", - "cross_posts": "Ky link është postuar edhe te:", + "cross_posts": "Ky link është postuar gjithashtu në:", "cross_post": "shumë-postim", "cross_posted_to": "shumë-postuar në: ", "comments": "Komentet", From 9ce4c26c75d752697d500da9b1579a1478ea31e1 Mon Sep 17 00:00:00 2001 From: Adolfo Jayme Barrientos Date: Mon, 6 Jul 2020 11:27:56 +0000 Subject: [PATCH 26/74] Translated using Weblate (Catalan) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/ca/ Translated using Weblate (Spanish) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/es/ Translated using Weblate (Catalan) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/ca/ --- ui/translations/ca.json | 347 +++++++++++++++++++++------------------- ui/translations/es.json | 2 +- 2 files changed, 186 insertions(+), 163 deletions(-) diff --git a/ui/translations/ca.json b/ui/translations/ca.json index e238ffa72..79da8b35b 100644 --- a/ui/translations/ca.json +++ b/ui/translations/ca.json @@ -1,99 +1,105 @@ { - "post": "Publicar", - "remove_post": "Eliminar publicació", - "no_posts": "Sense publicacions.", - "create_a_post": "Crear una publicació", - "create_post": "Crear Publicació", - "number_of_posts": "{{count}} Publicacions", - "posts": "Publicacions", - "related_posts": "Aquestes publicacions podrien estar relacionades", - "cross_posts": "Aquest link també ha sigut publicat en:", - "cross_post": "cross-post", + "post": "apunt", + "remove_post": "Suprimeix l’apunt", + "no_posts": "No hi ha cap apunt.", + "create_a_post": "Crea un apunt", + "create_post": "Crea un apunt", + "number_of_posts": "{{count}} apunt", + "number_of_posts_plural": "{{count}} apunts", + "posts": "Apunts", + "related_posts": "Aquests apunts podrien estar relacionats", + "cross_posts": "Aquest enllaç també s’ha publicat en:", + "cross_post": "apunt transversal", "comments": "Comentaris", - "number_of_comments": "{{count}} Comentaris", - "remove_comment": "Eliminar Comentaris", + "number_of_comments": "{{count}} comentari", + "number_of_comments_plural": "{{count}} comentaris", + "remove_comment": "Suprimeix el comentari", "communities": "Comunitats", "users": "Usuaris", - "create_a_community": "Crear una comunitat", - "create_community": "Crear Comunitat", - "remove_community": "Eliminar Comunitat", + "create_a_community": "Crea una comunitat", + "create_community": "Crea una comunitat", + "remove_community": "Suprimeix la comunitat", "subscribed_to_communities": "Subscrit a <1>comunitats", "trending_communities": "<1>Comunitats en tendència", "list_of_communities": "Llista de comunitats", - "number_of_communities": "{{count}} Comunitats", + "number_of_communities": "{{count}} comunitat", + "number_of_communities_plural": "{{count}} comunitats", "community_reqs": "minúscules, guió baix, i sense espais.", - "create_private_message": "Crear Missatge Privat", - "send_secure_message": "Enviar Missatge Segur", - "send_message": "Enviar Missatge", + "create_private_message": "Crea un missatge privat", + "send_secure_message": "Envia un missatge segur", + "send_message": "Envia el missatge", "message": "Missatge", - "edit": "editar", - "reply": "respondre", - "cancel": "Cancelar", - "preview": "Previsualitzar", - "upload_image": "pujar imatge", + "edit": "edita", + "reply": "respon", + "cancel": "Cancel·la", + "preview": "Previsualitza", + "upload_image": "puja una imatge", "avatar": "Avatar", - "upload_avatar": "Pujar Avatar", - "show_avatars": "Veure Avatares", - "formatting_help": "Ajuda de format", - "view_source": "veure font", - "unlock": "desbloquejar", - "lock": "bloquejar", + "upload_avatar": "Puja un avatar", + "show_avatars": "Mostra els avatars", + "formatting_help": "ajuda amb la formatació", + "view_source": "mostra’n el codi font", + "unlock": "desbloca", + "lock": "bloca", "sticky": "fijat", "unsticky": "no fijat", - "link": "link", - "archive_link": "arxivar link", + "link": "enllaç", + "archive_link": "enllaç de l’arxiu", "mod": "moderador", "mods": "moderadores", "moderates": "Modera", "settings": "Configuració", - "remove_as_mod": "eliminar com moderador", - "appoint_as_mod": "designar com moderador", + "remove_as_mod": "suprimeix com a moderador", + "appoint_as_mod": "designa com a moderador", "modlog": "Historial de moderació", "admin": "administrador", "admins": "administradors", - "remove_as_admin": "eliminar com administrador", - "appoint_as_admin": "designar com administrador", - "remove": "eliminar", - "removed": "eliminat", - "locked": "bloquejat", + "remove_as_admin": "suprimeix com a administrador", + "appoint_as_admin": "designa com a administrador", + "remove": "suprimeix", + "removed": "suprimit pel moderador", + "locked": "blocat", "stickied": "fijat", "reason": "Raó", - "mark_as_read": "marcar com llegit", - "mark_as_unread": "marcar com no llegit", - "delete": "eliminar", - "deleted": "eliminat", - "delete_account": "Eliminar Compte", - "delete_account_confirm": - "Avís: aquesta acció eliminarà permanentment la teva informació. Introdueix la teva contrasenya per a continuar", - "restore": "restaurar", - "ban": "expulsar", - "ban_from_site": "expulsar del lloc", - "unban": "admetre", - "unban_from_site": "admetre al lloc", + "mark_as_read": "marca com a llegit", + "mark_as_unread": "marca com a no llegit", + "delete": "suprimeix", + "deleted": "suprimit pel creador", + "delete_account": "Suprimeix el compte", + "delete_account_confirm": "Atenció: aquesta acció suprimirà permanentment la vostra informació. Introduïu la vostra contrasenya per a confirmar.", + "restore": "restaura", + "ban": "expulsa", + "ban_from_site": "expulsa del lloc", + "unban": "readmet", + "unban_from_site": "readmet al lloc", "banned": "expulsat", - "save": "guardar", - "unsave": "descartar", - "create": "crear", + "save": "desa", + "unsave": "descarta", + "create": "crea", "creator": "creador", - "username": "Nom d'Usuari", - "email_or_username": "Correu o Usuari", - "number_of_users": "{{count}} Usuaris", - "number_of_subscribers": "{{count}} Subscriptors", - "number_of_points": "{{count}} Punts", - "number_online": "{{count}} Usauris En Línia", + "username": "Nom d’usuari", + "email_or_username": "Adreça electrònica o usuari", + "number_of_users": "{{count}} usuari", + "number_of_users_plural": "{{count}} usuaris", + "number_of_subscribers": "{{count}} subscriptor", + "number_of_subscribers_plural": "{{count}} subscriptors", + "number_of_points": "{{count}} punt", + "number_of_points_plural": "{{count}} punts", + "number_online": "{{count}} usuari en línia", + "number_online_plural": "{{count}} usuaris en línia", "name": "Nom", - "title": "Titol", + "title": "Títol", "category": "Categoria", - "subscribers": "Suscriptors", - "both": "Ambdos", - "saved": "Guardat", - "unsubscribe": "Desubscriure's", - "subscribe": "Subscriure's", + "subscribers": "Subscriptors", + "both": "Tots dos", + "saved": "Desat", + "unsubscribe": "Dóna’t de baixa", + "subscribe": "Subscriu-t’hi", "subscribed": "Subscrit", "prev": "Anterior", "next": "Següent", - "sidebar": "Descripció de la comunitat", - "sort_type": "Tipus d'orden", + "sidebar": "Barra lateral", + "sort_type": "Tipus d’ordenació", "hot": "Popular", "new": "Nou", "top_day": "El millor del dia", @@ -103,75 +109,71 @@ "all": "Tot", "top": "Millor", "api": "API", - "docs": "Docs", - "inbox": "Bústia d'entrada", - "inbox_for": "Bústia d'entrada per a <1>{{user}}", - "mark_all_as_read": "marcar tot com llegit", + "docs": "Documentació", + "inbox": "Bústia d’entrada", + "inbox_for": "Bústia d’entrada per a <1>{{user}}", + "mark_all_as_read": "marca-ho tot com a llegit", "type": "Tipus", "unread": "No llegit", "replies": "Respostes", - "mentions": "Menciones", - "reply_sent": "Resposta enviada", - "message_sent": "Missatge enviado", - "search": "Buscar", - "overview": "Resum", + "mentions": "Mencions", + "reply_sent": "La resposta ha estat enviada", + "message_sent": "El missatge ha estat enviat", + "search": "Cerca", + "overview": "Visió de conjunt", "view": "Vista", - "logout": "Tancar sessió", - "login_sign_up": "Iniciar sessió / Crear compte", - "login": "Iniciar sessió", - "sign_up": "Crear compte", - "notifications_error": - "Notificacions d'escriptori no disponibles al teu navegador. Prova amb Firefox o Chrome.", + "logout": "Finalitza la sessió", + "login_sign_up": "Inicia una sessió / crea un compte", + "login": "Inicia una sessió", + "sign_up": "Crea un compte", + "notifications_error": "Les notificacions d’escriptori no estan disponibles al vostre navegador. Proveu amb el Firefox o el Chrome.", "unread_messages": "Missatges no llegits", "messages": "Missatges", "password": "Contrasenya", - "verify_password": "Verificar Contrasenya", - "old_password": "Antiga Contrasenya", - "forgot_password": "oblidí la meva contrasenya", - "reset_password_mail_sent": "Enviar correu per a restablir la contrasenya.", - "password_change": "Canvi de Contrasenya", - "new_password": "Nueva Contrasenya", - "no_email_setup": "Aquest servidor no ha activat correctament el correu.", + "verify_password": "Verifica la contrasenya", + "old_password": "Contrasenya antiga", + "forgot_password": "vaig oblidar la meva contrasenya", + "reset_password_mail_sent": "Hem enviat un missatge per correu per a restablir la contrasenya.", + "password_change": "Canvi de contrasenya", + "new_password": "Contrasenya nova", + "no_email_setup": "Aquest servidor no ha configurat correctament el correu.", "email": "Correu electrònic", - "matrix_user_id": "Usuari Matricial", - "private_message_disclaimer": - "Avís: Els missatges privats en Lemmy no són segurs. Sisplau creu un compte en <1>Riot.im per a mensajeria segura.", - "send_notifications_to_email": "Enviar notificacions al correu", + "matrix_user_id": "Usuari del Matrix", + "private_message_disclaimer": "Atenció: els missatges privats al Lemmy no són segurs. Creeu-vos un compte a <1>Riot.im per a una missatgeria segura.", + "send_notifications_to_email": "Envia notificacions al correu", "optional": "Opcional", "expires": "Expira", - "language": "Llenguatge", + "language": "Llengua", "browser_default": "Per defecte del navegador", - "downvotes_disabled": "Vots negatius deshabilitats", - "enable_downvotes": "Habilitar vots negatius", - "open_registration": "Obrir registre", - "registration_closed": "Registre tancat", - "enable_nsfw": "Habilitar NSFW", + "downvotes_disabled": "Vots negatius inhabilitats", + "enable_downvotes": "Habilita els vots negatius", + "open_registration": "Obre els registres", + "registration_closed": "S’han tancat els registres", + "enable_nsfw": "Habilita el contingut per a adults", "url": "URL", - "body": "Descripció", - "copy_suggested_title": "Copiar el títol sugerido: {{title}}", + "body": "Corps", + "copy_suggested_title": "copia el títol suggerit: {{title}}", "community": "Comunitat", - "expand_here": "Expandir ací", - "subscribe_to_communities": "Subscriure's a algunes <1>comunitats.", - "chat": "Chat", + "expand_here": "Expandeix ací", + "subscribe_to_communities": "Subscriviu-vos a algunes <1>comunitats.", + "chat": "Xat", "recent_comments": "Comentaris recients", "no_results": "Sense resultats.", "setup": "Configurar", - "lemmy_instance_setup": "Configuració d'instancia de Lemmy", - "setup_admin": "Configurar administrador del Lloc", - "your_site": "el teu lloc", + "lemmy_instance_setup": "Configuració d’instància del Lemmy", + "setup_admin": "Configura administrador del lloc", + "your_site": "el vostre lloc", "modified": "modificat", - "nsfw": "NSFW", - "show_nsfw": "Mostrar contingut NSFW", + "nsfw": "Per a adults", + "show_nsfw": "Mostra el contingut per a adults", "theme": "Tema", "sponsors": "Patrocinadors", - "sponsors_of_lemmy": "Patrocinadors de Lemmy", - "sponsor_message": - "Lemmy és programari lliure i de <1>codi obert, la qual cosa significa que no tindrà publicitats, monetització, ni capitals emprenedors, mai. Les teves donacions secunden directament el desenvolupament a temps complet del projecte. Moltes gràcies a les següents persones:", - "support_on_patreon": "Suport a Patreon", + "sponsors_of_lemmy": "Patrocinadors del Lemmy", + "sponsor_message": "El Lemmy és programari lliure i de <1>codi obert, la qual cosa significa que no tindrà publicitats, monetització, ni capitals emprenedors, mai. Les vostres donacions donen suport directament al desenvolupament a temps complet del projecte. Moltes gràcies a les següents persones:", + "support_on_patreon": "Suport al Patreon", "donate_to_lemmy": "Donar a Lemmy", - "donate": "Donar", - "general_sponsors": - "Los Patrocinadores Generales son aquellos que señaron entre $10 y $39 a Lemmy.", + "donate": "Dona", + "general_sponsors": "Els patrocinadors generals són aquells que es van comprometre a donar entre 10 y 39 $ al Lemmy.", "crypto": "Crypto", "bitcoin": "Bitcoin", "ethereum": "Ethereum", @@ -181,57 +183,78 @@ "by": "per", "to": "a", "from": "des de", - "transfer_community": "transferir comunitat", - "transfer_site": "transferir lloc", - "are_you_sure": "Ets segur?", + "transfer_community": "transfereix la comunitat", + "transfer_site": "transfereix el lloc", + "are_you_sure": "n’esteu segur?", "yes": "sí", "no": "no", - "powered_by": "Impulsat per", - "landing_0": - "Lemmy és un <1>agregador de links / alternativa a reddit, amb la intenció de funcionar al <2>fedivers.<3>És allotjable per un mateix (sense necessitat de grans companyies), té actualització en directe de cadenes de comentaris, i és petit (<4>~80kB). Federar amb el sistema de xarxes ActivityPub forma part dels objectius del projecte. <5>Aquesta és una <6>versió beta molt prematura, i actualment moltes de les característiques són trencades o falten. <7>Suggereix noves característiques o reporta errors <8>aquí.<9>Fet amb <10>Rust, <11>Actix, <12>Inferno, <13>Typescript.", - "not_logged_in": "No has iniciat sessió.", - "logged_in": "Has iniciat sessió.", - "community_ban": "Has sigut expulsat d'aquesta comunitat.", - "site_ban": "Has sigut expulsat d'aquest lloc.", - "couldnt_create_comment": "No s'ha pogut crear el comentari.", - "couldnt_like_comment": "No s'ha pogut donar m'agrada al comentari.", - "couldnt_update_comment": "No s'ha pogut actualitzar el comentari.", - "couldnt_save_comment": "No s'ha pogut guardar el comentari.", - "no_comment_edit_allowed": "No tens permisos per a editar el comentari.", - "no_post_edit_allowed": "No tens permisos per a editar la publicació.", - "no_community_edit_allowed": "No tens permisos per a editar la comunitat.", - "couldnt_find_community": "No s'ha pogut trobar la comunitat.", - "couldnt_update_community": "No s'ha pogut actualitzar la comunitat.", + "powered_by": "Funciona amb", + "landing_0": "Lemmy és un <1>agregador de links / alternativa a reddit, amb la intenció de funcionar al <2>fedivers.<3>És allotjable per un mateix (sense necessitat de grans companyies), té actualització en directe de cadenes de comentaris, i és petit (<4>~80kB). Federar amb el sistema de xarxes ActivityPub forma part dels objectius del projecte. <5>Aquesta és una <6>versió beta molt prematura, i actualment moltes de les característiques són trencades o falten. <7>Suggereix noves característiques o reporta errors <8>aquí.<9>Fet amb <10>Rust, <11>Actix, <12>Inferno, <13>Typescript.", + "not_logged_in": "No heu iniciat una sessió.", + "logged_in": "Heu iniciat una sessió.", + "community_ban": "Us han expulsat d’aquesta comunitat.", + "site_ban": "Us han expulsat del lloc", + "couldnt_create_comment": "No s’ha pogut crear el comentari.", + "couldnt_like_comment": "No s’ha pogut donar «m’agrada» al comentari.", + "couldnt_update_comment": "No s’ha pogut actualitzar el comentari.", + "couldnt_save_comment": "No s’ha pogut desar el comentari.", + "no_comment_edit_allowed": "No teniu permisos per a editar el comentari.", + "no_post_edit_allowed": "No teniu permisos per a editar l’apunt.", + "no_community_edit_allowed": "No teniu permisos per a editar la comunitat.", + "couldnt_find_community": "No s’ha pogut trobar la comunitat.", + "couldnt_update_community": "No s’ha pogut actualitzar la comunitat.", "community_already_exists": "Aquesta comunitat ja existeix.", - "community_moderator_already_exists": - "Aquest moderador de la comunitat ja existeix.", - "community_follower_already_exists": - "Aquest seguidor de la comunitat ja existeix.", - "community_user_already_banned": - "Aquest usuari de la comunitat ja fou expulsat.", - "couldnt_create_post": "No s'ha pogut crear la publicació.", - "couldnt_like_post": "No s'ha pogut donar m'agrada a la publicació.", - "couldnt_find_post": "No s'ha pogut trobar la publicació.", - "couldnt_get_posts": "No s'han pogut obtindre les publicacions.", - "couldnt_update_post": "No s'ha pogut actualitzar la publicació.", - "couldnt_save_post": "No s'ha pogut guardar la publicació.", + "community_moderator_already_exists": "Aquest moderador de la comunitat ja existeix.", + "community_follower_already_exists": "Aquest seguidor de la comunitat ja existeix.", + "community_user_already_banned": "Aquest usuari de la comunitat ja fou expulsat.", + "couldnt_create_post": "No s’ha pogut crear l’apunt.", + "couldnt_like_post": "No s’ha pogut donar «m’agrada» a l’apunt.", + "couldnt_find_post": "No s’ha pogut trobar l’apunt.", + "couldnt_get_posts": "No s’han pogut recuperar els apunts", + "couldnt_update_post": "No s’ha pogut actualitzar l’apunt", + "couldnt_save_post": "No s’ha pogut desar l’apunt.", "no_slurs": "Prohibit insultar.", "not_an_admin": "No és un administrador.", "site_already_exists": "El lloc ja existeix.", - "couldnt_update_site": "No s'ha pogut actualitzar el lloc.", - "couldnt_find_that_username_or_email": - "No s'ha pogut trobar aquest nom de usuari o correu electrònic.", + "couldnt_update_site": "No s’ha pogut actualitzar el lloc.", + "couldnt_find_that_username_or_email": "No s’ha pogut trobar aquest nom de usuari o adreça electrònica.", "password_incorrect": "Contrasenya incorrecta.", "passwords_dont_match": "Les contrasenyes no coincideixen.", - "admin_already_created": "Ho sentim, ja hi ha un adminisitrador.", - "user_already_exists": "L'usuari ja existeix.", - "email_already_exists": "El correu ja és en ús.", - "couldnt_update_user": "No s'ha pogut actualitzar l'usuari.", - "system_err_login": - "Error del sistema. Intenti tancar sessió i ingressar de nou.", - "couldnt_create_private_message": "No s'ha pogut crear el missatge privat.", - "no_private_message_edit_allowed": - "Sense permisos per a editar el missatge privat.", - "couldnt_update_private_message": - "No s'ha pogut actualitzar el missatge privat." + "admin_already_created": "Disculpeu; ja hi ha un adminisitrador.", + "user_already_exists": "L’usuari ja existeix.", + "email_already_exists": "L’adreça ja és en ús.", + "couldnt_update_user": "No s’ha pogut actualitzar l’usuari.", + "system_err_login": "Error del sistema. Intenti tancar sessió i ingressar de nou.", + "couldnt_create_private_message": "No s’ha pogut crear el missatge privat.", + "no_private_message_edit_allowed": "No teniu permisos per a editar el missatge privat.", + "couldnt_update_private_message": "No s’ha pogut actualitzar el missatge privat.", + "cross_posted_to": "publicat també a: ", + "invalid_username": "El nom d’usuari no és vàlid.", + "click_to_delete_picture": "Feu clic per a suprimir la imatge.", + "picture_deleted": "S’ha suprimit la imatge.", + "invalid_community_name": "El nom no és vàlid.", + "sorting_help": "ajuda amb l’ordenament", + "old": "Antic", + "more": "més", + "show_context": "Mostra el context", + "upvote": "Dona un vot positiu", + "number_of_upvotes": "{{count}} vot positiu", + "number_of_upvotes_plural": "{{count}} vots positius", + "downvote": "Dona un vot negatiu", + "number_of_downvotes": "{{count}} vot negatiu", + "number_of_downvotes_plural": "{{count}} vots negatius", + "admin_settings": "Configuració administrativa", + "site_config": "Configuració del lloc", + "banned_users": "Usuaris expulsats", + "support_on_liberapay": "Suport al Liberapay", + "support_on_open_collective": "Suport a l’OpenCollective", + "silver_sponsors": "Els patrocinadors «silver» són els que van comprometre’s a donar 40 $ al Lemmy.", + "site_saved": "S’ha desat el lloc.", + "couldnt_get_comments": "No s’han pogut recuperar els comentaris.", + "post_title_too_long": "El títol de l’apunt és massa llarg.", + "time": "Hora", + "action": "Acció", + "emoji_picker": "Selector d’emojis", + "block_leaving": "Segur que voleu sortir?", + "select_a_community": "Seleccioneu una comunitat" } diff --git a/ui/translations/es.json b/ui/translations/es.json index 50beb8c0a..25260db01 100644 --- a/ui/translations/es.json +++ b/ui/translations/es.json @@ -250,7 +250,7 @@ "banned_users": "Usuarios Baneados", "support_on_open_collective": "Dona en OpenCollective", "site_saved": "Sitio Guardado.", - "emoji_picker": "Lista de emojis", + "emoji_picker": "Selector de emoyis", "admin_settings": "Panel de Administración", "select_a_community": "Selecciona una comunidad", "invalid_username": "Nombre de usuario inválido.", From 94b4c0b2de8ee05e150e2d12095587a4f687ab41 Mon Sep 17 00:00:00 2001 From: Ady Nemo Date: Mon, 6 Jul 2020 11:27:56 +0000 Subject: [PATCH 27/74] Translated using Weblate (French) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/fr/ --- ui/translations/fr.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/translations/fr.json b/ui/translations/fr.json index 579def520..769863c1f 100644 --- a/ui/translations/fr.json +++ b/ui/translations/fr.json @@ -156,7 +156,7 @@ "body": "Texte", "copy_suggested_title": "copier le titre suggéré : {{title}}", "community": "Communauté", - "expand_here": "Développer ici", + "expand_here": "Ouvrir ici", "subscribe_to_communities": "S’abonner à quelques <1>communautés.", "chat": "Chat", "recent_comments": "Commentaires récents", @@ -244,7 +244,7 @@ "sorting_help": "aide au tri", "upvote": "Voter pour", "show_context": "Afficher le contexte", - "block_leaving": "Etes-vous sûr de vouloir partir ?", + "block_leaving": "Êtes-vous sûr de vouloir partir ?", "number_of_upvotes": "{{count}} Votes pour", "number_of_upvotes_plural": "{{count}} Votes contre", "number_of_downvotes": "{{count}} Vote contre", From 3050183ea93154dcb8a1b9b57ea748ac5929f412 Mon Sep 17 00:00:00 2001 From: Sergio Varela Date: Mon, 6 Jul 2020 11:27:56 +0000 Subject: [PATCH 28/74] Translated using Weblate (Spanish) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/es/ --- ui/translations/es.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/translations/es.json b/ui/translations/es.json index 25260db01..d0aef9d47 100644 --- a/ui/translations/es.json +++ b/ui/translations/es.json @@ -109,7 +109,7 @@ "all": "Todo", "top": "Mejor", "api": "API", - "docs": "Docs", + "docs": "Documentación", "inbox": "Buzón de entrada", "inbox_for": "Buzón de entrada para <1>{{user}}", "mark_all_as_read": "marcar todo como leído", @@ -256,5 +256,5 @@ "invalid_username": "Nombre de usuario inválido.", "invalid_community_name": "Nombre inválido.", "click_to_delete_picture": "Haz click para eliminar la imagen.", - "picture_deleted": "Foto eliminada." + "picture_deleted": "Imagen eliminada." } From 6a5e82ba3b74649b2d59d4625394c45d523f5e76 Mon Sep 17 00:00:00 2001 From: Adolfo Jayme Barrientos Date: Mon, 6 Jul 2020 11:27:56 +0000 Subject: [PATCH 29/74] Translated using Weblate (Spanish) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/es/ --- ui/translations/es.json | 68 ++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/ui/translations/es.json b/ui/translations/es.json index d0aef9d47..383fcce4d 100644 --- a/ui/translations/es.json +++ b/ui/translations/es.json @@ -25,26 +25,26 @@ "number_of_communities": "{{count}} Comunidad", "number_of_communities_plural": "{{count}} Comunidades", "community_reqs": "minúsculas, guión bajo, y sin espacios.", - "create_private_message": "Crear Mensaje Privado", - "send_secure_message": "Enviar Mensaje Seguro", - "send_message": "Enviar Mensaje", + "create_private_message": "Crear mensaje privado", + "send_secure_message": "Enviar mensaje seguro", + "send_message": "Enviar mensaje", "message": "Mensaje", "edit": "editar", "reply": "responder", "cancel": "Cancelar", "preview": "Previsualizar", - "upload_image": "subir imagen", + "upload_image": "cargar imagen", "avatar": "Avatar", - "upload_avatar": "Subir Avatar", - "show_avatars": "Ver Avatares", - "formatting_help": "Ayuda de formato", + "upload_avatar": "Cargar avatar", + "show_avatars": "Mostrar avatares", + "formatting_help": "ayuda de formato", "view_source": "ver fuente", "unlock": "desbloquear", "lock": "bloquear", "sticky": "fijado", "unsticky": "no fijado", - "link": "link", - "archive_link": "archivar link", + "link": "enlace", + "archive_link": "enlace de archivo", "mod": "moderador", "mods": "moderadores", "moderates": "Modera", @@ -65,8 +65,8 @@ "mark_as_unread": "marcar como no leído", "delete": "eliminar", "deleted": "eliminado por creador", - "delete_account": "Eliminar Cuenta", - "delete_account_confirm": "Advertencia: esta acción eliminará permanentemente toda tu información. Introduce tu contraseña para confirmar.", + "delete_account": "Eliminar cuenta", + "delete_account_confirm": "Advertencia: esta acción eliminará permanentemente toda su información. Introduzca su contraseña para confirmar.", "restore": "restaurar", "ban": "expulsar", "ban_from_site": "expulsar del sitio", @@ -77,16 +77,16 @@ "unsave": "descartar", "create": "crear", "creator": "creador", - "username": "Nombre de Usuario", - "email_or_username": "Correo o Usuario", - "number_of_users": "{{count}} Usuario", - "number_of_users_plural": "{{count}} Usuarios", - "number_of_subscribers": "{{count}} Suscriptor", - "number_of_subscribers_plural": "{{count}} Suscriptores", - "number_of_points": "{{count}} Punto", - "number_of_points_plural": "{{count}} Puntos", - "number_online": "{{count}} Usuario En Línea", - "number_online_plural": "{{count}} Usuarios En Línea", + "username": "Nombre de usuario", + "email_or_username": "Correo o usuario", + "number_of_users": "{{count}} usuario", + "number_of_users_plural": "{{count}} usuarios", + "number_of_subscribers": "{{count}} suscriptor", + "number_of_subscribers_plural": "{{count}} suscriptores", + "number_of_points": "{{count}} punto", + "number_of_points_plural": "{{count}} puntos", + "number_online": "{{count}} usuario en línea", + "number_online_plural": "{{count}} usuarios en línea", "name": "Nombre", "title": "Titulo", "category": "Categoría", @@ -98,7 +98,7 @@ "subscribed": "Suscrito", "prev": "Anterior", "next": "Siguiente", - "sidebar": "Descripción de la comunidad", + "sidebar": "Barra lateral", "sort_type": "Tipo de orden", "hot": "Popular", "new": "Nuevo", @@ -161,11 +161,11 @@ "no_results": "Sin resultados.", "setup": "Configurar", "lemmy_instance_setup": "Configuración de instancia de Lemmy", - "setup_admin": "Configurar administrador del Sitio", - "your_site": "tu sitio", + "setup_admin": "Configurar administrador del sitio", + "your_site": "su sitio", "modified": "modificado", - "nsfw": "NSFW", - "show_nsfw": "Mostrar contenido NSFW", + "nsfw": "Para adultos", + "show_nsfw": "Mostrar contenido para adultos", "theme": "Tema", "sponsors": "Patrocinadores", "sponsors_of_lemmy": "Patrocinadores de Lemmy", @@ -186,7 +186,7 @@ "from": "desde", "transfer_community": "transferir comunidad", "transfer_site": "transferir sitio", - "are_you_sure": "¿Estás seguro?", + "are_you_sure": "¿está seguro?", "yes": "sí", "no": "no", "powered_by": "Impulsado por", @@ -234,7 +234,7 @@ "action": "Acción", "more": "más", "cross_posted_to": "publicado también en: ", - "sorting_help": "ayuda del orden", + "sorting_help": "ayuda de ordenación", "upvote": "Voto Positivo", "number_of_upvotes": "{{count}} Voto Positivo", "number_of_upvotes_plural": "{{count}} Votos Positivos", @@ -246,15 +246,15 @@ "block_leaving": "¿Está seguro de que desea salir?", "show_context": "Mostrar contexto", "silver_sponsors": "Sponsors Plata son los que han dado $40 a Lemmy.", - "site_config": "Configuración del Sitio", - "banned_users": "Usuarios Baneados", - "support_on_open_collective": "Dona en OpenCollective", + "site_config": "Configuración del sitio", + "banned_users": "Usuarios expulsados", + "support_on_open_collective": "Apoyo en OpenCollective", "site_saved": "Sitio Guardado.", "emoji_picker": "Selector de emoyis", - "admin_settings": "Panel de Administración", + "admin_settings": "Configuración administrativa", "select_a_community": "Selecciona una comunidad", "invalid_username": "Nombre de usuario inválido.", - "invalid_community_name": "Nombre inválido.", - "click_to_delete_picture": "Haz click para eliminar la imagen.", + "invalid_community_name": "Nombre no válido.", + "click_to_delete_picture": "Pulse para eliminar la imagen.", "picture_deleted": "Imagen eliminada." } From cb73a7ae0e2ac76cba478c13a65f1d3a8494b939 Mon Sep 17 00:00:00 2001 From: 5HT Date: Mon, 6 Jul 2020 11:27:57 +0000 Subject: [PATCH 30/74] Translated using Weblate (Catalan) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/ca/ --- ui/translations/ca.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ui/translations/ca.json b/ui/translations/ca.json index 79da8b35b..3e8e185b4 100644 --- a/ui/translations/ca.json +++ b/ui/translations/ca.json @@ -1,15 +1,15 @@ { - "post": "apunt", - "remove_post": "Suprimeix l’apunt", - "no_posts": "No hi ha cap apunt.", - "create_a_post": "Crea un apunt", - "create_post": "Crea un apunt", - "number_of_posts": "{{count}} apunt", - "number_of_posts_plural": "{{count}} apunts", - "posts": "Apunts", - "related_posts": "Aquests apunts podrien estar relacionats", + "post": "Publicar", + "remove_post": "Suprimir publicació", + "no_posts": "No hi han publicacions.", + "create_a_post": "Crear una publicació", + "create_post": "Crear publicació", + "number_of_posts": "{{count}} Publicació", + "number_of_posts_plural": "{{count}} Publicacions", + "posts": "Publicacions", + "related_posts": "Aquestes publicacions podrien estar relacionades", "cross_posts": "Aquest enllaç també s’ha publicat en:", - "cross_post": "apunt transversal", + "cross_post": "cross-post", "comments": "Comentaris", "number_of_comments": "{{count}} comentari", "number_of_comments_plural": "{{count}} comentaris", From d03c435563be5a4ba564749785e90067aee41858 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Mon, 6 Jul 2020 14:20:29 +0200 Subject: [PATCH 31/74] Revert "Verify activitypub payload digests (#885)" This reverts commit 916592944af8e32f2044c9acf0d57eb7991427a5. --- server/Cargo.lock | 4 ++-- server/Cargo.toml | 2 +- server/src/routes/federation.rs | 12 +++--------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/server/Cargo.lock b/server/Cargo.lock index 7b0d9a88c..c54419e10 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -1413,9 +1413,9 @@ dependencies = [ [[package]] name = "http-signature-normalization-actix" -version = "0.4.0-alpha.1" +version = "0.4.0-alpha.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c6efbc3e600cdd617585f4f15be3726c6942fb2eba3c8c79474c5d3159ad7c0" +checksum = "09afff6987c7edbed101d1cddd2185786fb0af0dd9c06b654aca73a0a763680f" dependencies = [ "actix-http", "actix-web", diff --git a/server/Cargo.toml b/server/Cargo.toml index 225079940..8daf72c4a 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -43,7 +43,7 @@ percent-encoding = "2.1.0" comrak = "0.7" openssl = "0.10" http = "0.2.1" -http-signature-normalization-actix = { version = "0.4.0-alpha.1", default-features = false, features = ["sha-2"] } +http-signature-normalization-actix = { version = "0.4.0-alpha.0", default-features = false, features = ["sha-2"] } base64 = "0.12.1" tokio = "0.2.21" futures = "0.3.5" diff --git a/server/src/routes/federation.rs b/server/src/routes/federation.rs index 20b5dc834..fe6e33657 100644 --- a/server/src/routes/federation.rs +++ b/server/src/routes/federation.rs @@ -12,8 +12,6 @@ use crate::{ settings::Settings, }; use actix_web::*; -use http_signature_normalization_actix::digest::middleware::VerifyDigest; -use sha2::{Digest, Sha256}; pub fn config(cfg: &mut web::ServiceConfig) { if Settings::get().federation.enabled { @@ -40,12 +38,8 @@ pub fn config(cfg: &mut web::ServiceConfig) { .route("/comment/{comment_id}", web::get().to(get_apub_comment)), ) // Inboxes dont work with the header guard for some reason. - .service( - web::scope("/") - .wrap(VerifyDigest::new(Sha256::new())) - .route("/c/{community_name}/inbox", web::post().to(community_inbox)) - .route("/u/{user_name}/inbox", web::post().to(user_inbox)) - .route("/inbox", web::post().to(shared_inbox)), - ); + .route("/c/{community_name}/inbox", web::post().to(community_inbox)) + .route("/u/{user_name}/inbox", web::post().to(user_inbox)) + .route("/inbox", web::post().to(shared_inbox)); } } From b9d16d7cd0fff20079c3933eeaf7445cfaee9bbe Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 6 Jul 2020 11:39:31 -0400 Subject: [PATCH 32/74] Fixing some typos. --- docs/src/administration_configuration.md | 2 +- docs/src/lemmy_council.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/administration_configuration.md b/docs/src/administration_configuration.md index cc421b0b7..56448de46 100644 --- a/docs/src/administration_configuration.md +++ b/docs/src/administration_configuration.md @@ -7,7 +7,7 @@ can copy the options you want to change into your local `config.hjson` file. Additionally, you can override any config files with environment variables. These have the same name as the config options, and are prefixed with `LEMMY_`. For example, you can override the -`database.password` with `LEMMY__DATABASE__POOL_SIZE=10`. +`database.password` with `LEMMY_DATABASE__POOL_SIZE=10`. An additional option `LEMMY_DATABASE_URL` is available, which can be used with a PostgreSQL connection string like `postgres://lemmy:password@lemmy_db:5432/lemmy`, passing all connection diff --git a/docs/src/lemmy_council.md b/docs/src/lemmy_council.md index 9b24522af..46b4c3b1b 100644 --- a/docs/src/lemmy_council.md +++ b/docs/src/lemmy_council.md @@ -9,7 +9,7 @@ - Anything is open for discussion - Voting done through matrix chat reacts (thumbs up/thumbs down) - Require a simple majority for votes. (Maybe 2/3rds for more debated decisions). -- Once a decision is reached democratically, the dicision is binding and all group members have to follow it +- Once a decision is reached democratically, the decision is binding and all group members have to follow it - All members of the Lemmy council have equal voting power. - Voting must stay open for at least 2 days. From 6122fb9f73fa301154d22109d2147837351cea97 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Fri, 26 Jun 2020 02:55:14 +0200 Subject: [PATCH 33/74] Improve council rules --- docs/src/lemmy_council.md | 65 ++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 21 deletions(-) diff --git a/docs/src/lemmy_council.md b/docs/src/lemmy_council.md index 9b24522af..d5b9c7905 100644 --- a/docs/src/lemmy_council.md +++ b/docs/src/lemmy_council.md @@ -3,30 +3,52 @@ - A group of lemmy developers and users that use a well-defined democratic process to steer the project in a positive direction, keep it aligned to community goals, and resolve conflicts. - Council members are also added as administrators to any official Lemmy instances. -## Voting / Decision-Making +## 1. What gets voted on -### Process -- Anything is open for discussion -- Voting done through matrix chat reacts (thumbs up/thumbs down) -- Require a simple majority for votes. (Maybe 2/3rds for more debated decisions). -- Once a decision is reached democratically, the dicision is binding and all group members have to follow it -- All members of the Lemmy council have equal voting power. -- Voting must stay open for at least 2 days. +This section describes all the aspects of Lemmy where the council has decision making power, namely: -### What gets voted on -- Membership (joining, removing) - Coding direction - Priorities / Emphasis - Controversial features (For example, an unpopular feature should be removed) -- Communication mediums -- Conflict resolution -- dev.lemmy.ml (domain and server) -- lemmy.ml and subdomains (excluding communism.lemmy.ml) -- git repo including mirrors (on github, gitea, etc) -- Any official accounts of the Lemmy project, for example the Mastodon account or the Liberapay account +- Moderation and conflict resolution on: + - [dev.lemmy.ml](https://dev.lemmy.ml/) + - [github.com/LemmyNet/lemmy](https://github.com/LemmyNet/lemmy) + - [yerbamate.dev/LemmyNet/lemmy](https://yerbamate.dev/LemmyNet/lemmy) + - [weblate.yerbamate.dev/projects/lemmy/](https://weblate.yerbamate.dev/projects/lemmy/) +- Technical administration of dev.lemmy.ml +- Official Lemmy accounts + - [Mastodon](https://mastodon.social/@LemmyDev) + - [Liberapay](https://liberapay.com/Lemmy/) + - [Patreon](https://www.patreon.com/dessalines) +- Council membership changes - Changes to these rules -## Joining +## 2. Feedback and Activity Reports + +Every week, the council should make a thread on Lemmy that details its activity during the past week, be it development, moderation, or anything else mentioned in 1. + +At the same time, users can give feedback and suggestions in this thread. This should be taken into account by the council. Council members can call for a vote on any controversial issues, if they can't be resolved by discussion. + +## 2. Voting Process + +Most of the time, we keep each other up to date through the Matrix chat, and take informal decisions on uncontroversial issues. For example, a user clearly violating the site rules could be banned by a single person, or ideally after discussing it with at least one other member. + +If an issue can not be resolved in this way, then any council member can call for a vote, which works in the following way: + +- Any council member can call for a vote, on any topic mentioned in 1. +- This should be used if there is any controversy in the community, or between council members. +- Before taking any decision, there needs to be a discussion where every council member can +explain their position. +- Discussion should be taken with the goal of reaching a compromise that is acceptable for +everyone. +- After the discussion, voting is done through Matrix emojis (👍: yes, 👎: no, X: abstain) and must +stay open for at least two days. +- All members of the Lemmy council have equal voting power. +- Decisions should be reached unanimously, or nearly so. If this is not possible, at least +2/3 of votes must be in favour for the motion to pass. +- Once a decision is reached in this way, every member needs to abide by it. + +## 4. Joining - We use the following process: anyone who is active around Lemmy can recommend any other active person to join the council. This has to be approved by a majority of the council. - Active users are defined as those who contribute to Lemmy in some way for at least an hour per week on average, doing things like reporting bugs, discussing rules and features, translating, promoting, developing, or doing other things that aim to improve Lemmy as a whole. -> people should have joined at least a month ago. @@ -34,23 +56,24 @@ - Note: we would like to have a process where community members can elect candidates for the council, but this is not realistic because a single user could easily create multiple accounts and cheat the vote. - Limit growth to one new member per month at most. -## Removing members +## 5. Removing members - Inactive members should be removed from the council after a few months of inactivity, and after receiving a notification about this. - Members that dont follow binding council decisions should be removed. - Any member can be removed in a vote. -## Goals +## 6. Goals - We encourage the membership of groups such as LGBT, religious or ethnic minorities, abuse victims, etc etc, and strive to create a safe space for them to express their opinions. We also support measures to increase participation by the previously mentioned groups. - The following are banned, and will always be harshly punished: fascism, abuse, racism, sexism, etc etc, -## Communication +## 7. Communication - A private Matrix chat for all council members. - (Once private communities are done) A private community on dev.lemmy.ml for issues. -## Member List / Contact Info +## 8. Member List / Contact Info General Contact [@LemmyDev Mastodon](https://mastodon.social/@LemmyDev) - [Dessalines](https://dev.lemmy.ml/u/dessalines) - [Nutomic](https://dev.lemmy.ml/u/nutomic) - [AgreeableLandscape](https://dev.lemmy.ml/u/AgreeableLandscape) - [fruechtchen](https://dev.lemmy.ml/u/fruechtchen) +- [kixiQu](https://dev.lemmy.ml/u/kixiQu) From f4565d06030b59a4ef646ac1a890324f518ad7f0 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Tue, 7 Jul 2020 10:54:44 -0400 Subject: [PATCH 34/74] Remove materialized views. (#908) * One pass at materialized views, only about 30% faster, not good. * Before merging master to test out bans. * DB Rework working, still need more testing. * Fixing accidental addadmin bug from asonix async merge. * Fixing the comment delete trigger * Some more DB additions. - Adding a hot_rank desc, published desc index to post_aggregates_fast. - Removed WITH CTE queries in favor of direct selects (since CTEs cant use indexes) * Removing some unecessary indexes. * Some more DB optimizings - Changing the fast_id pkeys to just ids on the fast tables. - Removing the private_message_fast, since the view contains no aggregates. - Comment and post voting now no longer pull from the views, they update the counts directly. * Adding community_agg_view and post_agg_views Credit: eiknat. * Adding user and comment_view migrations. (comment_view still broken) * Adding more views. Credit Eiknat. --- .../down.sql | 535 ++++++++++ .../2020-06-30-135809_remove_mat_views/up.sql | 939 ++++++++++++++++++ .../query_testing/generate_explain_reports.sh | 29 +- server/src/api/user.rs | 3 +- server/src/db/code_migrations.rs | 4 - server/src/db/comment_view.rs | 33 +- server/src/db/community_view.rs | 16 +- server/src/db/post_view.rs | 76 +- server/src/db/private_message_view.rs | 31 +- server/src/db/user_mention_view.rs | 16 +- server/src/db/user_view.rs | 26 +- server/src/schema.rs | 127 +++ ui/src/utils.ts | 2 +- 13 files changed, 1712 insertions(+), 125 deletions(-) create mode 100644 server/migrations/2020-06-30-135809_remove_mat_views/down.sql create mode 100644 server/migrations/2020-06-30-135809_remove_mat_views/up.sql diff --git a/server/migrations/2020-06-30-135809_remove_mat_views/down.sql b/server/migrations/2020-06-30-135809_remove_mat_views/down.sql new file mode 100644 index 000000000..5f72b76d1 --- /dev/null +++ b/server/migrations/2020-06-30-135809_remove_mat_views/down.sql @@ -0,0 +1,535 @@ +-- Dropping all the fast tables +drop table user_fast; +drop view post_fast_view; +drop table post_aggregates_fast; +drop view community_fast_view; +drop table community_aggregates_fast; +drop view reply_fast_view; +drop view user_mention_fast_view; +drop view comment_fast_view; +drop table comment_aggregates_fast; + +-- Re-adding all the triggers, functions, and mviews + +-- private message +create materialized view private_message_mview as select * from private_message_view; + +create unique index idx_private_message_mview_id on private_message_mview (id); + + +-- Create the triggers +create or replace function refresh_private_message() +returns trigger language plpgsql +as $$ +begin + refresh materialized view concurrently private_message_mview; + return null; +end $$; + +create trigger refresh_private_message +after insert or update or delete or truncate +on private_message +for each statement +execute procedure refresh_private_message(); + +-- user +create or replace function refresh_user() +returns trigger language plpgsql +as $$ +begin + refresh materialized view concurrently user_mview; + refresh materialized view concurrently comment_aggregates_mview; -- cause of bans + refresh materialized view concurrently post_aggregates_mview; + return null; +end $$; + +drop trigger refresh_user on user_; +create trigger refresh_user +after insert or update or delete or truncate +on user_ +for each statement +execute procedure refresh_user(); +drop view user_view cascade; + +create view user_view as +select +u.id, +u.actor_id, +u.name, +u.avatar, +u.email, +u.matrix_user_id, +u.bio, +u.local, +u.admin, +u.banned, +u.show_avatars, +u.send_notifications_to_email, +u.published, +(select count(*) from post p where p.creator_id = u.id) as number_of_posts, +(select coalesce(sum(score), 0) from post p, post_like pl where u.id = p.creator_id and p.id = pl.post_id) as post_score, +(select count(*) from comment c where c.creator_id = u.id) as number_of_comments, +(select coalesce(sum(score), 0) from comment c, comment_like cl where u.id = c.creator_id and c.id = cl.comment_id) as comment_score +from user_ u; + +create materialized view user_mview as select * from user_view; + +create unique index idx_user_mview_id on user_mview (id); + +-- community +drop trigger refresh_community on community; +create trigger refresh_community +after insert or update or delete or truncate +on community +for each statement +execute procedure refresh_community(); + +create or replace function refresh_community() +returns trigger language plpgsql +as $$ +begin + refresh materialized view concurrently post_aggregates_mview; + refresh materialized view concurrently community_aggregates_mview; + refresh materialized view concurrently user_mview; + return null; +end $$; + +drop view community_aggregates_view cascade; +create view community_aggregates_view as +-- Now that there's public and private keys, you have to be explicit here +select c.id, +c.name, +c.title, +c.description, +c.category_id, +c.creator_id, +c.removed, +c.published, +c.updated, +c.deleted, +c.nsfw, +c.actor_id, +c.local, +c.last_refreshed_at, +(select actor_id from user_ u where c.creator_id = u.id) as creator_actor_id, +(select local from user_ u where c.creator_id = u.id) as creator_local, +(select name from user_ u where c.creator_id = u.id) as creator_name, +(select avatar from user_ u where c.creator_id = u.id) as creator_avatar, +(select name from category ct where c.category_id = ct.id) as category_name, +(select count(*) from community_follower cf where cf.community_id = c.id) as number_of_subscribers, +(select count(*) from post p where p.community_id = c.id) as number_of_posts, +(select count(*) from comment co, post p where c.id = p.community_id and p.id = co.post_id) as number_of_comments, +hot_rank((select count(*) from community_follower cf where cf.community_id = c.id), c.published) as hot_rank +from community c; + +create materialized view community_aggregates_mview as select * from community_aggregates_view; + +create unique index idx_community_aggregates_mview_id on community_aggregates_mview (id); + +create view community_view as +with all_community as +( + select + ca.* + from community_aggregates_view ca +) + +select +ac.*, +u.id as user_id, +(select cf.id::boolean from community_follower cf where u.id = cf.user_id and ac.id = cf.community_id) as subscribed +from user_ u +cross join all_community ac + +union all + +select +ac.*, +null as user_id, +null as subscribed +from all_community ac +; + +create view community_mview as +with all_community as +( + select + ca.* + from community_aggregates_mview ca +) + +select +ac.*, +u.id as user_id, +(select cf.id::boolean from community_follower cf where u.id = cf.user_id and ac.id = cf.community_id) as subscribed +from user_ u +cross join all_community ac + +union all + +select +ac.*, +null as user_id, +null as subscribed +from all_community ac +; +-- Post +drop view post_view; +drop view post_aggregates_view; + +-- regen post view +create view post_aggregates_view as +select +p.*, +(select u.banned from user_ u where p.creator_id = u.id) as banned, +(select cb.id::bool from community_user_ban cb where p.creator_id = cb.user_id and p.community_id = cb.community_id) as banned_from_community, +(select actor_id from user_ where p.creator_id = user_.id) as creator_actor_id, +(select local from user_ where p.creator_id = user_.id) as creator_local, +(select name from user_ where p.creator_id = user_.id) as creator_name, +(select avatar from user_ where p.creator_id = user_.id) as creator_avatar, +(select actor_id from community where p.community_id = community.id) as community_actor_id, +(select local from community where p.community_id = community.id) as community_local, +(select name from community where p.community_id = community.id) as community_name, +(select removed from community c where p.community_id = c.id) as community_removed, +(select deleted from community c where p.community_id = c.id) as community_deleted, +(select nsfw from community c where p.community_id = c.id) as community_nsfw, +(select count(*) from comment where comment.post_id = p.id) as number_of_comments, +coalesce(sum(pl.score), 0) as score, +count (case when pl.score = 1 then 1 else null end) as upvotes, +count (case when pl.score = -1 then 1 else null end) as downvotes, +hot_rank(coalesce(sum(pl.score) , 0), + ( + case when (p.published < ('now'::timestamp - '1 month'::interval)) then p.published -- Prevents necro-bumps + else greatest(c.recent_comment_time, p.published) + end + ) +) as hot_rank, +( + case when (p.published < ('now'::timestamp - '1 month'::interval)) then p.published -- Prevents necro-bumps + else greatest(c.recent_comment_time, p.published) + end +) as newest_activity_time +from post p +left join post_like pl on p.id = pl.post_id +left join ( + select post_id, + max(published) as recent_comment_time + from comment + group by 1 +) c on p.id = c.post_id +group by p.id, c.recent_comment_time; + +create materialized view post_aggregates_mview as select * from post_aggregates_view; + +create unique index idx_post_aggregates_mview_id on post_aggregates_mview (id); + +create view post_view as +with all_post as ( + select + pa.* + from post_aggregates_view pa +) +select +ap.*, +u.id as user_id, +coalesce(pl.score, 0) as my_vote, +(select cf.id::bool from community_follower cf where u.id = cf.user_id and cf.community_id = ap.community_id) as subscribed, +(select pr.id::bool from post_read pr where u.id = pr.user_id and pr.post_id = ap.id) as read, +(select ps.id::bool from post_saved ps where u.id = ps.user_id and ps.post_id = ap.id) as saved +from user_ u +cross join all_post ap +left join post_like pl on u.id = pl.user_id and ap.id = pl.post_id + +union all + +select +ap.*, +null as user_id, +null as my_vote, +null as subscribed, +null as read, +null as saved +from all_post ap +; + +create view post_mview as +with all_post as ( + select + pa.* + from post_aggregates_mview pa +) +select +ap.*, +u.id as user_id, +coalesce(pl.score, 0) as my_vote, +(select cf.id::bool from community_follower cf where u.id = cf.user_id and cf.community_id = ap.community_id) as subscribed, +(select pr.id::bool from post_read pr where u.id = pr.user_id and pr.post_id = ap.id) as read, +(select ps.id::bool from post_saved ps where u.id = ps.user_id and ps.post_id = ap.id) as saved +from user_ u +cross join all_post ap +left join post_like pl on u.id = pl.user_id and ap.id = pl.post_id + +union all + +select +ap.*, +null as user_id, +null as my_vote, +null as subscribed, +null as read, +null as saved +from all_post ap +; + +drop trigger refresh_post on post; +create trigger refresh_post +after insert or update or delete or truncate +on post +for each statement +execute procedure refresh_post(); + +create or replace function refresh_post() +returns trigger language plpgsql +as $$ +begin + refresh materialized view concurrently post_aggregates_mview; + refresh materialized view concurrently user_mview; + return null; +end $$; + + +-- User mention, comment, reply +drop view user_mention_view; +drop view comment_view; +drop view comment_aggregates_view; + +-- reply and comment view +create view comment_aggregates_view as +select +c.*, +(select community_id from post p where p.id = c.post_id), +(select co.actor_id from post p, community co where p.id = c.post_id and p.community_id = co.id) as community_actor_id, +(select co.local from post p, community co where p.id = c.post_id and p.community_id = co.id) as community_local, +(select co.name from post p, community co where p.id = c.post_id and p.community_id = co.id) as community_name, +(select u.banned from user_ u where c.creator_id = u.id) as banned, +(select cb.id::bool from community_user_ban cb, post p where c.creator_id = cb.user_id and p.id = c.post_id and p.community_id = cb.community_id) as banned_from_community, +(select actor_id from user_ where c.creator_id = user_.id) as creator_actor_id, +(select local from user_ where c.creator_id = user_.id) as creator_local, +(select name from user_ where c.creator_id = user_.id) as creator_name, +(select avatar from user_ where c.creator_id = user_.id) as creator_avatar, +coalesce(sum(cl.score), 0) as score, +count (case when cl.score = 1 then 1 else null end) as upvotes, +count (case when cl.score = -1 then 1 else null end) as downvotes, +hot_rank(coalesce(sum(cl.score) , 0), c.published) as hot_rank +from comment c +left join comment_like cl on c.id = cl.comment_id +group by c.id; + +create materialized view comment_aggregates_mview as select * from comment_aggregates_view; + +create unique index idx_comment_aggregates_mview_id on comment_aggregates_mview (id); + +create view comment_view as +with all_comment as +( + select + ca.* + from comment_aggregates_view ca +) + +select +ac.*, +u.id as user_id, +coalesce(cl.score, 0) as my_vote, +(select cf.id::boolean from community_follower cf where u.id = cf.user_id and ac.community_id = cf.community_id) as subscribed, +(select cs.id::bool from comment_saved cs where u.id = cs.user_id and cs.comment_id = ac.id) as saved +from user_ u +cross join all_comment ac +left join comment_like cl on u.id = cl.user_id and ac.id = cl.comment_id + +union all + +select + ac.*, + null as user_id, + null as my_vote, + null as subscribed, + null as saved +from all_comment ac +; + +create view comment_mview as +with all_comment as +( + select + ca.* + from comment_aggregates_mview ca +) + +select +ac.*, +u.id as user_id, +coalesce(cl.score, 0) as my_vote, +(select cf.id::boolean from community_follower cf where u.id = cf.user_id and ac.community_id = cf.community_id) as subscribed, +(select cs.id::bool from comment_saved cs where u.id = cs.user_id and cs.comment_id = ac.id) as saved +from user_ u +cross join all_comment ac +left join comment_like cl on u.id = cl.user_id and ac.id = cl.comment_id + +union all + +select + ac.*, + null as user_id, + null as my_vote, + null as subscribed, + null as saved +from all_comment ac +; + +-- Do the reply_view referencing the comment_mview +create view reply_view as +with closereply as ( + select + c2.id, + c2.creator_id as sender_id, + c.creator_id as recipient_id + from comment c + inner join comment c2 on c.id = c2.parent_id + where c2.creator_id != c.creator_id + -- Do union where post is null + union + select + c.id, + c.creator_id as sender_id, + p.creator_id as recipient_id + from comment c, post p + where c.post_id = p.id and c.parent_id is null and c.creator_id != p.creator_id +) +select cv.*, +closereply.recipient_id +from comment_mview cv, closereply +where closereply.id = cv.id +; + +-- user mention +create view user_mention_view as +select + c.id, + um.id as user_mention_id, + c.creator_id, + c.creator_actor_id, + c.creator_local, + c.post_id, + c.parent_id, + c.content, + c.removed, + um.read, + c.published, + c.updated, + c.deleted, + c.community_id, + c.community_actor_id, + c.community_local, + c.community_name, + c.banned, + c.banned_from_community, + c.creator_name, + c.creator_avatar, + c.score, + c.upvotes, + c.downvotes, + c.hot_rank, + c.user_id, + c.my_vote, + c.saved, + um.recipient_id, + (select actor_id from user_ u where u.id = um.recipient_id) as recipient_actor_id, + (select local from user_ u where u.id = um.recipient_id) as recipient_local +from user_mention um, comment_view c +where um.comment_id = c.id; + + +create view user_mention_mview as +with all_comment as +( + select + ca.* + from comment_aggregates_mview ca +) + +select + ac.id, + um.id as user_mention_id, + ac.creator_id, + ac.creator_actor_id, + ac.creator_local, + ac.post_id, + ac.parent_id, + ac.content, + ac.removed, + um.read, + ac.published, + ac.updated, + ac.deleted, + ac.community_id, + ac.community_actor_id, + ac.community_local, + ac.community_name, + ac.banned, + ac.banned_from_community, + ac.creator_name, + ac.creator_avatar, + ac.score, + ac.upvotes, + ac.downvotes, + ac.hot_rank, + u.id as user_id, + coalesce(cl.score, 0) as my_vote, + (select cs.id::bool from comment_saved cs where u.id = cs.user_id and cs.comment_id = ac.id) as saved, + um.recipient_id, + (select actor_id from user_ u where u.id = um.recipient_id) as recipient_actor_id, + (select local from user_ u where u.id = um.recipient_id) as recipient_local +from user_ u +cross join all_comment ac +left join comment_like cl on u.id = cl.user_id and ac.id = cl.comment_id +left join user_mention um on um.comment_id = ac.id + +union all + +select + ac.id, + um.id as user_mention_id, + ac.creator_id, + ac.creator_actor_id, + ac.creator_local, + ac.post_id, + ac.parent_id, + ac.content, + ac.removed, + um.read, + ac.published, + ac.updated, + ac.deleted, + ac.community_id, + ac.community_actor_id, + ac.community_local, + ac.community_name, + ac.banned, + ac.banned_from_community, + ac.creator_name, + ac.creator_avatar, + ac.score, + ac.upvotes, + ac.downvotes, + ac.hot_rank, + null as user_id, + null as my_vote, + null as saved, + um.recipient_id, + (select actor_id from user_ u where u.id = um.recipient_id) as recipient_actor_id, + (select local from user_ u where u.id = um.recipient_id) as recipient_local +from all_comment ac +left join user_mention um on um.comment_id = ac.id +; + diff --git a/server/migrations/2020-06-30-135809_remove_mat_views/up.sql b/server/migrations/2020-06-30-135809_remove_mat_views/up.sql new file mode 100644 index 000000000..bd792a8b9 --- /dev/null +++ b/server/migrations/2020-06-30-135809_remove_mat_views/up.sql @@ -0,0 +1,939 @@ +-- Drop the mviews +drop view post_mview; +drop materialized view user_mview; +drop view community_mview; +drop materialized view private_message_mview; +drop view user_mention_mview; +drop view reply_view; +drop view comment_mview; +drop materialized view post_aggregates_mview; +drop materialized view community_aggregates_mview; +drop materialized view comment_aggregates_mview; +drop trigger refresh_private_message on private_message; + +-- User +drop view user_view; +create view user_view as +select + u.id, + u.actor_id, + u.name, + u.avatar, + u.email, + u.matrix_user_id, + u.bio, + u.local, + u.admin, + u.banned, + u.show_avatars, + u.send_notifications_to_email, + u.published, + coalesce(pd.posts, 0) as number_of_posts, + coalesce(pd.score, 0) as post_score, + coalesce(cd.comments, 0) as number_of_comments, + coalesce(cd.score, 0) as comment_score +from user_ u +left join ( + select + p.creator_id as creator_id, + count(distinct p.id) as posts, + sum(pl.score) as score + from post p + join post_like pl on p.id = pl.post_id + group by p.creator_id +) pd on u.id = pd.creator_id +left join ( + select + c.creator_id, + count(distinct c.id) as comments, + sum(cl.score) as score + from comment c + join comment_like cl on c.id = cl.comment_id + group by c.creator_id +) cd on u.id = cd.creator_id; + + +create table user_fast as select * from user_view; +alter table user_fast add primary key (id); + +drop trigger refresh_user on user_; + +create trigger refresh_user +after insert or update or delete +on user_ +for each row +execute procedure refresh_user(); + +-- Sample insert +-- insert into user_(name, password_encrypted) values ('test_name', 'bleh'); +-- Sample delete +-- delete from user_ where name like 'test_name'; +-- Sample update +-- update user_ set avatar = 'hai' where name like 'test_name'; +create or replace function refresh_user() +returns trigger language plpgsql +as $$ +begin + IF (TG_OP = 'DELETE') THEN + delete from user_fast where id = OLD.id; + ELSIF (TG_OP = 'UPDATE') THEN + delete from user_fast where id = OLD.id; + insert into user_fast select * from user_view where id = NEW.id; + + -- Refresh post_fast, cause of user info changes + delete from post_aggregates_fast where creator_id = NEW.id; + insert into post_aggregates_fast select * from post_aggregates_view where creator_id = NEW.id; + + delete from comment_aggregates_fast where creator_id = NEW.id; + insert into comment_aggregates_fast select * from comment_aggregates_view where creator_id = NEW.id; + + ELSIF (TG_OP = 'INSERT') THEN + insert into user_fast select * from user_view where id = NEW.id; + END IF; + + return null; +end $$; + +-- Post +-- Redoing the views : Credit eiknat +drop view post_view; +drop view post_aggregates_view; + +create view post_aggregates_view as +select + p.*, + -- creator details + u.actor_id as creator_actor_id, + u."local" as creator_local, + u."name" as creator_name, + u.avatar as creator_avatar, + u.banned as banned, + cb.id::bool as banned_from_community, + -- community details + c.actor_id as community_actor_id, + c."local" as community_local, + c."name" as community_name, + c.removed as community_removed, + c.deleted as community_deleted, + c.nsfw as community_nsfw, + -- post score data/comment count + coalesce(ct.comments, 0) as number_of_comments, + coalesce(pl.score, 0) as score, + coalesce(pl.upvotes, 0) as upvotes, + coalesce(pl.downvotes, 0) as downvotes, + hot_rank( + coalesce(pl.score , 0), ( + case + when (p.published < ('now'::timestamp - '1 month'::interval)) + then p.published + else greatest(ct.recent_comment_time, p.published) + end + ) + ) as hot_rank, + ( + case + when (p.published < ('now'::timestamp - '1 month'::interval)) + then p.published + else greatest(ct.recent_comment_time, p.published) + end + ) as newest_activity_time +from post p +left join user_ u on p.creator_id = u.id +left join community_user_ban cb on p.creator_id = cb.user_id and p.community_id = cb.community_id +left join community c on p.community_id = c.id +left join ( + select + post_id, + count(*) as comments, + max(published) as recent_comment_time + from comment + group by post_id +) ct on ct.post_id = p.id +left join ( + select + post_id, + sum(score) as score, + sum(score) filter (where score = 1) as upvotes, + -sum(score) filter (where score = -1) as downvotes + from post_like + group by post_id +) pl on pl.post_id = p.id +order by p.id; + +create view post_view as +select + pav.*, + us.id as user_id, + us.user_vote as my_vote, + us.is_subbed::bool as subscribed, + us.is_read::bool as read, + us.is_saved::bool as saved +from post_aggregates_view pav +cross join lateral ( + select + u.id, + coalesce(cf.community_id, 0) as is_subbed, + coalesce(pr.post_id, 0) as is_read, + coalesce(ps.post_id, 0) as is_saved, + coalesce(pl.score, 0) as user_vote + from user_ u + left join community_user_ban cb on u.id = cb.user_id and cb.community_id = pav.community_id + left join community_follower cf on u.id = cf.user_id and cf.community_id = pav.community_id + left join post_read pr on u.id = pr.user_id and pr.post_id = pav.id + left join post_saved ps on u.id = ps.user_id and ps.post_id = pav.id + left join post_like pl on u.id = pl.user_id and pav.id = pl.post_id +) as us + +union all + +select +pav.*, +null as user_id, +null as my_vote, +null as subscribed, +null as read, +null as saved +from post_aggregates_view pav; + +-- The post fast table +create table post_aggregates_fast as select * from post_aggregates_view; +alter table post_aggregates_fast add primary key (id); + +-- For the hot rank resorting +create index idx_post_aggregates_fast_hot_rank_published on post_aggregates_fast (hot_rank desc, published desc); + +create view post_fast_view as +select + pav.*, + us.id as user_id, + us.user_vote as my_vote, + us.is_subbed::bool as subscribed, + us.is_read::bool as read, + us.is_saved::bool as saved +from post_aggregates_fast pav +cross join lateral ( + select + u.id, + coalesce(cf.community_id, 0) as is_subbed, + coalesce(pr.post_id, 0) as is_read, + coalesce(ps.post_id, 0) as is_saved, + coalesce(pl.score, 0) as user_vote + from user_ u + left join community_user_ban cb on u.id = cb.user_id and cb.community_id = pav.community_id + left join community_follower cf on u.id = cf.user_id and cf.community_id = pav.community_id + left join post_read pr on u.id = pr.user_id and pr.post_id = pav.id + left join post_saved ps on u.id = ps.user_id and ps.post_id = pav.id + left join post_like pl on u.id = pl.user_id and pav.id = pl.post_id +) as us + +union all + +select +pav.*, +null as user_id, +null as my_vote, +null as subscribed, +null as read, +null as saved +from post_aggregates_fast pav; + +drop trigger refresh_post on post; + +create trigger refresh_post +after insert or update or delete +on post +for each row +execute procedure refresh_post(); + +-- Sample select +-- select id, name from post_fast_view where name like 'test_post' and user_id is null; +-- Sample insert +-- insert into post(name, creator_id, community_id) values ('test_post', 2, 2); +-- Sample delete +-- delete from post where name like 'test_post'; +-- Sample update +-- update post set community_id = 4 where name like 'test_post'; +create or replace function refresh_post() +returns trigger language plpgsql +as $$ +begin + IF (TG_OP = 'DELETE') THEN + delete from post_aggregates_fast where id = OLD.id; + + -- Update community number of posts + update community_aggregates_fast set number_of_posts = number_of_posts - 1 where id = OLD.community_id; + ELSIF (TG_OP = 'UPDATE') THEN + delete from post_aggregates_fast where id = OLD.id; + insert into post_aggregates_fast select * from post_aggregates_view where id = NEW.id; + ELSIF (TG_OP = 'INSERT') THEN + insert into post_aggregates_fast select * from post_aggregates_view where id = NEW.id; + + -- Update that users number of posts, post score + delete from user_fast where id = NEW.creator_id; + insert into user_fast select * from user_view where id = NEW.creator_id; + + -- Update community number of posts + update community_aggregates_fast set number_of_posts = number_of_posts + 1 where id = NEW.community_id; + + -- Update the hot rank on the post table + -- TODO this might not correctly update it, using a 1 week interval + update post_aggregates_fast as paf + set hot_rank = pav.hot_rank + from post_aggregates_view as pav + where paf.id = pav.id and (pav.published > ('now'::timestamp - '1 week'::interval)); + END IF; + + return null; +end $$; + +-- Community +-- Redoing the views : Credit eiknat +drop view community_moderator_view; +drop view community_follower_view; +drop view community_user_ban_view; +drop view community_view; +drop view community_aggregates_view; + +create view community_aggregates_view as +select + c.id, + c.name, + c.title, + c.description, + c.category_id, + c.creator_id, + c.removed, + c.published, + c.updated, + c.deleted, + c.nsfw, + c.actor_id, + c.local, + c.last_refreshed_at, + u.actor_id as creator_actor_id, + u.local as creator_local, + u.name as creator_name, + u.avatar as creator_avatar, + cat.name as category_name, + coalesce(cf.subs, 0) as number_of_subscribers, + coalesce(cd.posts, 0) as number_of_posts, + coalesce(cd.comments, 0) as number_of_comments, + hot_rank(cf.subs, c.published) as hot_rank +from community c +left join user_ u on c.creator_id = u.id +left join category cat on c.category_id = cat.id +left join ( + select + p.community_id, + count(distinct p.id) as posts, + count(distinct ct.id) as comments + from post p + join comment ct on p.id = ct.post_id + group by p.community_id +) cd on cd.community_id = c.id +left join ( + select + community_id, + count(*) as subs + from community_follower + group by community_id +) cf on cf.community_id = c.id; + +create view community_view as +select + cv.*, + us.user as user_id, + us.is_subbed::bool as subscribed +from community_aggregates_view cv +cross join lateral ( + select + u.id as user, + coalesce(cf.community_id, 0) as is_subbed + from user_ u + left join community_follower cf on u.id = cf.user_id and cf.community_id = cv.id +) as us + +union all + +select + cv.*, + null as user_id, + null as subscribed +from community_aggregates_view cv; + +create view community_moderator_view as +select + cm.*, + u.actor_id as user_actor_id, + u.local as user_local, + u.name as user_name, + u.avatar as avatar, + c.actor_id as community_actor_id, + c.local as community_local, + c.name as community_name +from community_moderator cm +left join user_ u on cm.user_id = u.id +left join community c on cm.community_id = c.id; + +create view community_follower_view as +select + cf.*, + u.actor_id as user_actor_id, + u.local as user_local, + u.name as user_name, + u.avatar as avatar, + c.actor_id as community_actor_id, + c.local as community_local, + c.name as community_name +from community_follower cf +left join user_ u on cf.user_id = u.id +left join community c on cf.community_id = c.id; + +create view community_user_ban_view as +select + cb.*, + u.actor_id as user_actor_id, + u.local as user_local, + u.name as user_name, + u.avatar as avatar, + c.actor_id as community_actor_id, + c.local as community_local, + c.name as community_name +from community_user_ban cb +left join user_ u on cb.user_id = u.id +left join community c on cb.community_id = c.id; + +-- The community fast table + +create table community_aggregates_fast as select * from community_aggregates_view; +alter table community_aggregates_fast add primary key (id); + +create view community_fast_view as +select +ac.*, +u.id as user_id, +(select cf.id::boolean from community_follower cf where u.id = cf.user_id and ac.id = cf.community_id) as subscribed +from user_ u +cross join ( + select + ca.* + from community_aggregates_fast ca +) ac + +union all + +select +caf.*, +null as user_id, +null as subscribed +from community_aggregates_fast caf; + +drop trigger refresh_community on community; + +create trigger refresh_community +after insert or update or delete +on community +for each row +execute procedure refresh_community(); + +-- Sample select +-- select * from community_fast_view where name like 'test_community_name' and user_id is null; +-- Sample insert +-- insert into community(name, title, category_id, creator_id) values ('test_community_name', 'test_community_title', 1, 2); +-- Sample delete +-- delete from community where name like 'test_community_name'; +-- Sample update +-- update community set title = 'test_community_title_2' where name like 'test_community_name'; +create or replace function refresh_community() +returns trigger language plpgsql +as $$ +begin + IF (TG_OP = 'DELETE') THEN + delete from community_aggregates_fast where id = OLD.id; + ELSIF (TG_OP = 'UPDATE') THEN + delete from community_aggregates_fast where id = OLD.id; + insert into community_aggregates_fast select * from community_aggregates_view where id = NEW.id; + + -- Update user view due to owner changes + delete from user_fast where id = NEW.creator_id; + insert into user_fast select * from user_view where id = NEW.creator_id; + + -- Update post view due to community changes + delete from post_aggregates_fast where community_id = NEW.id; + insert into post_aggregates_fast select * from post_aggregates_view where community_id = NEW.id; + + -- TODO make sure this shows up in the users page ? + ELSIF (TG_OP = 'INSERT') THEN + insert into community_aggregates_fast select * from community_aggregates_view where id = NEW.id; + END IF; + + return null; +end $$; + +-- Comment + +drop view user_mention_view; +drop view comment_view; +drop view comment_aggregates_view; + +create view comment_aggregates_view as +select + ct.*, + -- community details + p.community_id, + c.actor_id as community_actor_id, + c."local" as community_local, + c."name" as community_name, + -- creator details + u.banned as banned, + coalesce(cb.id, 0)::bool as banned_from_community, + u.actor_id as creator_actor_id, + u.local as creator_local, + u.name as creator_name, + u.avatar as creator_avatar, + -- score details + coalesce(cl.total, 0) as score, + coalesce(cl.up, 0) as upvotes, + coalesce(cl.down, 0) as downvotes, + hot_rank(coalesce(cl.total, 0), ct.published) as hot_rank +from comment ct +left join post p on ct.post_id = p.id +left join community c on p.community_id = c.id +left join user_ u on ct.creator_id = u.id +left join community_user_ban cb on ct.creator_id = cb.user_id and p.id = ct.post_id and p.community_id = cb.community_id +left join ( + select + l.comment_id as id, + sum(l.score) as total, + count(case when l.score = 1 then 1 else null end) as up, + count(case when l.score = -1 then 1 else null end) as down + from comment_like l + group by comment_id +) as cl on cl.id = ct.id; + +create or replace view comment_view as ( +select + cav.*, + us.user_id as user_id, + us.my_vote as my_vote, + us.is_subbed::bool as subscribed, + us.is_saved::bool as saved +from comment_aggregates_view cav +cross join lateral ( + select + u.id as user_id, + coalesce(cl.score, 0) as my_vote, + coalesce(cf.id, 0) as is_subbed, + coalesce(cs.id, 0) as is_saved + from user_ u + left join comment_like cl on u.id = cl.user_id and cav.id = cl.comment_id + left join comment_saved cs on u.id = cs.user_id and cs.comment_id = cav.id + left join community_follower cf on u.id = cf.user_id and cav.community_id = cf.community_id +) as us + +union all + +select + cav.*, + null as user_id, + null as my_vote, + null as subscribed, + null as saved +from comment_aggregates_view cav +); + +-- The fast view +create table comment_aggregates_fast as select * from comment_aggregates_view; +alter table comment_aggregates_fast add primary key (id); + +create view comment_fast_view as +select + cav.*, + us.user_id as user_id, + us.my_vote as my_vote, + us.is_subbed::bool as subscribed, + us.is_saved::bool as saved +from comment_aggregates_fast cav +cross join lateral ( + select + u.id as user_id, + coalesce(cl.score, 0) as my_vote, + coalesce(cf.id, 0) as is_subbed, + coalesce(cs.id, 0) as is_saved + from user_ u + left join comment_like cl on u.id = cl.user_id and cav.id = cl.comment_id + left join comment_saved cs on u.id = cs.user_id and cs.comment_id = cav.id + left join community_follower cf on u.id = cf.user_id and cav.community_id = cf.community_id +) as us + +union all + +select + cav.*, + null as user_id, + null as my_vote, + null as subscribed, + null as saved +from comment_aggregates_fast cav; + +-- Do the reply_view referencing the comment_fast_view +create view reply_fast_view as +with closereply as ( + select + c2.id, + c2.creator_id as sender_id, + c.creator_id as recipient_id + from comment c + inner join comment c2 on c.id = c2.parent_id + where c2.creator_id != c.creator_id + -- Do union where post is null + union + select + c.id, + c.creator_id as sender_id, + p.creator_id as recipient_id + from comment c, post p + where c.post_id = p.id and c.parent_id is null and c.creator_id != p.creator_id +) +select cv.*, +closereply.recipient_id +from comment_fast_view cv, closereply +where closereply.id = cv.id +; + +-- user mention +create view user_mention_view as +select + c.id, + um.id as user_mention_id, + c.creator_id, + c.creator_actor_id, + c.creator_local, + c.post_id, + c.parent_id, + c.content, + c.removed, + um.read, + c.published, + c.updated, + c.deleted, + c.community_id, + c.community_actor_id, + c.community_local, + c.community_name, + c.banned, + c.banned_from_community, + c.creator_name, + c.creator_avatar, + c.score, + c.upvotes, + c.downvotes, + c.hot_rank, + c.user_id, + c.my_vote, + c.saved, + um.recipient_id, + (select actor_id from user_ u where u.id = um.recipient_id) as recipient_actor_id, + (select local from user_ u where u.id = um.recipient_id) as recipient_local +from user_mention um, comment_view c +where um.comment_id = c.id; + +create view user_mention_fast_view as +select + ac.id, + um.id as user_mention_id, + ac.creator_id, + ac.creator_actor_id, + ac.creator_local, + ac.post_id, + ac.parent_id, + ac.content, + ac.removed, + um.read, + ac.published, + ac.updated, + ac.deleted, + ac.community_id, + ac.community_actor_id, + ac.community_local, + ac.community_name, + ac.banned, + ac.banned_from_community, + ac.creator_name, + ac.creator_avatar, + ac.score, + ac.upvotes, + ac.downvotes, + ac.hot_rank, + u.id as user_id, + coalesce(cl.score, 0) as my_vote, + (select cs.id::bool from comment_saved cs where u.id = cs.user_id and cs.comment_id = ac.id) as saved, + um.recipient_id, + (select actor_id from user_ u where u.id = um.recipient_id) as recipient_actor_id, + (select local from user_ u where u.id = um.recipient_id) as recipient_local +from user_ u +cross join ( + select + ca.* + from comment_aggregates_fast ca +) ac +left join comment_like cl on u.id = cl.user_id and ac.id = cl.comment_id +left join user_mention um on um.comment_id = ac.id + +union all + +select + ac.id, + um.id as user_mention_id, + ac.creator_id, + ac.creator_actor_id, + ac.creator_local, + ac.post_id, + ac.parent_id, + ac.content, + ac.removed, + um.read, + ac.published, + ac.updated, + ac.deleted, + ac.community_id, + ac.community_actor_id, + ac.community_local, + ac.community_name, + ac.banned, + ac.banned_from_community, + ac.creator_name, + ac.creator_avatar, + ac.score, + ac.upvotes, + ac.downvotes, + ac.hot_rank, + null as user_id, + null as my_vote, + null as saved, + um.recipient_id, + (select actor_id from user_ u where u.id = um.recipient_id) as recipient_actor_id, + (select local from user_ u where u.id = um.recipient_id) as recipient_local +from comment_aggregates_fast ac +left join user_mention um on um.comment_id = ac.id +; + + +drop trigger refresh_comment on comment; + +create trigger refresh_comment +after insert or update or delete +on comment +for each row +execute procedure refresh_comment(); + +-- Sample select +-- select * from comment_fast_view where content = 'test_comment' and user_id is null; +-- Sample insert +-- insert into comment(creator_id, post_id, content) values (2, 2, 'test_comment'); +-- Sample delete +-- delete from comment where content like 'test_comment'; +-- Sample update +-- update comment set removed = true where content like 'test_comment'; +create or replace function refresh_comment() +returns trigger language plpgsql +as $$ +begin + IF (TG_OP = 'DELETE') THEN + delete from comment_aggregates_fast where id = OLD.id; + + -- Update community number of comments + update community_aggregates_fast as caf + set number_of_comments = number_of_comments - 1 + from post as p + where caf.id = p.community_id and p.id = OLD.post_id; + + ELSIF (TG_OP = 'UPDATE') THEN + delete from comment_aggregates_fast where id = OLD.id; + insert into comment_aggregates_fast select * from comment_aggregates_view where id = NEW.id; + ELSIF (TG_OP = 'INSERT') THEN + insert into comment_aggregates_fast select * from comment_aggregates_view where id = NEW.id; + + -- Update user view due to comment count + update user_fast + set number_of_comments = number_of_comments + 1 + where id = NEW.creator_id; + + -- Update post view due to comment count, new comment activity time, but only on new posts + -- TODO this could be done more efficiently + delete from post_aggregates_fast where id = NEW.post_id; + insert into post_aggregates_fast select * from post_aggregates_view where id = NEW.post_id; + + -- Force the hot rank as zero on week-older posts + update post_aggregates_fast as paf + set hot_rank = 0 + where paf.id = NEW.post_id and (paf.published < ('now'::timestamp - '1 week'::interval)); + + -- Update community number of comments + update community_aggregates_fast as caf + set number_of_comments = number_of_comments + 1 + from post as p + where caf.id = p.community_id and p.id = NEW.post_id; + + END IF; + + return null; +end $$; + + +-- post_like +-- select id, score, my_vote from post_fast_view where id = 29 and user_id = 4; +-- Sample insert +-- insert into post_like(user_id, post_id, score) values (4, 29, 1); +-- Sample delete +-- delete from post_like where user_id = 4 and post_id = 29; +-- Sample update +-- update post_like set score = -1 where user_id = 4 and post_id = 29; + +-- TODO test this a LOT +create or replace function refresh_post_like() +returns trigger language plpgsql +as $$ +begin + IF (TG_OP = 'DELETE') THEN + update post_aggregates_fast + set score = case + when (OLD.score = 1) then score - 1 + else score + 1 end, + upvotes = case + when (OLD.score = 1) then upvotes - 1 + else upvotes end, + downvotes = case + when (OLD.score = -1) then downvotes - 1 + else downvotes end + where id = OLD.post_id; + + ELSIF (TG_OP = 'INSERT') THEN + update post_aggregates_fast + set score = case + when (NEW.score = 1) then score + 1 + else score - 1 end, + upvotes = case + when (NEW.score = 1) then upvotes + 1 + else upvotes end, + downvotes = case + when (NEW.score = -1) then downvotes + 1 + else downvotes end + where id = NEW.post_id; + END IF; + + return null; +end $$; + +drop trigger refresh_post_like on post_like; +create trigger refresh_post_like +after insert or delete +on post_like +for each row +execute procedure refresh_post_like(); + +-- comment_like +-- select id, score, my_vote from comment_fast_view where id = 29 and user_id = 4; +-- Sample insert +-- insert into comment_like(user_id, comment_id, post_id, score) values (4, 29, 51, 1); +-- Sample delete +-- delete from comment_like where user_id = 4 and comment_id = 29; +-- Sample update +-- update comment_like set score = -1 where user_id = 4 and comment_id = 29; +create or replace function refresh_comment_like() +returns trigger language plpgsql +as $$ +begin + -- TODO possibly select from comment_fast to get previous scores, instead of re-fetching the views? + IF (TG_OP = 'DELETE') THEN + update comment_aggregates_fast + set score = case + when (OLD.score = 1) then score - 1 + else score + 1 end, + upvotes = case + when (OLD.score = 1) then upvotes - 1 + else upvotes end, + downvotes = case + when (OLD.score = -1) then downvotes - 1 + else downvotes end + where id = OLD.comment_id; + + ELSIF (TG_OP = 'INSERT') THEN + update comment_aggregates_fast + set score = case + when (NEW.score = 1) then score + 1 + else score - 1 end, + upvotes = case + when (NEW.score = 1) then upvotes + 1 + else upvotes end, + downvotes = case + when (NEW.score = -1) then downvotes + 1 + else downvotes end + where id = NEW.comment_id; + END IF; + + return null; +end $$; + +drop trigger refresh_comment_like on comment_like; +create trigger refresh_comment_like +after insert or delete +on comment_like +for each row +execute procedure refresh_comment_like(); + +-- Community user ban + +drop trigger refresh_community_user_ban on community_user_ban; +create trigger refresh_community_user_ban +after insert or delete -- Note this is missing after update +on community_user_ban +for each row +execute procedure refresh_community_user_ban(); + +-- select creator_name, banned_from_community from comment_fast_view where user_id = 4 and content = 'test_before_ban'; +-- select creator_name, banned_from_community, community_id from comment_aggregates_fast where content = 'test_before_ban'; +-- Sample insert +-- insert into comment(creator_id, post_id, content) values (1198, 341, 'test_before_ban'); +-- insert into community_user_ban(community_id, user_id) values (2, 1198); +-- Sample delete +-- delete from community_user_ban where user_id = 1198 and community_id = 2; +-- delete from comment where content = 'test_before_ban'; +-- update comment_aggregates_fast set banned_from_community = false where creator_id = 1198 and community_id = 2; +create or replace function refresh_community_user_ban() +returns trigger language plpgsql +as $$ +begin + -- TODO possibly select from comment_fast to get previous scores, instead of re-fetching the views? + IF (TG_OP = 'DELETE') THEN + update comment_aggregates_fast set banned_from_community = false where creator_id = OLD.user_id and community_id = OLD.community_id; + update post_aggregates_fast set banned_from_community = false where creator_id = OLD.user_id and community_id = OLD.community_id; + ELSIF (TG_OP = 'INSERT') THEN + update comment_aggregates_fast set banned_from_community = true where creator_id = NEW.user_id and community_id = NEW.community_id; + update post_aggregates_fast set banned_from_community = true where creator_id = NEW.user_id and community_id = NEW.community_id; + END IF; + + return null; +end $$; + +-- Community follower + +drop trigger refresh_community_follower on community_follower; +create trigger refresh_community_follower +after insert or delete -- Note this is missing after update +on community_follower +for each row +execute procedure refresh_community_follower(); + +create or replace function refresh_community_follower() +returns trigger language plpgsql +as $$ +begin + IF (TG_OP = 'DELETE') THEN + update community_aggregates_fast set number_of_subscribers = number_of_subscribers - 1 where id = OLD.community_id; + ELSIF (TG_OP = 'INSERT') THEN + update community_aggregates_fast set number_of_subscribers = number_of_subscribers + 1 where id = NEW.community_id; + END IF; + + return null; +end $$; diff --git a/server/query_testing/generate_explain_reports.sh b/server/query_testing/generate_explain_reports.sh index 6ce7dc421..439b46a72 100755 --- a/server/query_testing/generate_explain_reports.sh +++ b/server/query_testing/generate_explain_reports.sh @@ -1,31 +1,42 @@ #!/bin/bash set -e +# You can import these to http://tatiyants.com/pev/#/plans/new + # Do the views first -echo "explain (analyze, format json) select * from user_mview" > explain.sql -psql -qAt -U lemmy -f explain.sql > user_view.json +echo "explain (analyze, format json) select * from user_fast" > explain.sql +psql -qAt -U lemmy -f explain.sql > user_fast.json -echo "explain (analyze, format json) select * from post_mview where user_id is null order by hot_rank desc, published desc" > explain.sql +echo "explain (analyze, format json) select * from post_view where user_id is null order by hot_rank desc, published desc" > explain.sql psql -qAt -U lemmy -f explain.sql > post_view.json -echo "explain (analyze, format json) select * from comment_mview where user_id is null" > explain.sql +echo "explain (analyze, format json) select * from post_fast_view where user_id is null order by hot_rank desc, published desc" > explain.sql +psql -qAt -U lemmy -f explain.sql > post_fast_view.json + +echo "explain (analyze, format json) select * from comment_view where user_id is null" > explain.sql psql -qAt -U lemmy -f explain.sql > comment_view.json -echo "explain (analyze, format json) select * from community_mview where user_id is null order by hot_rank desc" > explain.sql +echo "explain (analyze, format json) select * from comment_fast_view where user_id is null" > explain.sql +psql -qAt -U lemmy -f explain.sql > comment_fast_view.json + +echo "explain (analyze, format json) select * from community_view where user_id is null order by hot_rank desc" > explain.sql psql -qAt -U lemmy -f explain.sql > community_view.json +echo "explain (analyze, format json) select * from community_fast_view where user_id is null order by hot_rank desc" > explain.sql +psql -qAt -U lemmy -f explain.sql > community_fast_view.json + echo "explain (analyze, format json) select * from site_view limit 1" > explain.sql psql -qAt -U lemmy -f explain.sql > site_view.json -echo "explain (analyze, format json) select * from reply_view where user_id = 34 and recipient_id = 34" > explain.sql -psql -qAt -U lemmy -f explain.sql > reply_view.json +echo "explain (analyze, format json) select * from reply_fast_view where user_id = 34 and recipient_id = 34" > explain.sql +psql -qAt -U lemmy -f explain.sql > reply_fast_view.json echo "explain (analyze, format json) select * from user_mention_view where user_id = 34 and recipient_id = 34" > explain.sql psql -qAt -U lemmy -f explain.sql > user_mention_view.json -echo "explain (analyze, format json) select * from user_mention_mview where user_id = 34 and recipient_id = 34" > explain.sql -psql -qAt -U lemmy -f explain.sql > user_mention_mview.json +echo "explain (analyze, format json) select * from user_mention_fast_view where user_id = 34 and recipient_id = 34" > explain.sql +psql -qAt -U lemmy -f explain.sql > user_mention_fast_view.json grep "Execution Time" *.json diff --git a/server/src/api/user.rs b/server/src/api/user.rs index a4e47e41c..9b72a9199 100644 --- a/server/src/api/user.rs +++ b/server/src/api/user.rs @@ -678,7 +678,8 @@ impl Perform for Oper { } let added = data.added; - let add_admin = move |conn: &'_ _| User_::add_admin(conn, user_id, added); + let added_user_id = data.user_id; + let add_admin = move |conn: &'_ _| User_::add_admin(conn, added_user_id, added); if blocking(pool, add_admin).await?.is_err() { return Err(APIError::err("couldnt_update_user").into()); } diff --git a/server/src/db/code_migrations.rs b/server/src/db/code_migrations.rs index 67e0c4dcc..1810fae29 100644 --- a/server/src/db/code_migrations.rs +++ b/server/src/db/code_migrations.rs @@ -179,14 +179,10 @@ fn private_message_updates_2020_05_05(conn: &PgConnection) -> Result<(), LemmyEr .filter(local.eq(true)) .load::(conn)?; - sql_query("alter table private_message disable trigger refresh_private_message").execute(conn)?; - for cpm in &incorrect_pms { PrivateMessage::update_ap_id(&conn, cpm.id)?; } - sql_query("alter table private_message enable trigger refresh_private_message").execute(conn)?; - info!("{} private message rows updated.", incorrect_pms.len()); Ok(()) diff --git a/server/src/db/comment_view.rs b/server/src/db/comment_view.rs index a37cdbcd6..d1b27a3c8 100644 --- a/server/src/db/comment_view.rs +++ b/server/src/db/comment_view.rs @@ -1,3 +1,4 @@ +// TODO, remove the cross join here, just join to user directly use crate::db::{fuzzy_search, limit_and_offset, ListingType, MaybeOptional, SortType}; use diesel::{dsl::*, pg::Pg, result::Error, *}; use serde::{Deserialize, Serialize}; @@ -39,7 +40,7 @@ table! { } table! { - comment_mview (id) { + comment_fast_view (id) { id -> Int4, creator_id -> Int4, post_id -> Int4, @@ -76,7 +77,7 @@ table! { #[derive( Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize, QueryableByName, Clone, )] -#[table_name = "comment_view"] +#[table_name = "comment_fast_view"] pub struct CommentView { pub id: i32, pub creator_id: i32, @@ -112,7 +113,7 @@ pub struct CommentView { pub struct CommentQueryBuilder<'a> { conn: &'a PgConnection, - query: super::comment_view::comment_mview::BoxedQuery<'a, Pg>, + query: super::comment_view::comment_fast_view::BoxedQuery<'a, Pg>, listing_type: ListingType, sort: &'a SortType, for_community_id: Option, @@ -127,9 +128,9 @@ pub struct CommentQueryBuilder<'a> { impl<'a> CommentQueryBuilder<'a> { pub fn create(conn: &'a PgConnection) -> Self { - use super::comment_view::comment_mview::dsl::*; + use super::comment_view::comment_fast_view::dsl::*; - let query = comment_mview.into_boxed(); + let query = comment_fast_view.into_boxed(); CommentQueryBuilder { conn, @@ -198,7 +199,7 @@ impl<'a> CommentQueryBuilder<'a> { } pub fn list(self) -> Result, Error> { - use super::comment_view::comment_mview::dsl::*; + use super::comment_view::comment_fast_view::dsl::*; let mut query = self.query; @@ -270,8 +271,8 @@ impl CommentView { from_comment_id: i32, my_user_id: Option, ) -> Result { - use super::comment_view::comment_mview::dsl::*; - let mut query = comment_mview.into_boxed(); + use super::comment_view::comment_fast_view::dsl::*; + let mut query = comment_fast_view.into_boxed(); // The view lets you pass a null user_id, if you're not logged in if let Some(my_user_id) = my_user_id { @@ -290,7 +291,7 @@ impl CommentView { // The faked schema since diesel doesn't do views table! { - reply_view (id) { + reply_fast_view (id) { id -> Int4, creator_id -> Int4, post_id -> Int4, @@ -328,7 +329,7 @@ table! { #[derive( Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize, QueryableByName, Clone, )] -#[table_name = "reply_view"] +#[table_name = "reply_fast_view"] pub struct ReplyView { pub id: i32, pub creator_id: i32, @@ -365,7 +366,7 @@ pub struct ReplyView { pub struct ReplyQueryBuilder<'a> { conn: &'a PgConnection, - query: super::comment_view::reply_view::BoxedQuery<'a, Pg>, + query: super::comment_view::reply_fast_view::BoxedQuery<'a, Pg>, for_user_id: i32, sort: &'a SortType, unread_only: bool, @@ -375,9 +376,9 @@ pub struct ReplyQueryBuilder<'a> { impl<'a> ReplyQueryBuilder<'a> { pub fn create(conn: &'a PgConnection, for_user_id: i32) -> Self { - use super::comment_view::reply_view::dsl::*; + use super::comment_view::reply_fast_view::dsl::*; - let query = reply_view.into_boxed(); + let query = reply_fast_view.into_boxed(); ReplyQueryBuilder { conn, @@ -411,7 +412,7 @@ impl<'a> ReplyQueryBuilder<'a> { } pub fn list(self) -> Result, Error> { - use super::comment_view::reply_view::dsl::*; + use super::comment_view::reply_fast_view::dsl::*; let mut query = self.query; @@ -615,8 +616,8 @@ mod tests { upvotes: 1, user_id: Some(inserted_user.id), my_vote: Some(1), - subscribed: None, - saved: None, + subscribed: Some(false), + saved: Some(false), ap_id: "http://fake.com".to_string(), local: true, community_actor_id: inserted_community.actor_id.to_owned(), diff --git a/server/src/db/community_view.rs b/server/src/db/community_view.rs index ea7b2a7ca..4ec839acf 100644 --- a/server/src/db/community_view.rs +++ b/server/src/db/community_view.rs @@ -1,4 +1,4 @@ -use super::community_view::community_mview::BoxedQuery; +use super::community_view::community_fast_view::BoxedQuery; use crate::db::{fuzzy_search, limit_and_offset, MaybeOptional, SortType}; use diesel::{pg::Pg, result::Error, *}; use serde::{Deserialize, Serialize}; @@ -34,7 +34,7 @@ table! { } table! { - community_mview (id) { + community_fast_view (id) { id -> Int4, name -> Varchar, title -> Varchar, @@ -114,7 +114,7 @@ table! { #[derive( Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize, QueryableByName, Clone, )] -#[table_name = "community_view"] +#[table_name = "community_fast_view"] pub struct CommunityView { pub id: i32, pub name: String, @@ -156,9 +156,9 @@ pub struct CommunityQueryBuilder<'a> { impl<'a> CommunityQueryBuilder<'a> { pub fn create(conn: &'a PgConnection) -> Self { - use super::community_view::community_mview::dsl::*; + use super::community_view::community_fast_view::dsl::*; - let query = community_mview.into_boxed(); + let query = community_fast_view.into_boxed(); CommunityQueryBuilder { conn, @@ -203,7 +203,7 @@ impl<'a> CommunityQueryBuilder<'a> { } pub fn list(self) -> Result, Error> { - use super::community_view::community_mview::dsl::*; + use super::community_view::community_fast_view::dsl::*; let mut query = self.query; @@ -259,9 +259,9 @@ impl CommunityView { from_community_id: i32, from_user_id: Option, ) -> Result { - use super::community_view::community_mview::dsl::*; + use super::community_view::community_fast_view::dsl::*; - let mut query = community_mview.into_boxed(); + let mut query = community_fast_view.into_boxed(); query = query.filter(id.eq(from_community_id)); diff --git a/server/src/db/post_view.rs b/server/src/db/post_view.rs index fbbf658d3..808cf28c4 100644 --- a/server/src/db/post_view.rs +++ b/server/src/db/post_view.rs @@ -1,4 +1,4 @@ -use super::post_view::post_mview::BoxedQuery; +use super::post_view::post_fast_view::BoxedQuery; use crate::db::{fuzzy_search, limit_and_offset, ListingType, MaybeOptional, SortType}; use diesel::{dsl::*, pg::Pg, result::Error, *}; use serde::{Deserialize, Serialize}; @@ -25,12 +25,12 @@ table! { thumbnail_url -> Nullable, ap_id -> Text, local -> Bool, - banned -> Bool, - banned_from_community -> Bool, creator_actor_id -> Text, creator_local -> Bool, creator_name -> Varchar, creator_avatar -> Nullable, + banned -> Bool, + banned_from_community -> Bool, community_actor_id -> Text, community_local -> Bool, community_name -> Varchar, @@ -52,7 +52,7 @@ table! { } table! { - post_mview (id) { + post_fast_view (id) { id -> Int4, name -> Varchar, url -> Nullable, @@ -72,12 +72,12 @@ table! { thumbnail_url -> Nullable, ap_id -> Text, local -> Bool, - banned -> Bool, - banned_from_community -> Bool, creator_actor_id -> Text, creator_local -> Bool, creator_name -> Varchar, creator_avatar -> Nullable, + banned -> Bool, + banned_from_community -> Bool, community_actor_id -> Text, community_local -> Bool, community_name -> Varchar, @@ -101,7 +101,7 @@ table! { #[derive( Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize, QueryableByName, Clone, )] -#[table_name = "post_view"] +#[table_name = "post_fast_view"] pub struct PostView { pub id: i32, pub name: String, @@ -122,12 +122,12 @@ pub struct PostView { pub thumbnail_url: Option, pub ap_id: String, pub local: bool, - pub banned: bool, - pub banned_from_community: bool, pub creator_actor_id: String, pub creator_local: bool, pub creator_name: String, pub creator_avatar: Option, + pub banned: bool, + pub banned_from_community: bool, pub community_actor_id: String, pub community_local: bool, pub community_name: String, @@ -166,9 +166,9 @@ pub struct PostQueryBuilder<'a> { impl<'a> PostQueryBuilder<'a> { pub fn create(conn: &'a PgConnection) -> Self { - use super::post_view::post_mview::dsl::*; + use super::post_view::post_fast_view::dsl::*; - let query = post_mview.into_boxed(); + let query = post_fast_view.into_boxed(); PostQueryBuilder { conn, @@ -249,7 +249,7 @@ impl<'a> PostQueryBuilder<'a> { } pub fn list(self) -> Result, Error> { - use super::post_view::post_mview::dsl::*; + use super::post_view::post_fast_view::dsl::*; let mut query = self.query; @@ -345,10 +345,10 @@ impl PostView { from_post_id: i32, my_user_id: Option, ) -> Result { - use super::post_view::post_mview::dsl::*; + use super::post_view::post_fast_view::dsl::*; use diesel::prelude::*; - let mut query = post_mview.into_boxed(); + let mut query = post_fast_view.into_boxed(); query = query.filter(id.eq(from_post_id)); @@ -470,6 +470,25 @@ mod tests { score: 1, }; + let read_post_listings_with_user = PostQueryBuilder::create(&conn) + .listing_type(ListingType::Community) + .sort(&SortType::New) + .for_community_id(inserted_community.id) + .my_user_id(inserted_user.id) + .list() + .unwrap(); + + let read_post_listings_no_user = PostQueryBuilder::create(&conn) + .listing_type(ListingType::Community) + .sort(&SortType::New) + .for_community_id(inserted_community.id) + .list() + .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(); + // the non user version let expected_post_listing_no_user = PostView { user_id: None, @@ -496,7 +515,7 @@ mod tests { score: 1, upvotes: 1, downvotes: 0, - hot_rank: 1728, + hot_rank: read_post_listing_no_user.hot_rank, published: inserted_post.published, newest_activity_time: inserted_post.published, updated: None, @@ -541,13 +560,13 @@ mod tests { score: 1, upvotes: 1, downvotes: 0, - hot_rank: 1728, + hot_rank: read_post_listing_with_user.hot_rank, published: inserted_post.published, newest_activity_time: inserted_post.published, updated: None, - subscribed: None, - read: None, - saved: None, + subscribed: Some(false), + read: Some(false), + saved: Some(false), nsfw: false, embed_title: None, embed_description: None, @@ -561,25 +580,6 @@ mod tests { community_local: true, }; - let read_post_listings_with_user = PostQueryBuilder::create(&conn) - .listing_type(ListingType::Community) - .sort(&SortType::New) - .for_community_id(inserted_community.id) - .my_user_id(inserted_user.id) - .list() - .unwrap(); - - let read_post_listings_no_user = PostQueryBuilder::create(&conn) - .listing_type(ListingType::Community) - .sort(&SortType::New) - .for_community_id(inserted_community.id) - .list() - .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(); - let like_removed = PostLike::remove(&conn, &post_like_form).unwrap(); let num_deleted = Post::delete(&conn, inserted_post.id).unwrap(); Community::delete(&conn, inserted_community.id).unwrap(); diff --git a/server/src/db/private_message_view.rs b/server/src/db/private_message_view.rs index 9a1df4397..899a1084d 100644 --- a/server/src/db/private_message_view.rs +++ b/server/src/db/private_message_view.rs @@ -26,29 +26,6 @@ table! { } } -table! { - private_message_mview (id) { - id -> Int4, - creator_id -> Int4, - recipient_id -> Int4, - content -> Text, - deleted -> Bool, - read -> Bool, - published -> Timestamp, - updated -> Nullable, - ap_id -> Text, - local -> Bool, - creator_name -> Varchar, - creator_avatar -> Nullable, - creator_actor_id -> Text, - creator_local -> Bool, - recipient_name -> Varchar, - recipient_avatar -> Nullable, - recipient_actor_id -> Text, - recipient_local -> Bool, - } -} - #[derive( Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize, QueryableByName, Clone, )] @@ -76,7 +53,7 @@ pub struct PrivateMessageView { pub struct PrivateMessageQueryBuilder<'a> { conn: &'a PgConnection, - query: super::private_message_view::private_message_mview::BoxedQuery<'a, Pg>, + query: super::private_message_view::private_message_view::BoxedQuery<'a, Pg>, for_recipient_id: i32, unread_only: bool, page: Option, @@ -85,9 +62,9 @@ pub struct PrivateMessageQueryBuilder<'a> { impl<'a> PrivateMessageQueryBuilder<'a> { pub fn create(conn: &'a PgConnection, for_recipient_id: i32) -> Self { - use super::private_message_view::private_message_mview::dsl::*; + use super::private_message_view::private_message_view::dsl::*; - let query = private_message_mview.into_boxed(); + let query = private_message_view.into_boxed(); PrivateMessageQueryBuilder { conn, @@ -115,7 +92,7 @@ impl<'a> PrivateMessageQueryBuilder<'a> { } pub fn list(self) -> Result, Error> { - use super::private_message_view::private_message_mview::dsl::*; + use super::private_message_view::private_message_view::dsl::*; let mut query = self.query.filter(deleted.eq(false)); diff --git a/server/src/db/user_mention_view.rs b/server/src/db/user_mention_view.rs index 100445b99..59aefb200 100644 --- a/server/src/db/user_mention_view.rs +++ b/server/src/db/user_mention_view.rs @@ -40,7 +40,7 @@ table! { } table! { - user_mention_mview (id) { + user_mention_fast_view (id) { id -> Int4, user_mention_id -> Int4, creator_id -> Int4, @@ -78,7 +78,7 @@ table! { #[derive( Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize, QueryableByName, Clone, )] -#[table_name = "user_mention_view"] +#[table_name = "user_mention_fast_view"] pub struct UserMentionView { pub id: i32, pub user_mention_id: i32, @@ -115,7 +115,7 @@ pub struct UserMentionView { pub struct UserMentionQueryBuilder<'a> { conn: &'a PgConnection, - query: super::user_mention_view::user_mention_mview::BoxedQuery<'a, Pg>, + query: super::user_mention_view::user_mention_fast_view::BoxedQuery<'a, Pg>, for_user_id: i32, sort: &'a SortType, unread_only: bool, @@ -125,9 +125,9 @@ pub struct UserMentionQueryBuilder<'a> { impl<'a> UserMentionQueryBuilder<'a> { pub fn create(conn: &'a PgConnection, for_user_id: i32) -> Self { - use super::user_mention_view::user_mention_mview::dsl::*; + use super::user_mention_view::user_mention_fast_view::dsl::*; - let query = user_mention_mview.into_boxed(); + let query = user_mention_fast_view.into_boxed(); UserMentionQueryBuilder { conn, @@ -161,7 +161,7 @@ impl<'a> UserMentionQueryBuilder<'a> { } pub fn list(self) -> Result, Error> { - use super::user_mention_view::user_mention_mview::dsl::*; + use super::user_mention_view::user_mention_fast_view::dsl::*; let mut query = self.query; @@ -208,9 +208,9 @@ impl UserMentionView { from_user_mention_id: i32, from_recipient_id: i32, ) -> Result { - use super::user_mention_view::user_mention_view::dsl::*; + use super::user_mention_view::user_mention_fast_view::dsl::*; - user_mention_view + user_mention_fast_view .filter(user_mention_id.eq(from_user_mention_id)) .filter(user_id.eq(from_recipient_id)) .first::(conn) diff --git a/server/src/db/user_view.rs b/server/src/db/user_view.rs index 57e2a4c9c..490521721 100644 --- a/server/src/db/user_view.rs +++ b/server/src/db/user_view.rs @@ -1,4 +1,4 @@ -use super::user_view::user_mview::BoxedQuery; +use super::user_view::user_fast::BoxedQuery; use crate::db::{fuzzy_search, limit_and_offset, MaybeOptional, SortType}; use diesel::{dsl::*, pg::Pg, result::Error, *}; use serde::{Deserialize, Serialize}; @@ -26,7 +26,7 @@ table! { } table! { - user_mview (id) { + user_fast (id) { id -> Int4, actor_id -> Text, name -> Varchar, @@ -50,7 +50,7 @@ table! { #[derive( Queryable, Identifiable, PartialEq, Debug, Serialize, Deserialize, QueryableByName, Clone, )] -#[table_name = "user_view"] +#[table_name = "user_fast"] pub struct UserView { pub id: i32, pub actor_id: String, @@ -81,9 +81,9 @@ pub struct UserQueryBuilder<'a> { impl<'a> UserQueryBuilder<'a> { pub fn create(conn: &'a PgConnection) -> Self { - use super::user_view::user_mview::dsl::*; + use super::user_view::user_fast::dsl::*; - let query = user_mview.into_boxed(); + let query = user_fast.into_boxed(); UserQueryBuilder { conn, @@ -100,7 +100,7 @@ impl<'a> UserQueryBuilder<'a> { } pub fn search_term>(mut self, search_term: T) -> Self { - use super::user_view::user_mview::dsl::*; + use super::user_view::user_fast::dsl::*; if let Some(search_term) = search_term.get_optional() { self.query = self.query.filter(name.ilike(fuzzy_search(&search_term))); } @@ -118,7 +118,7 @@ impl<'a> UserQueryBuilder<'a> { } pub fn list(self) -> Result, Error> { - use super::user_view::user_mview::dsl::*; + use super::user_view::user_fast::dsl::*; let mut query = self.query; @@ -151,17 +151,17 @@ impl<'a> UserQueryBuilder<'a> { impl UserView { pub fn read(conn: &PgConnection, from_user_id: i32) -> Result { - use super::user_view::user_mview::dsl::*; - user_mview.find(from_user_id).first::(conn) + use super::user_view::user_fast::dsl::*; + user_fast.find(from_user_id).first::(conn) } pub fn admins(conn: &PgConnection) -> Result, Error> { - use super::user_view::user_mview::dsl::*; - user_mview.filter(admin.eq(true)).load::(conn) + use super::user_view::user_fast::dsl::*; + user_fast.filter(admin.eq(true)).load::(conn) } pub fn banned(conn: &PgConnection) -> Result, Error> { - use super::user_view::user_mview::dsl::*; - user_mview.filter(banned.eq(true)).load::(conn) + use super::user_view::user_fast::dsl::*; + user_fast.filter(banned.eq(true)).load::(conn) } } diff --git a/server/src/schema.rs b/server/src/schema.rs index 8096d3010..0367c7506 100644 --- a/server/src/schema.rs +++ b/server/src/schema.rs @@ -33,6 +33,37 @@ table! { } } +table! { + comment_aggregates_fast (id) { + id -> Int4, + creator_id -> Nullable, + post_id -> Nullable, + parent_id -> Nullable, + content -> Nullable, + removed -> Nullable, + read -> Nullable, + published -> Nullable, + updated -> Nullable, + deleted -> Nullable, + ap_id -> Nullable, + local -> Nullable, + community_id -> Nullable, + community_actor_id -> Nullable, + community_local -> Nullable, + community_name -> Nullable, + banned -> Nullable, + banned_from_community -> Nullable, + creator_actor_id -> Nullable, + creator_local -> Nullable, + creator_name -> Nullable, + creator_avatar -> Nullable, + score -> Nullable, + upvotes -> Nullable, + downvotes -> Nullable, + hot_rank -> Nullable, + } +} + table! { comment_like (id) { id -> Int4, @@ -74,6 +105,34 @@ table! { } } +table! { + community_aggregates_fast (id) { + id -> Int4, + name -> Nullable, + title -> Nullable, + description -> Nullable, + category_id -> Nullable, + creator_id -> Nullable, + removed -> Nullable, + published -> Nullable, + updated -> Nullable, + deleted -> Nullable, + nsfw -> Nullable, + actor_id -> Nullable, + local -> Nullable, + last_refreshed_at -> Nullable, + creator_actor_id -> Nullable, + creator_local -> Nullable, + creator_name -> Nullable, + creator_avatar -> Nullable, + category_name -> Nullable, + number_of_subscribers -> Nullable, + number_of_posts -> Nullable, + number_of_comments -> Nullable, + hot_rank -> Nullable, + } +} + table! { community_follower (id) { id -> Int4, @@ -234,6 +293,48 @@ table! { } } +table! { + post_aggregates_fast (id) { + id -> Int4, + name -> Nullable, + url -> Nullable, + body -> Nullable, + creator_id -> Nullable, + community_id -> Nullable, + removed -> Nullable, + locked -> Nullable, + published -> Nullable, + updated -> Nullable, + deleted -> Nullable, + nsfw -> Nullable, + stickied -> Nullable, + embed_title -> Nullable, + embed_description -> Nullable, + embed_html -> Nullable, + thumbnail_url -> Nullable, + ap_id -> Nullable, + local -> Nullable, + creator_actor_id -> Nullable, + creator_local -> Nullable, + creator_name -> Nullable, + creator_avatar -> Nullable, + banned -> Nullable, + banned_from_community -> Nullable, + community_actor_id -> Nullable, + community_local -> Nullable, + community_name -> Nullable, + community_removed -> Nullable, + community_deleted -> Nullable, + community_nsfw -> Nullable, + number_of_comments -> Nullable, + score -> Nullable, + upvotes -> Nullable, + downvotes -> Nullable, + hot_rank -> Nullable, + newest_activity_time -> Nullable, + } +} + table! { post_like (id) { id -> Int4, @@ -328,6 +429,28 @@ table! { } } +table! { + user_fast (id) { + id -> Int4, + actor_id -> Nullable, + name -> Nullable, + avatar -> Nullable, + email -> Nullable, + matrix_user_id -> Nullable, + bio -> Nullable, + local -> Nullable, + admin -> Nullable, + banned -> Nullable, + show_avatars -> Nullable, + send_notifications_to_email -> Nullable, + published -> Nullable, + number_of_posts -> Nullable, + post_score -> Nullable, + number_of_comments -> Nullable, + comment_score -> Nullable, + } +} + table! { user_mention (id) { id -> Int4, @@ -384,9 +507,11 @@ allow_tables_to_appear_in_same_query!( activity, category, comment, + comment_aggregates_fast, comment_like, comment_saved, community, + community_aggregates_fast, community_follower, community_moderator, community_user_ban, @@ -401,6 +526,7 @@ allow_tables_to_appear_in_same_query!( mod_sticky_post, password_reset_request, post, + post_aggregates_fast, post_like, post_read, post_saved, @@ -408,5 +534,6 @@ allow_tables_to_appear_in_same_query!( site, user_, user_ban, + user_fast, user_mention, ); diff --git a/ui/src/utils.ts b/ui/src/utils.ts index 747be7cdf..f65ca4e37 100644 --- a/ui/src/utils.ts +++ b/ui/src/utils.ts @@ -923,7 +923,7 @@ export function postSort( +a.removed - +b.removed || +a.deleted - +b.deleted || (communityType && +b.stickied - +a.stickied) || - hotRankPost(b) - hotRankPost(a) + b.hot_rank - a.hot_rank ); } } From 8fda7d00d5ec9e415b44aa10cff3c4d735563a20 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Tue, 7 Jul 2020 11:07:51 -0400 Subject: [PATCH 35/74] Version v0.7.12 --- ansible/VERSION | 2 +- docker/prod/docker-compose.yml | 2 +- server/src/version.rs | 2 +- ui/src/version.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/VERSION b/ansible/VERSION index 076cd4b2b..98f166f96 100644 --- a/ansible/VERSION +++ b/ansible/VERSION @@ -1 +1 @@ -v0.7.11 +v0.7.12 diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 698d2ba6b..c07ad5327 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.7.11 + image: dessalines/lemmy:v0.7.12 ports: - "127.0.0.1:8536:8536" restart: always diff --git a/server/src/version.rs b/server/src/version.rs index ca1a5dc73..cfac62945 100644 --- a/server/src/version.rs +++ b/server/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "v0.7.11"; +pub const VERSION: &str = "v0.7.12"; diff --git a/ui/src/version.ts b/ui/src/version.ts index 942ebfbed..96c1c305e 100644 --- a/ui/src/version.ts +++ b/ui/src/version.ts @@ -1 +1 @@ -export const version: string = 'v0.7.11'; +export const version: string = 'v0.7.12'; From b6be84c909e4c68543bd408269a32d422a33b8d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=ABr=C3=AB=20R=C3=ABr=C3=AB?= Date: Tue, 7 Jul 2020 16:54:33 +0000 Subject: [PATCH 36/74] Translated using Weblate (Albanian) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/sq/ --- ui/translations/sq.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/translations/sq.json b/ui/translations/sq.json index 8504a1b97..3a45389fc 100644 --- a/ui/translations/sq.json +++ b/ui/translations/sq.json @@ -1,11 +1,11 @@ { "remove_post": "Hiqe Postimin", "no_posts": "Nuk ka Postime.", - "create_a_post": "Krijo Postim", + "create_a_post": "Krijo një Postim", "create_post": "Krijo Postim", "posts": "Postime", "related_posts": "Këto postime mund të jenë të lidhura", - "cross_posts": "Ky link është postuar edhe te:", + "cross_posts": "Ky link është postuar gjithashtu në:", "cross_post": "shumë-postim", "cross_posted_to": "shumë-postuar në: ", "comments": "Komentet", From c4e25c8d9cc42ffcba61b52dbcca665ea83caddb Mon Sep 17 00:00:00 2001 From: Adolfo Jayme Barrientos Date: Tue, 7 Jul 2020 16:54:33 +0000 Subject: [PATCH 37/74] Translated using Weblate (Catalan) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/ca/ Translated using Weblate (Spanish) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/es/ Translated using Weblate (Catalan) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/ca/ --- ui/translations/ca.json | 347 +++++++++++++++++++++------------------- ui/translations/es.json | 2 +- 2 files changed, 186 insertions(+), 163 deletions(-) diff --git a/ui/translations/ca.json b/ui/translations/ca.json index e238ffa72..79da8b35b 100644 --- a/ui/translations/ca.json +++ b/ui/translations/ca.json @@ -1,99 +1,105 @@ { - "post": "Publicar", - "remove_post": "Eliminar publicació", - "no_posts": "Sense publicacions.", - "create_a_post": "Crear una publicació", - "create_post": "Crear Publicació", - "number_of_posts": "{{count}} Publicacions", - "posts": "Publicacions", - "related_posts": "Aquestes publicacions podrien estar relacionades", - "cross_posts": "Aquest link també ha sigut publicat en:", - "cross_post": "cross-post", + "post": "apunt", + "remove_post": "Suprimeix l’apunt", + "no_posts": "No hi ha cap apunt.", + "create_a_post": "Crea un apunt", + "create_post": "Crea un apunt", + "number_of_posts": "{{count}} apunt", + "number_of_posts_plural": "{{count}} apunts", + "posts": "Apunts", + "related_posts": "Aquests apunts podrien estar relacionats", + "cross_posts": "Aquest enllaç també s’ha publicat en:", + "cross_post": "apunt transversal", "comments": "Comentaris", - "number_of_comments": "{{count}} Comentaris", - "remove_comment": "Eliminar Comentaris", + "number_of_comments": "{{count}} comentari", + "number_of_comments_plural": "{{count}} comentaris", + "remove_comment": "Suprimeix el comentari", "communities": "Comunitats", "users": "Usuaris", - "create_a_community": "Crear una comunitat", - "create_community": "Crear Comunitat", - "remove_community": "Eliminar Comunitat", + "create_a_community": "Crea una comunitat", + "create_community": "Crea una comunitat", + "remove_community": "Suprimeix la comunitat", "subscribed_to_communities": "Subscrit a <1>comunitats", "trending_communities": "<1>Comunitats en tendència", "list_of_communities": "Llista de comunitats", - "number_of_communities": "{{count}} Comunitats", + "number_of_communities": "{{count}} comunitat", + "number_of_communities_plural": "{{count}} comunitats", "community_reqs": "minúscules, guió baix, i sense espais.", - "create_private_message": "Crear Missatge Privat", - "send_secure_message": "Enviar Missatge Segur", - "send_message": "Enviar Missatge", + "create_private_message": "Crea un missatge privat", + "send_secure_message": "Envia un missatge segur", + "send_message": "Envia el missatge", "message": "Missatge", - "edit": "editar", - "reply": "respondre", - "cancel": "Cancelar", - "preview": "Previsualitzar", - "upload_image": "pujar imatge", + "edit": "edita", + "reply": "respon", + "cancel": "Cancel·la", + "preview": "Previsualitza", + "upload_image": "puja una imatge", "avatar": "Avatar", - "upload_avatar": "Pujar Avatar", - "show_avatars": "Veure Avatares", - "formatting_help": "Ajuda de format", - "view_source": "veure font", - "unlock": "desbloquejar", - "lock": "bloquejar", + "upload_avatar": "Puja un avatar", + "show_avatars": "Mostra els avatars", + "formatting_help": "ajuda amb la formatació", + "view_source": "mostra’n el codi font", + "unlock": "desbloca", + "lock": "bloca", "sticky": "fijat", "unsticky": "no fijat", - "link": "link", - "archive_link": "arxivar link", + "link": "enllaç", + "archive_link": "enllaç de l’arxiu", "mod": "moderador", "mods": "moderadores", "moderates": "Modera", "settings": "Configuració", - "remove_as_mod": "eliminar com moderador", - "appoint_as_mod": "designar com moderador", + "remove_as_mod": "suprimeix com a moderador", + "appoint_as_mod": "designa com a moderador", "modlog": "Historial de moderació", "admin": "administrador", "admins": "administradors", - "remove_as_admin": "eliminar com administrador", - "appoint_as_admin": "designar com administrador", - "remove": "eliminar", - "removed": "eliminat", - "locked": "bloquejat", + "remove_as_admin": "suprimeix com a administrador", + "appoint_as_admin": "designa com a administrador", + "remove": "suprimeix", + "removed": "suprimit pel moderador", + "locked": "blocat", "stickied": "fijat", "reason": "Raó", - "mark_as_read": "marcar com llegit", - "mark_as_unread": "marcar com no llegit", - "delete": "eliminar", - "deleted": "eliminat", - "delete_account": "Eliminar Compte", - "delete_account_confirm": - "Avís: aquesta acció eliminarà permanentment la teva informació. Introdueix la teva contrasenya per a continuar", - "restore": "restaurar", - "ban": "expulsar", - "ban_from_site": "expulsar del lloc", - "unban": "admetre", - "unban_from_site": "admetre al lloc", + "mark_as_read": "marca com a llegit", + "mark_as_unread": "marca com a no llegit", + "delete": "suprimeix", + "deleted": "suprimit pel creador", + "delete_account": "Suprimeix el compte", + "delete_account_confirm": "Atenció: aquesta acció suprimirà permanentment la vostra informació. Introduïu la vostra contrasenya per a confirmar.", + "restore": "restaura", + "ban": "expulsa", + "ban_from_site": "expulsa del lloc", + "unban": "readmet", + "unban_from_site": "readmet al lloc", "banned": "expulsat", - "save": "guardar", - "unsave": "descartar", - "create": "crear", + "save": "desa", + "unsave": "descarta", + "create": "crea", "creator": "creador", - "username": "Nom d'Usuari", - "email_or_username": "Correu o Usuari", - "number_of_users": "{{count}} Usuaris", - "number_of_subscribers": "{{count}} Subscriptors", - "number_of_points": "{{count}} Punts", - "number_online": "{{count}} Usauris En Línia", + "username": "Nom d’usuari", + "email_or_username": "Adreça electrònica o usuari", + "number_of_users": "{{count}} usuari", + "number_of_users_plural": "{{count}} usuaris", + "number_of_subscribers": "{{count}} subscriptor", + "number_of_subscribers_plural": "{{count}} subscriptors", + "number_of_points": "{{count}} punt", + "number_of_points_plural": "{{count}} punts", + "number_online": "{{count}} usuari en línia", + "number_online_plural": "{{count}} usuaris en línia", "name": "Nom", - "title": "Titol", + "title": "Títol", "category": "Categoria", - "subscribers": "Suscriptors", - "both": "Ambdos", - "saved": "Guardat", - "unsubscribe": "Desubscriure's", - "subscribe": "Subscriure's", + "subscribers": "Subscriptors", + "both": "Tots dos", + "saved": "Desat", + "unsubscribe": "Dóna’t de baixa", + "subscribe": "Subscriu-t’hi", "subscribed": "Subscrit", "prev": "Anterior", "next": "Següent", - "sidebar": "Descripció de la comunitat", - "sort_type": "Tipus d'orden", + "sidebar": "Barra lateral", + "sort_type": "Tipus d’ordenació", "hot": "Popular", "new": "Nou", "top_day": "El millor del dia", @@ -103,75 +109,71 @@ "all": "Tot", "top": "Millor", "api": "API", - "docs": "Docs", - "inbox": "Bústia d'entrada", - "inbox_for": "Bústia d'entrada per a <1>{{user}}", - "mark_all_as_read": "marcar tot com llegit", + "docs": "Documentació", + "inbox": "Bústia d’entrada", + "inbox_for": "Bústia d’entrada per a <1>{{user}}", + "mark_all_as_read": "marca-ho tot com a llegit", "type": "Tipus", "unread": "No llegit", "replies": "Respostes", - "mentions": "Menciones", - "reply_sent": "Resposta enviada", - "message_sent": "Missatge enviado", - "search": "Buscar", - "overview": "Resum", + "mentions": "Mencions", + "reply_sent": "La resposta ha estat enviada", + "message_sent": "El missatge ha estat enviat", + "search": "Cerca", + "overview": "Visió de conjunt", "view": "Vista", - "logout": "Tancar sessió", - "login_sign_up": "Iniciar sessió / Crear compte", - "login": "Iniciar sessió", - "sign_up": "Crear compte", - "notifications_error": - "Notificacions d'escriptori no disponibles al teu navegador. Prova amb Firefox o Chrome.", + "logout": "Finalitza la sessió", + "login_sign_up": "Inicia una sessió / crea un compte", + "login": "Inicia una sessió", + "sign_up": "Crea un compte", + "notifications_error": "Les notificacions d’escriptori no estan disponibles al vostre navegador. Proveu amb el Firefox o el Chrome.", "unread_messages": "Missatges no llegits", "messages": "Missatges", "password": "Contrasenya", - "verify_password": "Verificar Contrasenya", - "old_password": "Antiga Contrasenya", - "forgot_password": "oblidí la meva contrasenya", - "reset_password_mail_sent": "Enviar correu per a restablir la contrasenya.", - "password_change": "Canvi de Contrasenya", - "new_password": "Nueva Contrasenya", - "no_email_setup": "Aquest servidor no ha activat correctament el correu.", + "verify_password": "Verifica la contrasenya", + "old_password": "Contrasenya antiga", + "forgot_password": "vaig oblidar la meva contrasenya", + "reset_password_mail_sent": "Hem enviat un missatge per correu per a restablir la contrasenya.", + "password_change": "Canvi de contrasenya", + "new_password": "Contrasenya nova", + "no_email_setup": "Aquest servidor no ha configurat correctament el correu.", "email": "Correu electrònic", - "matrix_user_id": "Usuari Matricial", - "private_message_disclaimer": - "Avís: Els missatges privats en Lemmy no són segurs. Sisplau creu un compte en <1>Riot.im per a mensajeria segura.", - "send_notifications_to_email": "Enviar notificacions al correu", + "matrix_user_id": "Usuari del Matrix", + "private_message_disclaimer": "Atenció: els missatges privats al Lemmy no són segurs. Creeu-vos un compte a <1>Riot.im per a una missatgeria segura.", + "send_notifications_to_email": "Envia notificacions al correu", "optional": "Opcional", "expires": "Expira", - "language": "Llenguatge", + "language": "Llengua", "browser_default": "Per defecte del navegador", - "downvotes_disabled": "Vots negatius deshabilitats", - "enable_downvotes": "Habilitar vots negatius", - "open_registration": "Obrir registre", - "registration_closed": "Registre tancat", - "enable_nsfw": "Habilitar NSFW", + "downvotes_disabled": "Vots negatius inhabilitats", + "enable_downvotes": "Habilita els vots negatius", + "open_registration": "Obre els registres", + "registration_closed": "S’han tancat els registres", + "enable_nsfw": "Habilita el contingut per a adults", "url": "URL", - "body": "Descripció", - "copy_suggested_title": "Copiar el títol sugerido: {{title}}", + "body": "Corps", + "copy_suggested_title": "copia el títol suggerit: {{title}}", "community": "Comunitat", - "expand_here": "Expandir ací", - "subscribe_to_communities": "Subscriure's a algunes <1>comunitats.", - "chat": "Chat", + "expand_here": "Expandeix ací", + "subscribe_to_communities": "Subscriviu-vos a algunes <1>comunitats.", + "chat": "Xat", "recent_comments": "Comentaris recients", "no_results": "Sense resultats.", "setup": "Configurar", - "lemmy_instance_setup": "Configuració d'instancia de Lemmy", - "setup_admin": "Configurar administrador del Lloc", - "your_site": "el teu lloc", + "lemmy_instance_setup": "Configuració d’instància del Lemmy", + "setup_admin": "Configura administrador del lloc", + "your_site": "el vostre lloc", "modified": "modificat", - "nsfw": "NSFW", - "show_nsfw": "Mostrar contingut NSFW", + "nsfw": "Per a adults", + "show_nsfw": "Mostra el contingut per a adults", "theme": "Tema", "sponsors": "Patrocinadors", - "sponsors_of_lemmy": "Patrocinadors de Lemmy", - "sponsor_message": - "Lemmy és programari lliure i de <1>codi obert, la qual cosa significa que no tindrà publicitats, monetització, ni capitals emprenedors, mai. Les teves donacions secunden directament el desenvolupament a temps complet del projecte. Moltes gràcies a les següents persones:", - "support_on_patreon": "Suport a Patreon", + "sponsors_of_lemmy": "Patrocinadors del Lemmy", + "sponsor_message": "El Lemmy és programari lliure i de <1>codi obert, la qual cosa significa que no tindrà publicitats, monetització, ni capitals emprenedors, mai. Les vostres donacions donen suport directament al desenvolupament a temps complet del projecte. Moltes gràcies a les següents persones:", + "support_on_patreon": "Suport al Patreon", "donate_to_lemmy": "Donar a Lemmy", - "donate": "Donar", - "general_sponsors": - "Los Patrocinadores Generales son aquellos que señaron entre $10 y $39 a Lemmy.", + "donate": "Dona", + "general_sponsors": "Els patrocinadors generals són aquells que es van comprometre a donar entre 10 y 39 $ al Lemmy.", "crypto": "Crypto", "bitcoin": "Bitcoin", "ethereum": "Ethereum", @@ -181,57 +183,78 @@ "by": "per", "to": "a", "from": "des de", - "transfer_community": "transferir comunitat", - "transfer_site": "transferir lloc", - "are_you_sure": "Ets segur?", + "transfer_community": "transfereix la comunitat", + "transfer_site": "transfereix el lloc", + "are_you_sure": "n’esteu segur?", "yes": "sí", "no": "no", - "powered_by": "Impulsat per", - "landing_0": - "Lemmy és un <1>agregador de links / alternativa a reddit, amb la intenció de funcionar al <2>fedivers.<3>És allotjable per un mateix (sense necessitat de grans companyies), té actualització en directe de cadenes de comentaris, i és petit (<4>~80kB). Federar amb el sistema de xarxes ActivityPub forma part dels objectius del projecte. <5>Aquesta és una <6>versió beta molt prematura, i actualment moltes de les característiques són trencades o falten. <7>Suggereix noves característiques o reporta errors <8>aquí.<9>Fet amb <10>Rust, <11>Actix, <12>Inferno, <13>Typescript.", - "not_logged_in": "No has iniciat sessió.", - "logged_in": "Has iniciat sessió.", - "community_ban": "Has sigut expulsat d'aquesta comunitat.", - "site_ban": "Has sigut expulsat d'aquest lloc.", - "couldnt_create_comment": "No s'ha pogut crear el comentari.", - "couldnt_like_comment": "No s'ha pogut donar m'agrada al comentari.", - "couldnt_update_comment": "No s'ha pogut actualitzar el comentari.", - "couldnt_save_comment": "No s'ha pogut guardar el comentari.", - "no_comment_edit_allowed": "No tens permisos per a editar el comentari.", - "no_post_edit_allowed": "No tens permisos per a editar la publicació.", - "no_community_edit_allowed": "No tens permisos per a editar la comunitat.", - "couldnt_find_community": "No s'ha pogut trobar la comunitat.", - "couldnt_update_community": "No s'ha pogut actualitzar la comunitat.", + "powered_by": "Funciona amb", + "landing_0": "Lemmy és un <1>agregador de links / alternativa a reddit, amb la intenció de funcionar al <2>fedivers.<3>És allotjable per un mateix (sense necessitat de grans companyies), té actualització en directe de cadenes de comentaris, i és petit (<4>~80kB). Federar amb el sistema de xarxes ActivityPub forma part dels objectius del projecte. <5>Aquesta és una <6>versió beta molt prematura, i actualment moltes de les característiques són trencades o falten. <7>Suggereix noves característiques o reporta errors <8>aquí.<9>Fet amb <10>Rust, <11>Actix, <12>Inferno, <13>Typescript.", + "not_logged_in": "No heu iniciat una sessió.", + "logged_in": "Heu iniciat una sessió.", + "community_ban": "Us han expulsat d’aquesta comunitat.", + "site_ban": "Us han expulsat del lloc", + "couldnt_create_comment": "No s’ha pogut crear el comentari.", + "couldnt_like_comment": "No s’ha pogut donar «m’agrada» al comentari.", + "couldnt_update_comment": "No s’ha pogut actualitzar el comentari.", + "couldnt_save_comment": "No s’ha pogut desar el comentari.", + "no_comment_edit_allowed": "No teniu permisos per a editar el comentari.", + "no_post_edit_allowed": "No teniu permisos per a editar l’apunt.", + "no_community_edit_allowed": "No teniu permisos per a editar la comunitat.", + "couldnt_find_community": "No s’ha pogut trobar la comunitat.", + "couldnt_update_community": "No s’ha pogut actualitzar la comunitat.", "community_already_exists": "Aquesta comunitat ja existeix.", - "community_moderator_already_exists": - "Aquest moderador de la comunitat ja existeix.", - "community_follower_already_exists": - "Aquest seguidor de la comunitat ja existeix.", - "community_user_already_banned": - "Aquest usuari de la comunitat ja fou expulsat.", - "couldnt_create_post": "No s'ha pogut crear la publicació.", - "couldnt_like_post": "No s'ha pogut donar m'agrada a la publicació.", - "couldnt_find_post": "No s'ha pogut trobar la publicació.", - "couldnt_get_posts": "No s'han pogut obtindre les publicacions.", - "couldnt_update_post": "No s'ha pogut actualitzar la publicació.", - "couldnt_save_post": "No s'ha pogut guardar la publicació.", + "community_moderator_already_exists": "Aquest moderador de la comunitat ja existeix.", + "community_follower_already_exists": "Aquest seguidor de la comunitat ja existeix.", + "community_user_already_banned": "Aquest usuari de la comunitat ja fou expulsat.", + "couldnt_create_post": "No s’ha pogut crear l’apunt.", + "couldnt_like_post": "No s’ha pogut donar «m’agrada» a l’apunt.", + "couldnt_find_post": "No s’ha pogut trobar l’apunt.", + "couldnt_get_posts": "No s’han pogut recuperar els apunts", + "couldnt_update_post": "No s’ha pogut actualitzar l’apunt", + "couldnt_save_post": "No s’ha pogut desar l’apunt.", "no_slurs": "Prohibit insultar.", "not_an_admin": "No és un administrador.", "site_already_exists": "El lloc ja existeix.", - "couldnt_update_site": "No s'ha pogut actualitzar el lloc.", - "couldnt_find_that_username_or_email": - "No s'ha pogut trobar aquest nom de usuari o correu electrònic.", + "couldnt_update_site": "No s’ha pogut actualitzar el lloc.", + "couldnt_find_that_username_or_email": "No s’ha pogut trobar aquest nom de usuari o adreça electrònica.", "password_incorrect": "Contrasenya incorrecta.", "passwords_dont_match": "Les contrasenyes no coincideixen.", - "admin_already_created": "Ho sentim, ja hi ha un adminisitrador.", - "user_already_exists": "L'usuari ja existeix.", - "email_already_exists": "El correu ja és en ús.", - "couldnt_update_user": "No s'ha pogut actualitzar l'usuari.", - "system_err_login": - "Error del sistema. Intenti tancar sessió i ingressar de nou.", - "couldnt_create_private_message": "No s'ha pogut crear el missatge privat.", - "no_private_message_edit_allowed": - "Sense permisos per a editar el missatge privat.", - "couldnt_update_private_message": - "No s'ha pogut actualitzar el missatge privat." + "admin_already_created": "Disculpeu; ja hi ha un adminisitrador.", + "user_already_exists": "L’usuari ja existeix.", + "email_already_exists": "L’adreça ja és en ús.", + "couldnt_update_user": "No s’ha pogut actualitzar l’usuari.", + "system_err_login": "Error del sistema. Intenti tancar sessió i ingressar de nou.", + "couldnt_create_private_message": "No s’ha pogut crear el missatge privat.", + "no_private_message_edit_allowed": "No teniu permisos per a editar el missatge privat.", + "couldnt_update_private_message": "No s’ha pogut actualitzar el missatge privat.", + "cross_posted_to": "publicat també a: ", + "invalid_username": "El nom d’usuari no és vàlid.", + "click_to_delete_picture": "Feu clic per a suprimir la imatge.", + "picture_deleted": "S’ha suprimit la imatge.", + "invalid_community_name": "El nom no és vàlid.", + "sorting_help": "ajuda amb l’ordenament", + "old": "Antic", + "more": "més", + "show_context": "Mostra el context", + "upvote": "Dona un vot positiu", + "number_of_upvotes": "{{count}} vot positiu", + "number_of_upvotes_plural": "{{count}} vots positius", + "downvote": "Dona un vot negatiu", + "number_of_downvotes": "{{count}} vot negatiu", + "number_of_downvotes_plural": "{{count}} vots negatius", + "admin_settings": "Configuració administrativa", + "site_config": "Configuració del lloc", + "banned_users": "Usuaris expulsats", + "support_on_liberapay": "Suport al Liberapay", + "support_on_open_collective": "Suport a l’OpenCollective", + "silver_sponsors": "Els patrocinadors «silver» són els que van comprometre’s a donar 40 $ al Lemmy.", + "site_saved": "S’ha desat el lloc.", + "couldnt_get_comments": "No s’han pogut recuperar els comentaris.", + "post_title_too_long": "El títol de l’apunt és massa llarg.", + "time": "Hora", + "action": "Acció", + "emoji_picker": "Selector d’emojis", + "block_leaving": "Segur que voleu sortir?", + "select_a_community": "Seleccioneu una comunitat" } diff --git a/ui/translations/es.json b/ui/translations/es.json index 50beb8c0a..25260db01 100644 --- a/ui/translations/es.json +++ b/ui/translations/es.json @@ -250,7 +250,7 @@ "banned_users": "Usuarios Baneados", "support_on_open_collective": "Dona en OpenCollective", "site_saved": "Sitio Guardado.", - "emoji_picker": "Lista de emojis", + "emoji_picker": "Selector de emoyis", "admin_settings": "Panel de Administración", "select_a_community": "Selecciona una comunidad", "invalid_username": "Nombre de usuario inválido.", From ab174dc678f2065f995c684b5b15b997a160fd50 Mon Sep 17 00:00:00 2001 From: Ady Nemo Date: Tue, 7 Jul 2020 16:54:34 +0000 Subject: [PATCH 38/74] Translated using Weblate (French) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/fr/ --- ui/translations/fr.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/translations/fr.json b/ui/translations/fr.json index 579def520..769863c1f 100644 --- a/ui/translations/fr.json +++ b/ui/translations/fr.json @@ -156,7 +156,7 @@ "body": "Texte", "copy_suggested_title": "copier le titre suggéré : {{title}}", "community": "Communauté", - "expand_here": "Développer ici", + "expand_here": "Ouvrir ici", "subscribe_to_communities": "S’abonner à quelques <1>communautés.", "chat": "Chat", "recent_comments": "Commentaires récents", @@ -244,7 +244,7 @@ "sorting_help": "aide au tri", "upvote": "Voter pour", "show_context": "Afficher le contexte", - "block_leaving": "Etes-vous sûr de vouloir partir ?", + "block_leaving": "Êtes-vous sûr de vouloir partir ?", "number_of_upvotes": "{{count}} Votes pour", "number_of_upvotes_plural": "{{count}} Votes contre", "number_of_downvotes": "{{count}} Vote contre", From fd28f1730e9ee99e36086d7bfe1e34c879d38601 Mon Sep 17 00:00:00 2001 From: Sergio Varela Date: Tue, 7 Jul 2020 16:54:34 +0000 Subject: [PATCH 39/74] Translated using Weblate (Spanish) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/es/ --- ui/translations/es.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/translations/es.json b/ui/translations/es.json index 25260db01..d0aef9d47 100644 --- a/ui/translations/es.json +++ b/ui/translations/es.json @@ -109,7 +109,7 @@ "all": "Todo", "top": "Mejor", "api": "API", - "docs": "Docs", + "docs": "Documentación", "inbox": "Buzón de entrada", "inbox_for": "Buzón de entrada para <1>{{user}}", "mark_all_as_read": "marcar todo como leído", @@ -256,5 +256,5 @@ "invalid_username": "Nombre de usuario inválido.", "invalid_community_name": "Nombre inválido.", "click_to_delete_picture": "Haz click para eliminar la imagen.", - "picture_deleted": "Foto eliminada." + "picture_deleted": "Imagen eliminada." } From edf1aed369649067ea6230bebb42201e3e7a9abb Mon Sep 17 00:00:00 2001 From: Adolfo Jayme Barrientos Date: Tue, 7 Jul 2020 16:54:34 +0000 Subject: [PATCH 40/74] Translated using Weblate (Spanish) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/es/ --- ui/translations/es.json | 68 ++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/ui/translations/es.json b/ui/translations/es.json index d0aef9d47..383fcce4d 100644 --- a/ui/translations/es.json +++ b/ui/translations/es.json @@ -25,26 +25,26 @@ "number_of_communities": "{{count}} Comunidad", "number_of_communities_plural": "{{count}} Comunidades", "community_reqs": "minúsculas, guión bajo, y sin espacios.", - "create_private_message": "Crear Mensaje Privado", - "send_secure_message": "Enviar Mensaje Seguro", - "send_message": "Enviar Mensaje", + "create_private_message": "Crear mensaje privado", + "send_secure_message": "Enviar mensaje seguro", + "send_message": "Enviar mensaje", "message": "Mensaje", "edit": "editar", "reply": "responder", "cancel": "Cancelar", "preview": "Previsualizar", - "upload_image": "subir imagen", + "upload_image": "cargar imagen", "avatar": "Avatar", - "upload_avatar": "Subir Avatar", - "show_avatars": "Ver Avatares", - "formatting_help": "Ayuda de formato", + "upload_avatar": "Cargar avatar", + "show_avatars": "Mostrar avatares", + "formatting_help": "ayuda de formato", "view_source": "ver fuente", "unlock": "desbloquear", "lock": "bloquear", "sticky": "fijado", "unsticky": "no fijado", - "link": "link", - "archive_link": "archivar link", + "link": "enlace", + "archive_link": "enlace de archivo", "mod": "moderador", "mods": "moderadores", "moderates": "Modera", @@ -65,8 +65,8 @@ "mark_as_unread": "marcar como no leído", "delete": "eliminar", "deleted": "eliminado por creador", - "delete_account": "Eliminar Cuenta", - "delete_account_confirm": "Advertencia: esta acción eliminará permanentemente toda tu información. Introduce tu contraseña para confirmar.", + "delete_account": "Eliminar cuenta", + "delete_account_confirm": "Advertencia: esta acción eliminará permanentemente toda su información. Introduzca su contraseña para confirmar.", "restore": "restaurar", "ban": "expulsar", "ban_from_site": "expulsar del sitio", @@ -77,16 +77,16 @@ "unsave": "descartar", "create": "crear", "creator": "creador", - "username": "Nombre de Usuario", - "email_or_username": "Correo o Usuario", - "number_of_users": "{{count}} Usuario", - "number_of_users_plural": "{{count}} Usuarios", - "number_of_subscribers": "{{count}} Suscriptor", - "number_of_subscribers_plural": "{{count}} Suscriptores", - "number_of_points": "{{count}} Punto", - "number_of_points_plural": "{{count}} Puntos", - "number_online": "{{count}} Usuario En Línea", - "number_online_plural": "{{count}} Usuarios En Línea", + "username": "Nombre de usuario", + "email_or_username": "Correo o usuario", + "number_of_users": "{{count}} usuario", + "number_of_users_plural": "{{count}} usuarios", + "number_of_subscribers": "{{count}} suscriptor", + "number_of_subscribers_plural": "{{count}} suscriptores", + "number_of_points": "{{count}} punto", + "number_of_points_plural": "{{count}} puntos", + "number_online": "{{count}} usuario en línea", + "number_online_plural": "{{count}} usuarios en línea", "name": "Nombre", "title": "Titulo", "category": "Categoría", @@ -98,7 +98,7 @@ "subscribed": "Suscrito", "prev": "Anterior", "next": "Siguiente", - "sidebar": "Descripción de la comunidad", + "sidebar": "Barra lateral", "sort_type": "Tipo de orden", "hot": "Popular", "new": "Nuevo", @@ -161,11 +161,11 @@ "no_results": "Sin resultados.", "setup": "Configurar", "lemmy_instance_setup": "Configuración de instancia de Lemmy", - "setup_admin": "Configurar administrador del Sitio", - "your_site": "tu sitio", + "setup_admin": "Configurar administrador del sitio", + "your_site": "su sitio", "modified": "modificado", - "nsfw": "NSFW", - "show_nsfw": "Mostrar contenido NSFW", + "nsfw": "Para adultos", + "show_nsfw": "Mostrar contenido para adultos", "theme": "Tema", "sponsors": "Patrocinadores", "sponsors_of_lemmy": "Patrocinadores de Lemmy", @@ -186,7 +186,7 @@ "from": "desde", "transfer_community": "transferir comunidad", "transfer_site": "transferir sitio", - "are_you_sure": "¿Estás seguro?", + "are_you_sure": "¿está seguro?", "yes": "sí", "no": "no", "powered_by": "Impulsado por", @@ -234,7 +234,7 @@ "action": "Acción", "more": "más", "cross_posted_to": "publicado también en: ", - "sorting_help": "ayuda del orden", + "sorting_help": "ayuda de ordenación", "upvote": "Voto Positivo", "number_of_upvotes": "{{count}} Voto Positivo", "number_of_upvotes_plural": "{{count}} Votos Positivos", @@ -246,15 +246,15 @@ "block_leaving": "¿Está seguro de que desea salir?", "show_context": "Mostrar contexto", "silver_sponsors": "Sponsors Plata son los que han dado $40 a Lemmy.", - "site_config": "Configuración del Sitio", - "banned_users": "Usuarios Baneados", - "support_on_open_collective": "Dona en OpenCollective", + "site_config": "Configuración del sitio", + "banned_users": "Usuarios expulsados", + "support_on_open_collective": "Apoyo en OpenCollective", "site_saved": "Sitio Guardado.", "emoji_picker": "Selector de emoyis", - "admin_settings": "Panel de Administración", + "admin_settings": "Configuración administrativa", "select_a_community": "Selecciona una comunidad", "invalid_username": "Nombre de usuario inválido.", - "invalid_community_name": "Nombre inválido.", - "click_to_delete_picture": "Haz click para eliminar la imagen.", + "invalid_community_name": "Nombre no válido.", + "click_to_delete_picture": "Pulse para eliminar la imagen.", "picture_deleted": "Imagen eliminada." } From b407e6fffeb35bd07c8027cf7f0543bccbbb8705 Mon Sep 17 00:00:00 2001 From: 5HT Date: Tue, 7 Jul 2020 16:54:34 +0000 Subject: [PATCH 41/74] Translated using Weblate (Catalan) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/ca/ --- ui/translations/ca.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ui/translations/ca.json b/ui/translations/ca.json index 79da8b35b..3e8e185b4 100644 --- a/ui/translations/ca.json +++ b/ui/translations/ca.json @@ -1,15 +1,15 @@ { - "post": "apunt", - "remove_post": "Suprimeix l’apunt", - "no_posts": "No hi ha cap apunt.", - "create_a_post": "Crea un apunt", - "create_post": "Crea un apunt", - "number_of_posts": "{{count}} apunt", - "number_of_posts_plural": "{{count}} apunts", - "posts": "Apunts", - "related_posts": "Aquests apunts podrien estar relacionats", + "post": "Publicar", + "remove_post": "Suprimir publicació", + "no_posts": "No hi han publicacions.", + "create_a_post": "Crear una publicació", + "create_post": "Crear publicació", + "number_of_posts": "{{count}} Publicació", + "number_of_posts_plural": "{{count}} Publicacions", + "posts": "Publicacions", + "related_posts": "Aquestes publicacions podrien estar relacionades", "cross_posts": "Aquest enllaç també s’ha publicat en:", - "cross_post": "apunt transversal", + "cross_post": "cross-post", "comments": "Comentaris", "number_of_comments": "{{count}} comentari", "number_of_comments_plural": "{{count}} comentaris", From 4575cd4e58297da13afdaf6ee385757f8423e1e8 Mon Sep 17 00:00:00 2001 From: Cee Date: Tue, 7 Jul 2020 16:54:34 +0000 Subject: [PATCH 42/74] Translated using Weblate (Chinese (Simplified)) Currently translated at 98.7% (246 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/zh_Hans/ --- ui/translations/zh.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/ui/translations/zh.json b/ui/translations/zh.json index ddf402226..e9384c9b1 100644 --- a/ui/translations/zh.json +++ b/ui/translations/zh.json @@ -14,7 +14,7 @@ "create_a_community": "创建新社群", "create_community": "创建社群", "remove_community": "移除社群", - "subscribed_to_communities": "订阅新 <1>社群", + "subscribed_to_communities": "订阅新<1>社群", "trending_communities": "热门<1>社群", "list_of_communities": "社群列表", "community_reqs": "小写字母、下划线（_）且不含空格。", @@ -27,9 +27,9 @@ "mod": "社群管理", "mods": "社群管理", "moderates": "监管", - "remove_as_mod": "删除社群管理", + "remove_as_mod": "删除社群管理权限", "appoint_as_mod": "任命为社群管理", - "modlog": "审核记录", + "modlog": "管理记录", "admin": "总管理员", "admins": "总管理员", "remove_as_admin": "移除管理员权限", @@ -55,8 +55,8 @@ "number_of_users": "{{count}} 名用户", "number_of_subscribers": "{{count}} 名订阅者", "number_of_points": "{{count}} 积分", - "name": "名字", - "title": "标题", + "name": "名称", + "title": "标语", "category": "分类", "subscribers": "订阅", "both": "全部", @@ -66,11 +66,11 @@ "subscribed": "已订阅", "prev": "上一页", "next": "下一页", - "sidebar": "侧边栏", + "sidebar": "介绍", "sort_type": "排序方式", "hot": "最热", "new": "最新", - "top_day": "每日推荐", + "top_day": "日", "week": "周", "month": "月", "year": "年", @@ -82,7 +82,7 @@ "mark_all_as_read": "标记所有已读", "type": "类型", "unread": "未读", - "reply_sent": "回复发送", + "reply_sent": "回复已发送", "search": "搜索", "overview": "个人中心", "view": "查看", @@ -168,10 +168,10 @@ "yes": "是", "no": "否", "logged_in": "已登录。", - "message": "信息", + "message": "消息", "create_private_message": "创建私信", - "send_secure_message": "发送安全信息", - "send_message": "发送信息", + "send_secure_message": "发送安全消息", + "send_message": "发送消息", "more": "更多", "preview": "预览", "upload_image": "上传图片", @@ -184,7 +184,7 @@ "sticky": "固定", "unsticky": "取消固定", "archive_link": "链接归档", - "settings": "设定", + "settings": "设置", "stickied": "已置顶", "delete_account": "删除账号", "delete_account_confirm": "警告！此操作将永久删除你的数据，请输入密码进行确认。", @@ -201,7 +201,7 @@ "replies": "回复", "number_online": "{{count}} 名在线用户", "mentions": "提到", - "message_sent": "已发送信息", + "message_sent": "消息已发送", "old_password": "当前密码", "forgot_password": "忘记密码", "reset_password_mail_sent": "发送邮件重置密码。", @@ -223,7 +223,7 @@ "open_registration": "开放注册", "registration_closed": "注册功能已关闭", "recent_comments": "最新评论", - "by": "由", + "by": " ", "transfer_community": "转让社群", "transfer_site": "站点转让", "post_title_too_long": "帖子标题过长。", @@ -233,7 +233,7 @@ "no_private_message_edit_allowed": "没有编辑私信的权限。", "couldnt_update_private_message": "无法更新私信。", "time": "时间", - "action": "行动", + "action": "动作", "block_leaving": "确定要离开吗？", "show_context": "显示上下文", "admin_settings": "管理员设置", From 60a1bbeb709542f6e404a297b99f0601d81dc362 Mon Sep 17 00:00:00 2001 From: Isak Alexander Date: Tue, 7 Jul 2020 16:54:35 +0000 Subject: [PATCH 43/74] Translated using Weblate (Swedish) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/sv/ --- ui/translations/sv.json | 123 +++++++++++++++++++++++++++++++--------- 1 file changed, 95 insertions(+), 28 deletions(-) diff --git a/ui/translations/sv.json b/ui/translations/sv.json index 5457409ca..1feb07f41 100644 --- a/ui/translations/sv.json +++ b/ui/translations/sv.json @@ -4,13 +4,15 @@ "no_posts": "Inga inlägg.", "create_a_post": "Skriv ett inlägg", "create_post": "Skapa inlägg", - "number_of_posts": "{{count}} inlägg", + "number_of_posts": "{{count}} Inlägg", + "number_of_posts_plural": "{{count}} Inlägg", "posts": "Inlägg", "related_posts": "Dessa inlägg kan vara relaterade", "cross_posts": "Den här länken har även publicerats i:", - "cross_post": "tvärinlägg", + "cross_post": "tvärposta", "comments": "Kommentarer", - "number_of_comments": "{{count}} kommentarer", + "number_of_comments": "{{count}} Kommentar", + "number_of_comments_plural": "{{count}} Kommentarer", "remove_comment": "Radera kommentar", "communities": "Gemenskaper", "users": "Användare", @@ -20,7 +22,8 @@ "subscribed_to_communities": "Prenumererar på <1>gemenskaper", "trending_communities": "Populära <1>gemenskaper", "list_of_communities": "Lista över gemenskaper", - "number_of_communities": "{{count}} gemenskaper", + "number_of_communities": "{{count}} Gemenskap", + "number_of_communities_plural": "{{count}} Gemenskaper", "community_reqs": "gemener, understreck och inga blanksteg.", "edit": "redigera", "reply": "svara", @@ -46,33 +49,36 @@ "remove_as_admin": "tag bort som administratör", "appoint_as_admin": "lägg till som administratör", "remove": "ta bort", - "removed": "borttagen", + "removed": "borttagen av moderator", "locked": "låst", "stickied": "fastnålad", "reason": "Anledning", "mark_as_read": "markera som läst", "mark_as_unread": "markera som oläst", "delete": "radera", - "deleted": "raderad", + "deleted": "raderad av skapare", "delete_account": "Ta bort konto", - "delete_account_confirm": - "Varning: den här åtgärden kommer radera alla dina data permanent. Är du säker?", + "delete_account_confirm": "Varning: den här åtgärden kommer radera alla dina data permanent. Skriv in ditt lösenord för att bekräfta.", "restore": "återställ", "ban": "blockera", "ban_from_site": "blockera från webbplats", "unban": "ta bort blockering", "unban_from_site": "ta bort blockering från webbplats", - "banned": "blocerad", + "banned": "blockerad", "save": "spara", "unsave": "förkasta", "create": "skapa", "creator": "skapare", "username": "Användarnamn", "email_or_username": "E-postadress eller användarnamn", - "number_of_users": "{{count}} användare", - "number_of_subscribers": "{{count}} prenumeranter", - "number_of_points": "{{count}} poäng", - "number_online": "{{count}} användare inloggade", + "number_of_users": "{{count}} Användare", + "number_of_users_plural": "{{count}} Användare", + "number_of_subscribers": "{{count}} Prenumerant", + "number_of_subscribers_plural": "{{count}} Prenumeranter", + "number_of_points": "{{count}} Poäng", + "number_of_points_plural": "{{count}} Poäng", + "number_online": "{{count}} Användare inloggad", + "number_online_plural": "{{count}} Användare inloggade", "name": "Namn", "title": "Titel", "category": "Kategori", @@ -108,8 +114,7 @@ "login_sign_up": "Logga in eller skapa konto", "login": "Logga in", "sign_up": "Skapa konto", - "notifications_error": - "Din webbläsare har inte stöd för skrivbordsaviseringar. Testa Firefox eller Chrome.", + "notifications_error": "Din webbläsare har inte stöd för skrivbordsaviseringar. Testa Firefox eller Chrome.", "unread_messages": "Olästa meddelanden", "password": "Lösenord", "verify_password": "Bekräfta lösenord", @@ -135,11 +140,9 @@ "theme": "Utseende", "sponsors": "Sponsorer", "sponsors_of_lemmy": "Lemmys sponsorer", - "sponsor_message": - "Lemmy är fri mjukvara med <1>öppen källkod, vilket innebär att ingen reklam, vinstindrivning eller venturekapital förekommer, någonsin. Dina donationer går direkt till att stöda utvecklingen av projektet. Stort tack till följande personer:", + "sponsor_message": "Lemmy är fri mjukvara med <1>öppen källkod, vilket innebär att ingen reklam, vinstindrivning eller venturekapital förekommer, någonsin. Dina donationer går direkt till att stöda utvecklingen av projektet. Stort tack till följande personer:", "support_on_patreon": "Stöd på Patreon", - "general_sponsors": - "Allmänna sponsorer är dem som givit mellan 10 och 39\u00a0dollar till Lemmy.", + "general_sponsors": "Allmänna sponsorer är de som donerat mellan 10 och 39 dollar till Lemmy.", "crypto": "Kryptovaluta", "bitcoin": "Bitcoin", "ethereum": "Ethereum", @@ -154,16 +157,15 @@ "yes": "ja", "no": "nej", "powered_by": "Drivs av", - "landing_0": - "Lemmy är en <1>länksamlare och alternativ till reddit, ämnad att fungera i <2>Fediversumet.<3>Lemmy kan drivas av vem som helst, har kommentarstrådar som updateras i realid och är mycket liten (<4>ca 80\u00a0kB). Federering med ActivityPub-nätverket är planerat. <5>Detta är en <6>väldigt tidig betaversion och många funktioner saknas därför eller är trasiga.<7>Föreslå nya funktioner eller anmäl buggar <8>här.<9>Skapad i <10>Rust, <11>Actix, <12>Inferno och <13>Typescript.", + "landing_0": "Lemmy är en <1>länksamlare och alternativ till reddit, ämnad att fungera i <2>Fediversumet.<3>Lemmy kan drivas av vem som helst, har kommentarstrådar som updateras i realid och är mycket liten (<4>ca 80 kB). Federering med ActivityPub-nätverket är planerat. <5>Detta är en <6>väldigt tidig betaversion och många funktioner saknas därför eller är trasiga.<7>Föreslå nya funktioner eller anmäl buggar <8>här.<9>Skapad i <10>Rust, <11>Actix, <12>Inferno och <13>Typescript.", "not_logged_in": "Inte inloggad.", "community_ban": "Du har blockerats från den här gemenskapen.", - "site_ban": "Du har blockerats från webbplatsen.", + "site_ban": "Du har blockerats från webbplatsen", "couldnt_create_comment": "Kunde inte skapa kommentar.", "couldnt_like_comment": "Kunde inte gilla kommentar.", "couldnt_update_comment": "Kunde inte uppdatera kommentar.", "couldnt_save_comment": "Kunde inte spara kommentar.", - "no_comment_edit_allowed": "Har inte behörighet att redigera komentar.", + "no_comment_edit_allowed": "Har inte behörighet att redigera kommentar.", "no_post_edit_allowed": "Har inte behörighet att redigera inlägg.", "no_community_edit_allowed": "Har inte behörighet att redigera gemenskap.", "couldnt_find_community": "Kunde inte hitta gemenskap.", @@ -175,19 +177,84 @@ "couldnt_create_post": "Kunde inte skapa inlägg.", "couldnt_like_post": "Kunde inte gilla inlägg.", "couldnt_find_post": "Kunde inte hitta inlägg.", - "couldnt_get_posts": "Kunde inte hämta inlägg.", - "couldnt_update_post": "Kunde inte uppdatera inlägg.", + "couldnt_get_posts": "Kunde inte hämta inlägg", + "couldnt_update_post": "Kunde inte uppdatera inlägg", "couldnt_save_post": "Kunde inte spara inlägg.", "no_slurs": "Inga förolämpningar.", "not_an_admin": "Inte en administratör.", "site_already_exists": "Webbplatsen finns redan.", "couldnt_update_site": "Kunde inte uppdatera webbplats.", - "couldnt_find_that_username_or_email": - "Kunde inte hitta det användarnamnet eller e-postadressen.", + "couldnt_find_that_username_or_email": "Kunde inte hitta det användarnamnet eller e-postadressen.", "password_incorrect": "Ogiltigt lösenord.", "passwords_dont_match": "Lösenorden stämmer inte överens.", "admin_already_created": "Beklagar, men det finns redan en administratör.", "user_already_exists": "Användaren finns redan.", "couldnt_update_user": "Kunde inte uppdatera användare.", - "system_err_login": "Systemfel. Försök att logga ut och sedan in igen." + "system_err_login": "Systemfel. Försök att logga ut och sedan in igen.", + "invalid_community_name": "Ogiltigt namn.", + "click_to_delete_picture": "Klicka för att ta bort bild.", + "picture_deleted": "Bild borttagen.", + "upload_avatar": "Ladda upp avatar", + "enable_nsfw": "Aktivera NSFW", + "sorting_help": "sorteringshjälp", + "more": "mer", + "avatar": "Avatar", + "cross_posted_to": "Tvärpostat till: ", + "send_secure_message": "Skicka säkert meddelande", + "send_message": "Skicka meddelande", + "message": "Meddelande", + "create_private_message": "Skapa Privatmeddelande", + "show_avatars": "Visa avatarer", + "archive_link": "Arkivera länk", + "admin_settings": "Administratörsinställningar", + "site_config": "Webbplats konfiguration", + "old": "Gammal", + "banned_users": "Blockerade användare", + "docs": "Dokumentation", + "post_title_too_long": "Inläggstitel är för lång.", + "replies": "Svar", + "mentions": "Nämner", + "message_sent": "Meddelande skickat", + "messages": "Meddelanden", + "old_password": "Gammalt lösenord", + "reset_password_mail_sent": "Skicka e-post för att återställa ditt lösenord.", + "forgot_password": "Glömt lösenord", + "password_change": "Lösenordsbyte", + "new_password": "Nytt lösenord", + "no_email_setup": "Denna server har inte satt upp e-post korrekt.", + "matrix_user_id": "Matrix-användare", + "show_context": "Visa innehåll", + "private_message_disclaimer": "Varning: Privata meddelanden på Lemmy är inte säkra. Vänligen skapa ett konto på <1>Riot.im för att skicka säkra meddelanden.", + "send_notifications_to_email": "Skicka aviseringar till E-post", + "language": "Språk", + "browser_default": "Webbläsarestandard", + "downvotes_disabled": "Nedröstningar inaktiverat", + "enable_downvotes": "Aktivera nedröstningar", + "upvote": "Upprösta", + "number_of_upvotes": "{{count}} Uppröst", + "number_of_upvotes_plural": "{{count}} Uppröstningar", + "downvote": "Nedrösta", + "number_of_downvotes": "{{count}} Nedröst", + "number_of_downvotes_plural": "{{count}} Nedröstningar", + "open_registration": "Öppen registrering", + "registration_closed": "Registrering stängd", + "support_on_liberapay": "Stöd på Liberapay", + "support_on_open_collective": "Stöd på OpenCollective", + "donate_to_lemmy": "Donera till Lemmy", + "donate": "Donera", + "silver_sponsors": "Silversponsor är de som donerat 40 dollar till Lemmy.", + "logged_in": "Inloggad.", + "site_saved": "Webbplats sparad.", + "couldnt_get_comments": "Kunde inte hämta kommentarer.", + "action": "Åtgärd", + "email_already_exists": "E-post finns redan.", + "couldnt_create_private_message": "Kunde inte skapa privat meddelande.", + "no_private_message_edit_allowed": "Inte tillåtet att redigera privata meddelanden.", + "couldnt_update_private_message": "Kunde inte uppdatera privat meddelande.", + "time": "Tid", + "emoji_picker": "Emoji-väljare", + "block_leaving": "Är du säker på att du vill lämna?", + "select_a_community": "Välj en gemenskap", + "from": "från", + "invalid_username": "Ogiltigt användarnamn." } From 68e9755e593bbd8230eab2a123e822022721f071 Mon Sep 17 00:00:00 2001 From: Filip785 Date: Wed, 8 Jul 2020 02:28:47 +0200 Subject: [PATCH 44/74] Add cake day display in user page & posts/comments #682 --- .../2020-06-30-135809_remove_mat_views/up.sql | 2 + server/src/db/comment_view.rs | 7 ++++ server/src/db/post_view.rs | 5 +++ ui/src/components/cake-day.tsx | 41 +++++++++++++++++++ ui/src/components/comment-node.tsx | 8 ++++ ui/src/components/post-listing.tsx | 9 ++++ ui/src/components/symbols.tsx | 3 ++ ui/src/components/user.tsx | 10 +++++ ui/src/interfaces.ts | 2 + ui/translations/en.json | 4 +- 10 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 ui/src/components/cake-day.tsx diff --git a/server/migrations/2020-06-30-135809_remove_mat_views/up.sql b/server/migrations/2020-06-30-135809_remove_mat_views/up.sql index bd792a8b9..9e2fa59ce 100644 --- a/server/migrations/2020-06-30-135809_remove_mat_views/up.sql +++ b/server/migrations/2020-06-30-135809_remove_mat_views/up.sql @@ -106,6 +106,7 @@ select u.actor_id as creator_actor_id, u."local" as creator_local, u."name" as creator_name, + u.published as creator_published, u.avatar as creator_avatar, u.banned as banned, cb.id::bool as banned_from_community, @@ -490,6 +491,7 @@ select u.actor_id as creator_actor_id, u.local as creator_local, u.name as creator_name, + u.published as creator_published, u.avatar as creator_avatar, -- score details coalesce(cl.total, 0) as score, diff --git a/server/src/db/comment_view.rs b/server/src/db/comment_view.rs index d1b27a3c8..75ed4cb7c 100644 --- a/server/src/db/comment_view.rs +++ b/server/src/db/comment_view.rs @@ -28,6 +28,7 @@ table! { creator_local -> Bool, creator_name -> Varchar, creator_avatar -> Nullable, + creator_published -> Timestamp, score -> BigInt, upvotes -> BigInt, downvotes -> BigInt, @@ -63,6 +64,7 @@ table! { creator_local -> Bool, creator_name -> Varchar, creator_avatar -> Nullable, + creator_published -> Timestamp, score -> BigInt, upvotes -> BigInt, downvotes -> BigInt, @@ -101,6 +103,7 @@ pub struct CommentView { pub creator_local: bool, pub creator_name: String, pub creator_avatar: Option, + pub creator_published: chrono::NaiveDateTime, pub score: i64, pub upvotes: i64, pub downvotes: i64, @@ -314,6 +317,7 @@ table! { creator_local -> Bool, creator_name -> Varchar, creator_avatar -> Nullable, + creator_published -> Timestamp, score -> BigInt, upvotes -> BigInt, downvotes -> BigInt, @@ -353,6 +357,7 @@ pub struct ReplyView { pub creator_local: bool, pub creator_name: String, pub creator_avatar: Option, + pub creator_published: chrono::NaiveDateTime, pub score: i64, pub upvotes: i64, pub downvotes: i64, @@ -576,6 +581,7 @@ mod tests { published: inserted_comment.published, updated: None, creator_name: inserted_user.name.to_owned(), + creator_published: inserted_user.published, creator_avatar: None, score: 1, downvotes: 0, @@ -609,6 +615,7 @@ mod tests { published: inserted_comment.published, updated: None, creator_name: inserted_user.name.to_owned(), + creator_published: inserted_user.published, creator_avatar: None, score: 1, downvotes: 0, diff --git a/server/src/db/post_view.rs b/server/src/db/post_view.rs index 808cf28c4..cda5cecf0 100644 --- a/server/src/db/post_view.rs +++ b/server/src/db/post_view.rs @@ -28,6 +28,7 @@ table! { creator_actor_id -> Text, creator_local -> Bool, creator_name -> Varchar, + creator_published -> Timestamp, creator_avatar -> Nullable, banned -> Bool, banned_from_community -> Bool, @@ -75,6 +76,7 @@ table! { creator_actor_id -> Text, creator_local -> Bool, creator_name -> Varchar, + creator_published -> Timestamp, creator_avatar -> Nullable, banned -> Bool, banned_from_community -> Bool, @@ -125,6 +127,7 @@ pub struct PostView { pub creator_actor_id: String, pub creator_local: bool, pub creator_name: String, + pub creator_published: chrono::NaiveDateTime, pub creator_avatar: Option, pub banned: bool, pub banned_from_community: bool, @@ -499,6 +502,7 @@ mod tests { body: None, creator_id: inserted_user.id, creator_name: user_name.to_owned(), + creator_published: inserted_user.published, creator_avatar: None, banned: false, banned_from_community: false, @@ -548,6 +552,7 @@ mod tests { stickied: false, creator_id: inserted_user.id, creator_name: user_name, + creator_published: inserted_user.published, creator_avatar: None, banned: false, banned_from_community: false, diff --git a/ui/src/components/cake-day.tsx b/ui/src/components/cake-day.tsx new file mode 100644 index 000000000..67ac7f8bf --- /dev/null +++ b/ui/src/components/cake-day.tsx @@ -0,0 +1,41 @@ +import { Component } from 'inferno'; +import moment from 'moment'; +import { i18n } from '../i18next'; + +interface CakeDayProps { + creator_name: string; + creator_published: string; +} + +export class CakeDay extends Component { + render() { + const { creator_name, creator_published } = this.props; + + return ( + this.isCakeDay(creator_published) && ( +
          + + + +
          + ) + ); + } + + isCakeDay(input: string): boolean { + const userCreationDate = moment.utc(input).local(); + const currentDate = moment(new Date()); + + return ( + userCreationDate.date() === currentDate.date() && + userCreationDate.month() === currentDate.month() + ); + } + + cakeDayTippy(creator_name: string): string { + return i18n.t('cake_day_info', { creator_name }); + } +} diff --git a/ui/src/components/comment-node.tsx b/ui/src/components/comment-node.tsx index 155efe8e0..762344aae 100644 --- a/ui/src/components/comment-node.tsx +++ b/ui/src/components/comment-node.tsx @@ -33,6 +33,7 @@ import { CommentForm } from './comment-form'; import { CommentNodes } from './comment-nodes'; import { UserListing } from './user-listing'; import { i18n } from '../i18next'; +import { CakeDay } from './cake-day'; interface CommentNodeState { showReply: boolean; @@ -124,6 +125,7 @@ export class CommentNode extends Component { render() { let node = this.props.node; + const { creator_name, creator_published } = node.comment; return (
          { }} /> + + + {this.isMod && (
          {i18n.t('mod')} diff --git a/ui/src/components/post-listing.tsx b/ui/src/components/post-listing.tsx index 3d6088427..e6b9721c8 100644 --- a/ui/src/components/post-listing.tsx +++ b/ui/src/components/post-listing.tsx @@ -35,6 +35,7 @@ import { previewLines, } from '../utils'; import { i18n } from '../i18next'; +import { CakeDay } from './cake-day'; interface PostListingState { showEdit: boolean; @@ -253,6 +254,8 @@ export class PostListing extends Component { listing() { let post = this.props.post; + const { creator_name, creator_published } = post; + return (
          @@ -432,6 +435,12 @@ export class PostListing extends Component { actor_id: post.creator_actor_id, }} /> + + + {this.isMod && ( {i18n.t('mod')} diff --git a/ui/src/components/symbols.tsx b/ui/src/components/symbols.tsx index 77d7a0860..3386dbe59 100644 --- a/ui/src/components/symbols.tsx +++ b/ui/src/components/symbols.tsx @@ -168,6 +168,9 @@ export class Symbols extends Component { + + + ); diff --git a/ui/src/components/user.tsx b/ui/src/components/user.tsx index 69914fd39..4f680324a 100644 --- a/ui/src/components/user.tsx +++ b/ui/src/components/user.tsx @@ -46,6 +46,7 @@ import { ListingTypeSelect } from './listing-type-select'; import { CommentNodes } from './comment-nodes'; import { MomentTime } from './moment-time'; import { i18n } from '../i18next'; +import moment from 'moment'; enum View { Overview, @@ -412,6 +413,15 @@ export class User extends Component { )}
        +
        + + + + + {i18n.t('cake_day_title')}{' '} + {moment.utc(user.published).local().format('MMM DD, YYYY')} + +
        {i18n.t('joined')}
        diff --git a/ui/src/interfaces.ts b/ui/src/interfaces.ts index 7e29319f9..774836a27 100644 --- a/ui/src/interfaces.ts +++ b/ui/src/interfaces.ts @@ -183,6 +183,7 @@ export interface Post { creator_actor_id: string; creator_local: boolean; creator_name: string; + creator_published: string; creator_avatar?: string; community_actor_id: string; community_local: boolean; @@ -227,6 +228,7 @@ export interface Comment { creator_local: boolean; creator_name: string; creator_avatar?: string; + creator_published: string; score: number; upvotes: number; downvotes: number; diff --git a/ui/translations/en.json b/ui/translations/en.json index 62b11ce4a..3dda59480 100644 --- a/ui/translations/en.json +++ b/ui/translations/en.json @@ -265,5 +265,7 @@ "action": "Action", "emoji_picker": "Emoji Picker", "block_leaving": "Are you sure you want to leave?", - "what_is": "What is" + "what_is": "What is", + "cake_day_title": "Cake day:", + "cake_day_info": "It's {{ creator_name }}'s cake day today!" } From cd4e0ab3c2cfd615e4771fb9181a31ce237b5ceb Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 8 Jul 2020 01:02:14 -0400 Subject: [PATCH 45/74] HTML title bugs. - Fixing HTML titles for some pages. Fixes #801 - Removing WebSocketService.Instance.site, fetching site on demand now. --- ui/src/components/comment-node.tsx | 4 +- ui/src/components/comment-nodes.tsx | 2 + ui/src/components/communities.tsx | 12 ++-- ui/src/components/community-form.tsx | 11 +-- ui/src/components/community.tsx | 28 +++++++- ui/src/components/create-community.tsx | 56 +++++++++++++-- ui/src/components/create-post.tsx | 73 ++++++++++++++++++-- ui/src/components/create-private-message.tsx | 42 +++++++++-- ui/src/components/inbox.tsx | 20 ++++-- ui/src/components/login.tsx | 4 +- ui/src/components/main.tsx | 5 +- ui/src/components/modlog.tsx | 9 +-- ui/src/components/navbar.tsx | 3 - ui/src/components/password_change.tsx | 25 +++---- ui/src/components/post-form.tsx | 25 ++++--- ui/src/components/post-listing.tsx | 6 +- ui/src/components/post-listings.tsx | 4 ++ ui/src/components/post.tsx | 52 ++++++++++---- ui/src/components/private-message-form.tsx | 1 - ui/src/components/search.tsx | 48 ++++++++++--- ui/src/components/sidebar.tsx | 2 + ui/src/components/sponsors.tsx | 38 ++++++++-- ui/src/components/user.tsx | 38 +++++++++- ui/src/services/WebSocketService.ts | 2 - 24 files changed, 397 insertions(+), 113 deletions(-) diff --git a/ui/src/components/comment-node.tsx b/ui/src/components/comment-node.tsx index 155efe8e0..839a01dcc 100644 --- a/ui/src/components/comment-node.tsx +++ b/ui/src/components/comment-node.tsx @@ -73,6 +73,7 @@ interface CommentNodeProps { showCommunity?: boolean; sort?: CommentSortType; sortType?: SortType; + enableDownvotes: boolean; } export class CommentNode extends Component { @@ -279,7 +280,7 @@ export class CommentNode extends Component { {this.state.upvotes} )} - {WebSocketService.Instance.site.enable_downvotes && ( + {this.props.enableDownvotes && (