From ec23de7e338158ff9dfc27ede9b1d2e906d8e56a Mon Sep 17 00:00:00 2001 From: Sylvia Ji Date: Tue, 21 Apr 2020 11:02:26 +0000 Subject: Translated using Weblate (Japanese) Currently translated at 100.0% (237 of 237 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/ja/ Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (237 of 237 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/zh_Hans/ --- ui/translations/ja.json | 6 ++++-- ui/translations/zh.json | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ui/translations/ja.json b/ui/translations/ja.json index 066ff589..db9197c3 100644 --- a/ui/translations/ja.json +++ b/ui/translations/ja.json @@ -144,7 +144,7 @@ "enable_nsfw": "閲覧注意を有効化", "url": "URL", "body": "本文", - "copy_suggested_title": "タイトルの提案をコピーする: {{title}}", + "copy_suggested_title": "提案されたタイトルをコピーする: {{title}}", "community": "コミュニティ", "expand_here": "拡大表示", "subscribe_to_communities": "<1>コミュニティをいくつか登録してみましょう。", @@ -233,5 +233,7 @@ "system_err_login": "システムエラーが発生しました。一度ログアウトして、再度ログインをお試しください。", "couldnt_create_private_message": "プライベートメッセージが作成されない。", "no_private_message_edit_allowed": "プライベートメッセージの編集許可がありません。", - "couldnt_update_private_message": "プライベートメッセージが更新されない。" + "couldnt_update_private_message": "プライベートメッセージが更新されない。", + "couldnt_like_comment": "コメントが「いいね」できない。", + "couldnt_like_post": "投稿が「いいね」できない。" } diff --git a/ui/translations/zh.json b/ui/translations/zh.json index d23de86a..e4b54362 100644 --- a/ui/translations/zh.json +++ b/ui/translations/zh.json @@ -156,8 +156,8 @@ "user_already_exists": "用户已存在。", "couldnt_update_user": "无法更新用户。", "system_err_login": "系统错误。请尝试注销后重新登入。", - "nsfw": "少儿不宜", - "show_nsfw": "显示少儿不宜内容", + "nsfw": "工作场所不宜", + "show_nsfw": "显示工作场所不宜内容", "theme": "主题", "from": "来自", "donate_to_lemmy": "向Lemmy捐赠", @@ -175,7 +175,7 @@ "more": "更多", "preview": "预览", "upload_image": "上传图片", - "enable_nsfw": "允许少儿不宜内容", + "enable_nsfw": "允许工作场所不宜内容", "show_avatars": "显示头像", "avatar": "头像", "formatting_help": "格式帮助", -- cgit v1.2.3 From b2a89cd21772afbec1e5eb00bf3b10720fae6b14 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Tue, 21 Apr 2020 20:43:38 -0400 Subject: Version v0.6.52 --- 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 e39e33bc..1fdf358c 100644 --- a/ansible/VERSION +++ b/ansible/VERSION @@ -1 +1 @@ -v0.6.51 +v0.6.52 diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index c38bb899..b9e82daf 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.6.51 + image: dessalines/lemmy:v0.6.52 ports: - "127.0.0.1:8536:8536" restart: always diff --git a/server/src/version.rs b/server/src/version.rs index a287e3a4..6135fe38 100644 --- a/server/src/version.rs +++ b/server/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "v0.6.51"; +pub const VERSION: &str = "v0.6.52"; diff --git a/ui/src/version.ts b/ui/src/version.ts index eb0ecff3..a200f513 100644 --- a/ui/src/version.ts +++ b/ui/src/version.ts @@ -1 +1 @@ -export const version: string = 'v0.6.51'; +export const version: string = 'v0.6.52'; -- cgit v1.2.3 From 313d023eef849ea0d8d501d03d17f914b6ae947b Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 22 Apr 2020 00:29:25 -0400 Subject: Changing wait to spawn in websocket. --- server/src/routes/websocket.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/routes/websocket.rs b/server/src/routes/websocket.rs index 48b7d08f..3814a8e9 100644 --- a/server/src/routes/websocket.rs +++ b/server/src/routes/websocket.rs @@ -124,7 +124,7 @@ impl StreamHandler> for WSSession { } actix::fut::ready(()) }) - .wait(ctx); + .spawn(ctx); } ws::Message::Binary(_bin) => info!("Unexpected binary"), ws::Message::Close(_) => { -- cgit v1.2.3 From c22090c602098abe29f451c6235fe8179725726a Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 22 Apr 2020 00:30:43 -0400 Subject: Version v0.6.53 --- 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 1fdf358c..3bf48355 100644 --- a/ansible/VERSION +++ b/ansible/VERSION @@ -1 +1 @@ -v0.6.52 +v0.6.53 diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index b9e82daf..00fe9410 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.6.52 + image: dessalines/lemmy:v0.6.53 ports: - "127.0.0.1:8536:8536" restart: always diff --git a/server/src/version.rs b/server/src/version.rs index 6135fe38..a1887e29 100644 --- a/server/src/version.rs +++ b/server/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "v0.6.52"; +pub const VERSION: &str = "v0.6.53"; diff --git a/ui/src/version.ts b/ui/src/version.ts index a200f513..6e3e167f 100644 --- a/ui/src/version.ts +++ b/ui/src/version.ts @@ -1 +1 @@ -export const version: string = 'v0.6.52'; +export const version: string = 'v0.6.53'; -- cgit v1.2.3 From d0fa235e84d61dec04b9241e920a9988b36b87a6 Mon Sep 17 00:00:00 2001 From: Nishant Aswani Date: Wed, 22 Apr 2020 15:38:51 -0400 Subject: Updated ranking algorithm graph in docs (#654) * Regraphed ranking algorithm demo with seaborn plot * use imgur mirror for ranking algo image --- docs/img/rank_algorithm.png | Bin 0 -> 55191 bytes docs/src/about_ranking.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 docs/img/rank_algorithm.png diff --git a/docs/img/rank_algorithm.png b/docs/img/rank_algorithm.png new file mode 100644 index 00000000..c8200f91 Binary files /dev/null and b/docs/img/rank_algorithm.png differ diff --git a/docs/src/about_ranking.md b/docs/src/about_ranking.md index d318ae82..36347932 100644 --- a/docs/src/about_ranking.md +++ b/docs/src/about_ranking.md @@ -26,4 +26,4 @@ Gravity = Decay gravity, 1.8 is default A plot of rank over 24 hours, of scores of 1, 5, 10, 100, 1000, with a scale factor of 10k. -![](https://i.imgur.com/w8oBLlL.png) +![](https://i.imgur.com/QukPR03.png) -- cgit v1.2.3 From d448bc6f9a4eb714d0d18d050089e5fcfa9f8f91 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 22 Apr 2020 16:52:24 -0400 Subject: Adding code mirror section to readme. --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 723d535f..f5d80ceb 100644 --- a/README.md +++ b/README.md @@ -131,10 +131,13 @@ If you want to help with translating, take a look at [Weblate](https://weblate.y ## Contact -- [Mastodon](https://mastodon.social/@LemmyDev) - [![Mastodon Follow](https://img.shields.io/mastodon/follow/810572?domain=https%3A%2F%2Fmastodon.social&style=social)](https://mastodon.social/@LemmyDev) -- [Matrix](https://riot.im/app/#/room/#rust-reddit-fediverse:matrix.org) - [![Matrix](https://img.shields.io/matrix/rust-reddit-fediverse:matrix.org.svg?label=matrix-chat)](https://riot.im/app/#/room/#rust-reddit-fediverse:matrix.org) +- [Mastodon](https://mastodon.social/@LemmyDev) +- [Matrix](https://riot.im/app/#/room/#rust-reddit-fediverse:matrix.org) + +## Code Mirrors + - [GitHub](https://github.com/LemmyNet/lemmy) -- [Gitea](https://yerbamate.dev/dessalines/lemmy) +- [Gitea](https://yerbamate.dev/LemmyNet/lemmy) - [GitLab](https://gitlab.com/dessalines/lemmy) ## Credits -- cgit v1.2.3 From 674e221335c38bea34e3a1f11bf857952038f4d6 Mon Sep 17 00:00:00 2001 From: Nishant Aswani Date: Sun, 26 Apr 2020 10:01:21 -0400 Subject: added main_screen and chat_screen (#665) --- docs/img/chat_screen.png | Bin 0 -> 79469 bytes docs/img/main_screen.png | Bin 0 -> 94316 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 docs/img/chat_screen.png create mode 100644 docs/img/main_screen.png diff --git a/docs/img/chat_screen.png b/docs/img/chat_screen.png new file mode 100644 index 00000000..21a452dc Binary files /dev/null and b/docs/img/chat_screen.png differ diff --git a/docs/img/main_screen.png b/docs/img/main_screen.png new file mode 100644 index 00000000..5d1f0c32 Binary files /dev/null and b/docs/img/main_screen.png differ -- cgit v1.2.3 From 610cce4162c28d680819f2d45c804950313e3b96 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sun, 26 Apr 2020 10:51:59 -0400 Subject: Hide online counts for now. #664 --- ui/src/components/main.tsx | 2 ++ ui/src/components/sidebar.tsx | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ui/src/components/main.tsx b/ui/src/components/main.tsx index 366d3be8..829af222 100644 --- a/ui/src/components/main.tsx +++ b/ui/src/components/main.tsx @@ -282,9 +282,11 @@ export class Main extends Component { )}
    + {/*
  • {i18n.t('number_online', { count: this.state.siteRes.online })}
  • + */}
  • {i18n.t('number_of_users', { count: this.state.siteRes.site.number_of_users, diff --git a/ui/src/components/sidebar.tsx b/ui/src/components/sidebar.tsx index d66266f6..fce31561 100644 --- a/ui/src/components/sidebar.tsx +++ b/ui/src/components/sidebar.tsx @@ -111,8 +111,9 @@ export class Sidebar extends Component { } > @@ -169,9 +170,11 @@ export class Sidebar extends Component { )}
      + {/*
    • {i18n.t('number_online', { count: this.props.online })}
    • + */}
    • {i18n.t('number_of_subscribers', { count: community.number_of_subscribers, @@ -215,9 +218,9 @@ export class Sidebar extends Component { ))}
    {i18n.t('create_a_post')} -- cgit v1.2.3 From f4b5c1f27b188804c6a124827ccc50218a0c5061 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sun, 26 Apr 2020 10:56:53 -0400 Subject: Adding sponsor. --- 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 cdd7bdad..51ef47fa 100644 --- a/ui/src/components/sponsors.tsx +++ b/ui/src/components/sponsors.tsx @@ -5,6 +5,7 @@ import { T } from 'inferno-i18next'; import { repoUrl } from '../utils'; let general = [ + 'Serge Tarkovsky', 'alexx henry', 'Nathan J. Goode', 'Andre Vallestero', -- cgit v1.2.3 From 92e4edf9b7af01d43391500f69ac95a619c4d2f6 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sun, 26 Apr 2020 10:57:27 -0400 Subject: Version v0.6.54 --- 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 3bf48355..6f4ae774 100644 --- a/ansible/VERSION +++ b/ansible/VERSION @@ -1 +1 @@ -v0.6.53 +v0.6.54 diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 00fe9410..c6639f57 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.6.53 + image: dessalines/lemmy:v0.6.54 ports: - "127.0.0.1:8536:8536" restart: always diff --git a/server/src/version.rs b/server/src/version.rs index a1887e29..66f2d1e7 100644 --- a/server/src/version.rs +++ b/server/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "v0.6.53"; +pub const VERSION: &str = "v0.6.54"; diff --git a/ui/src/version.ts b/ui/src/version.ts index 6e3e167f..90281ec4 100644 --- a/ui/src/version.ts +++ b/ui/src/version.ts @@ -1 +1 @@ -export const version: string = 'v0.6.53'; +export const version: string = 'v0.6.54'; -- cgit v1.2.3 From 82941001e8e8593b6d487759c5164f1344812c0e Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sun, 26 Apr 2020 19:09:47 -0400 Subject: Fixing sponsor issue. --- ui/src/components/sponsors.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/components/sponsors.tsx b/ui/src/components/sponsors.tsx index 51ef47fa..f4dd8313 100644 --- a/ui/src/components/sponsors.tsx +++ b/ui/src/components/sponsors.tsx @@ -5,7 +5,7 @@ import { T } from 'inferno-i18next'; import { repoUrl } from '../utils'; let general = [ - 'Serge Tarkovsky', + 'Serge Tarkovski', 'alexx henry', 'Nathan J. Goode', 'Andre Vallestero', -- cgit v1.2.3 From 72433b37c4a2390e766b69f7d059dc95469aa18a Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 27 Apr 2020 08:55:31 -0400 Subject: Adding a sponsor. --- 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 f4dd8313..b0b7e5f6 100644 --- a/ui/src/components/sponsors.tsx +++ b/ui/src/components/sponsors.tsx @@ -5,6 +5,7 @@ import { T } from 'inferno-i18next'; import { repoUrl } from '../utils'; let general = [ + 'Forrest Weghorst', 'Serge Tarkovski', 'alexx henry', 'Nathan J. Goode', -- cgit v1.2.3 From 66134823bffc55cefdb5d14857faa7956a165237 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 27 Apr 2020 09:07:31 -0400 Subject: Version v0.6.55 --- 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 6f4ae774..e6cf23a8 100644 --- a/ansible/VERSION +++ b/ansible/VERSION @@ -1 +1 @@ -v0.6.54 +v0.6.55 diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index c6639f57..65bc9f82 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.6.54 + image: dessalines/lemmy:v0.6.55 ports: - "127.0.0.1:8536:8536" restart: always diff --git a/server/src/version.rs b/server/src/version.rs index 66f2d1e7..72b91db5 100644 --- a/server/src/version.rs +++ b/server/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "v0.6.54"; +pub const VERSION: &str = "v0.6.55"; diff --git a/ui/src/version.ts b/ui/src/version.ts index 90281ec4..273c97cd 100644 --- a/ui/src/version.ts +++ b/ui/src/version.ts @@ -1 +1 @@ -export const version: string = 'v0.6.54'; +export const version: string = 'v0.6.55'; -- cgit v1.2.3 From 09d4bf1d7a6eaf6778dc6a9dde5e096680caffbd Mon Sep 17 00:00:00 2001 From: niniack Date: Mon, 27 Apr 2020 16:22:56 -0400 Subject: swap imgur links for github links --- README.md | 6 +++--- docs/src/about.md | 2 +- docs/src/about_ranking.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index f5d80ceb..9c4f6bfa 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ Front Page|Post ---|--- -![main screen](https://i.imgur.com/kZSRcRu.png)|![chat screen](https://i.imgur.com/4XghNh6.png) +![main screen](https://raw.githubusercontent.com/LemmyNet/lemmy/master/docs/img/main_screen.png)|![chat screen](https://raw.githubusercontent.com/LemmyNet/lemmy/master/docs/img/chat_screen.png) [Lemmy](https://github.com/LemmyNet/lemmy) is similar to sites like [Reddit](https://reddit.com), [Lobste.rs](https://lobste.rs), [Raddle](https://raddle.me), or [Hacker News](https://news.ycombinator.com/): you subscribe to forums you're interested in, post links and discussions, then vote, and comment on them. Behind the scenes, it is very different; anyone can easily run a server, and all these servers are federated (think email), and connected to the same universe, called the [Fediverse](https://en.wikipedia.org/wiki/Fediverse). @@ -125,14 +125,14 @@ Lemmy is free, open-source software, meaning no advertising, monetizing, or vent - [Docker Development](https://dev.lemmy.ml/docs/contributing_docker_development.html) - [Local Development](https://dev.lemmy.ml/docs/contributing_local_development.html) -### Translations +### Translations If you want to help with translating, take a look at [Weblate](https://weblate.yerbamate.dev/projects/lemmy/). ## Contact - [Mastodon](https://mastodon.social/@LemmyDev) -- [Matrix](https://riot.im/app/#/room/#rust-reddit-fediverse:matrix.org) +- [Matrix](https://riot.im/app/#/room/#rust-reddit-fediverse:matrix.org) ## Code Mirrors diff --git a/docs/src/about.md b/docs/src/about.md index 31081f48..2c0e418b 100644 --- a/docs/src/about.md +++ b/docs/src/about.md @@ -2,7 +2,7 @@ Front Page|Post ---|--- -![main screen](https://i.imgur.com/kZSRcRu.png)|![chat screen](https://i.imgur.com/4XghNh6.png) +![main screen](https://raw.githubusercontent.com/LemmyNet/lemmy/master/docs/img/main_screen.png)|![chat screen](https://raw.githubusercontent.com/LemmyNet/lemmy/master/docs/img/chat_screen.png) [Lemmy](https://github.com/LemmyNet/lemmy) is similar to sites like [Reddit](https://reddit.com), [Lobste.rs](https://lobste.rs), [Raddle](https://raddle.me), or [Hacker News](https://news.ycombinator.com/): you subscribe to forums you're interested in, post links and discussions, then vote, and comment on them. Behind the scenes, it is very different; anyone can easily run a server, and all these servers are federated (think email), and connected to the same universe, called the [Fediverse](https://en.wikipedia.org/wiki/Fediverse). diff --git a/docs/src/about_ranking.md b/docs/src/about_ranking.md index 36347932..fe9e82bb 100644 --- a/docs/src/about_ranking.md +++ b/docs/src/about_ranking.md @@ -26,4 +26,4 @@ Gravity = Decay gravity, 1.8 is default A plot of rank over 24 hours, of scores of 1, 5, 10, 100, 1000, with a scale factor of 10k. -![](https://i.imgur.com/QukPR03.png) +![](https://raw.githubusercontent.com/LemmyNet/lemmy/master/docs/img/rank_algorithm.png) -- cgit v1.2.3 From 9b93d4c098da53cc24ca0b4df293122ef251f7d3 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 29 Apr 2020 17:52:18 -0400 Subject: Better private-message form. Fixes #652 --- ui/src/components/private-message-form.tsx | 60 +++++++++++++++--------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/ui/src/components/private-message-form.tsx b/ui/src/components/private-message-form.tsx index 6b607654..7667f5a1 100644 --- a/ui/src/components/private-message-form.tsx +++ b/ui/src/components/private-message-form.tsx @@ -160,38 +160,12 @@ export class PrivateMessageForm extends Component< )} /> )} - - {this.state.showDisclaimer && (
    -
    +
    )}
    -
    +
    {this.state.privateMessageForm.content && ( )} +
    -- cgit v1.2.3 From 6d73b167168699f4ca67f927d125f0be46e9aad9 Mon Sep 17 00:00:00 2001 From: pfcoder Date: Fri, 1 May 2020 21:58:52 +0800 Subject: fix shell quotation error of server db-init.sh --- server/db-init.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/db-init.sh b/server/db-init.sh index c9150e9d..87f39ead 100755 --- a/server/db-init.sh +++ b/server/db-init.sh @@ -37,7 +37,7 @@ done psql -c "CREATE USER $username WITH PASSWORD '$password' SUPERUSER;" -U postgres -psql -c 'CREATE DATABASE $dbname WITH OWNER $username;' -U postgres +psql -c "CREATE DATABASE $dbname WITH OWNER $username;" -U postgres export LEMMY_DATABASE_URL=postgres://$username:$password@localhost:$port/$dbname echo $LEMMY_DATABASE_URL -- cgit v1.2.3 From 8d4ab4555cbf026ea2c34ea4800f72dcd1fe4c8e Mon Sep 17 00:00:00 2001 From: Richie Zhang <12566991+StaticallyTypedRice@users.noreply.github.com> Date: Fri, 1 May 2020 07:33:28 -0700 Subject: Improve the yes/no prompt in install.sh (#683) * Improve the yes/no prompt in install.sh The old implementation used a feature only present on Bash version 4, which not all systems have. The new version should work on all bash shells. * Update install.sh --- install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index ad3e4ab3..d84761a2 100755 --- a/install.sh +++ b/install.sh @@ -16,10 +16,10 @@ init_db_final=0 while [ "$init_db_valid" == 0 ] do read -p "Initialize database (y/n)? " init_db - case "${init_db,,}" in - y|yes ) init_db_valid=1; init_db_final=1;; - n|no ) init_db_valid=1; init_db_final=0;; - * ) echo "Invalid input" 1>&2;; + case "$init_db" in + [yY]* ) init_db_valid=1; init_db_final=1;; + [nN]* ) init_db_valid=1; init_db_final=0;; + * ) echo "Invalid input. Please enter either \"y\" or \"n\"." 1>&2;; esac echo done -- cgit v1.2.3 From 43592c32d9c4190ee7ef26838f8f33c555a72997 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Fri, 1 May 2020 21:51:04 -0400 Subject: Adding hindi template. --- ui/src/i18next.ts | 4 ++++ ui/src/utils.ts | 14 +++++++++----- ui/translations/hi.json | 3 +++ 3 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 ui/translations/hi.json diff --git a/ui/src/i18next.ts b/ui/src/i18next.ts index 85d06f91..2cd29000 100644 --- a/ui/src/i18next.ts +++ b/ui/src/i18next.ts @@ -13,14 +13,18 @@ import { it } from './translations/it'; import { fi } from './translations/fi'; import { ca } from './translations/ca'; import { fa } from './translations/fa'; +import { hi } from './translations/hi'; import { pt_BR } from './translations/pt_BR'; import { ja } from './translations/ja'; +import { ka } from './translations/ka'; // https://github.com/nimbusec-oss/inferno-i18next/blob/master/tests/T.test.js#L66 const resources = { en, eo, es, + ka, + hi, de, zh, fr, diff --git a/ui/src/utils.ts b/ui/src/utils.ts index 21a7fef8..2256a0c1 100644 --- a/ui/src/utils.ts +++ b/ui/src/utils.ts @@ -13,6 +13,7 @@ import 'moment/locale/fa'; import 'moment/locale/pt-br'; import 'moment/locale/ja'; import 'moment/locale/ka'; +import 'moment/locale/hi'; import { UserOperation, @@ -62,6 +63,7 @@ export const languages = [ { code: 'es', name: 'Español' }, { code: 'de', name: 'Deutsch' }, { code: 'ka', name: 'ქართული ენა' }, + { code: 'hi', name: 'मानक हिन्दी' }, { code: 'fa', name: 'فارسی' }, { code: 'ja', name: '日本語' }, { code: 'pt_BR', name: 'Português Brasileiro' }, @@ -118,11 +120,11 @@ export const md = new markdown_it({ typographer: true, }) .use(markdown_it_container, 'spoiler', { - validate: function(params: any) { + validate: function (params: any) { return params.trim().match(/^spoiler\s+(.*)$/); }, - render: function(tokens: any, idx: any) { + render: function (tokens: any, idx: any) { var m = tokens[idx].info.trim().match(/^spoiler\s+(.*)$/); if (tokens[idx].nesting === 1) { @@ -138,7 +140,7 @@ export const md = new markdown_it({ defs: objectFlip(emojiShortName), }); -md.renderer.rules.emoji = function(token, idx) { +md.renderer.rules.emoji = function (token, idx) { return twemoji.parse(token[idx].content); }; @@ -284,7 +286,7 @@ export function debounce( let timeout: any; // Calling debounce returns a new anonymous function - return function() { + return function () { // reference the context and args for the setTimeout function var context = this, args = arguments; @@ -300,7 +302,7 @@ export function debounce( clearTimeout(timeout); // Set the new timeout - timeout = setTimeout(function() { + timeout = setTimeout(function () { // Inside the timeout function, clear the timeout variable // which will let the next execution run when in 'immediate' mode timeout = null; @@ -366,6 +368,8 @@ export function getMomentLanguage(): string { lang = 'ja'; } else if (lang.startsWith('ka')) { lang = 'ka'; + } else if (lang.startsWith('hi')) { + lang = 'hi'; } else { lang = 'en'; } diff --git a/ui/translations/hi.json b/ui/translations/hi.json new file mode 100644 index 00000000..0db3279e --- /dev/null +++ b/ui/translations/hi.json @@ -0,0 +1,3 @@ +{ + +} -- cgit v1.2.3 From ec087ce28aab5211828f5e212dce9a581922f450 Mon Sep 17 00:00:00 2001 From: Sylvia Ji Date: Sat, 2 May 2020 01:52:15 +0000 Subject: Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (237 of 237 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/zh_Hans/ Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (237 of 237 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/zh_Hans/ --- ui/translations/zh.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/translations/zh.json b/ui/translations/zh.json index e4b54362..afe754ba 100644 --- a/ui/translations/zh.json +++ b/ui/translations/zh.json @@ -122,7 +122,7 @@ "code": "代码", "joined": "已加入", "powered_by": "保留所有权利", - "landing_0": "Lemmy is a <1>link aggregator / reddit alternative, intended to work in the <2>fediverse.<3>It's self-hostable, has live-updating comment threads, and is tiny (<4>~80kB). Federation into the ActivityPub network is on the roadmap. <5>This is a <6>very early beta version, and a lot of features are currently broken or missing. <7>Suggest new features or report bugs <8>here.<9>Made with <10>Rust, <11>Actix, <12>Inferno, <13>Typescript.", + "landing": "Lemmy是一个 <1>链接聚合器 / reddit的替代选择,为在<2>fediverse上使用而设计。<3>它支持自托管, 提供实时更新的讨论串, 并且十分轻量 (<4>约80kB)。对ActivityPub网络的联邦整合已经在规划之中。<5>这是一个<6>非常早期的beta版本,许多功能还不能使用或还未开发完成。 <7>请到 <8>这里提出新功能或报告bug。<9>由<10>Rust、 <11>Actix、<12>Inferno、<13>Typescript写成。", "not_logged_in": "未登录.", "community_ban": "你已被此社群拉黑。", "site_ban": "你已被本站拉黑", @@ -213,7 +213,7 @@ "private_message_disclaimer": "警告:Lemmy的私信功能并不安全。想要进行安全的信息传递,请在 <1>Riot.im上创建账号。", "send_notifications_to_email": "向邮箱发送通知", "language": "语言", - "browser_default": "默认浏览器", + "browser_default": "浏览器默认语言", "downvotes_disabled": "点踩功能已禁用", "enable_downvotes": "启用点踩功能", "upvote": "点赞", -- cgit v1.2.3 From 915fe79d7a7cc536c39a1f88b940fefc54c00980 Mon Sep 17 00:00:00 2001 From: dessalines Date: Sat, 2 May 2020 01:52:15 +0000 Subject: Added translation using Weblate (Hindi) --- ui/translations/hi.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 ui/translations/hi.json diff --git a/ui/translations/hi.json b/ui/translations/hi.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/ui/translations/hi.json @@ -0,0 +1 @@ +{} -- cgit v1.2.3 From 0d08cf36f8d33d9f6b27990f10ffeb66a50e3636 Mon Sep 17 00:00:00 2001 From: Nishant Aswani Date: Sun, 3 May 2020 17:03:25 +0000 Subject: Translated using Weblate (Hindi) Currently translated at 16.8% (41 of 243 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/hi/ Translated using Weblate (Hindi) Currently translated at 4.5% (11 of 243 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/hi/ --- ui/translations/hi.json | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/ui/translations/hi.json b/ui/translations/hi.json index 0967ef42..912a7d43 100644 --- a/ui/translations/hi.json +++ b/ui/translations/hi.json @@ -1 +1,46 @@ -{} +{ + "create_a_post": "पोस्ट बनाएँ", + "create_post": "पोस्ट बनाएँ", + "posts": "पोस्ट", + "unlock": "ताला खोलें", + "avatar": "अवतार", + "upload_image": "फ़ोटो अपलोड करें", + "comments": "टिप्पणी (कमेंट )", + "remove_comment": "टिप्पणी हटाएँ (कमेंट हटाएँ)", + "upload_avatar": "अवतार अपलोड करें", + "post": "पोस्ट", + "remove_post": "पोस्ट हटाएँ", + "number_of_posts": "{{count}} पोस्ट", + "number_of_posts_plural": "{{count}} पोस्ट्स", + "cross_posts": "यह लिंक अन्य स्थान पर भी पोस्ट किया गया हैं :", + "related_posts": "यह पोस्ट्स संबंधित हो सकते हैं |", + "number_of_comments": "{{ count }} टिप्पणी (कमेंट )", + "number_of_comments_plural": "{{ count }} टिप्पणियाँ (कोम्मेंट्स )", + "communities": "सामुदायिक", + "users": "उपयोगकर्ता", + "create_a_community": "समुदाय बनाएँ", + "create_community": "समुदाय बनाएँ", + "remove_community": "समुदाय हटाएँ", + "list_of_communities": "समुदायों की सूची", + "create_private_message": "निजी संदेश बनाएँ", + "send_secure_message": "सुरक्षित संदेश भेजें", + "send_message": "संदेश भेजें", + "message": "संदेश", + "edit": "संपादित करें ( एडिट करें )", + "reply": "जवाब दें", + "more": "और भी", + "cancel": "रद्द करें", + "preview": "पूर्वावलोकन करें", + "show_avatars": "अवतार दिखाएँ", + "show_context": "संदर्भ दिखाएँ", + "community": "समुदाय", + "number_of_communities": "{{count}} समुदाय", + "number_of_communities_plural": "{{count}} समुदाय", + "community_reqs": "छोटे अक्षर, अंडरस्कोर, और कोई रिक्त स्थान नहीं |", + "forgot_password": "पासवर्ड भूल गए", + "no_posts": "कोई पोस्ट नहीं |", + "community_already_exists": "यह समुदाय पहले स मौजूद है |", + "couldnt_create_comment": "टिप्पणी (कमेंट) नहीं बना पाईं |", + "couldnt_find_community": "समुदायों नहीं ढूंढ़ पाएं |", + "couldnt_find_post": "पोस्ट नहीं ढूंढ़ पाएं |" +} -- cgit v1.2.3 From 2f7a4ecdb297fd67717d16b1ea88ca6936edefa7 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sun, 3 May 2020 17:25:55 -0400 Subject: Updating Cargo deps. Fixes #666 --- server/Cargo.lock | 137 +++++++++++++++++++++++++++++++++--------------------- server/Cargo.toml | 14 +++--- 2 files changed, 91 insertions(+), 60 deletions(-) diff --git a/server/Cargo.lock b/server/Cargo.lock index a83f6593..b4c99526 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -10,7 +10,7 @@ dependencies = [ "activitystreams-types 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.52 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -29,7 +29,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.52 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -44,7 +44,7 @@ dependencies = [ "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.52 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -53,7 +53,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-http 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix_derive 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -65,7 +65,7 @@ dependencies = [ "parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "pin-project 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "trust-dns-proto 0.18.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", "trust-dns-resolver 0.18.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -81,7 +81,7 @@ dependencies = [ "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -91,7 +91,7 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "actix-utils 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.99.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -129,7 +129,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-connect 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "actix-threadpool 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-utils 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -142,7 +142,7 @@ dependencies = [ "derive_more 0.99.5 (registry+https://github.com/rust-lang/crates.io-index)", "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)", - "failure 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "failure 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "futures-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "futures-core 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -161,7 +161,7 @@ dependencies = [ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.52 (registry+https://github.com/rust-lang/crates.io-index)", "serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -191,7 +191,7 @@ dependencies = [ [[package]] name = "actix-rt" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-macros 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -199,7 +199,8 @@ dependencies = [ "copyless 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "futures-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "futures-util 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -208,7 +209,7 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "actix-utils 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -235,7 +236,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-macros 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-server 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -263,7 +264,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "actix-utils 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.99.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -278,7 +279,7 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -298,7 +299,7 @@ dependencies = [ "actix-http 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-macros 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-router 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-server 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "actix-testing 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -318,7 +319,7 @@ dependencies = [ "pin-project 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.52 (registry+https://github.com/rust-lang/crates.io-index)", "serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -442,7 +443,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-http 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-service 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -453,7 +454,7 @@ dependencies = [ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.52 (registry+https://github.com/rust-lang/crates.io-index)", "serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -477,6 +478,15 @@ dependencies = [ "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "base64" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "base64" version = "0.10.1" @@ -497,7 +507,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "bcrypt" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "base64 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -669,7 +679,7 @@ dependencies = [ "rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde-hjson 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.52 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -887,15 +897,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "email" -version = "0.0.21" +version = "0.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", + "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -993,7 +1004,7 @@ dependencies = [ [[package]] name = "failure" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "backtrace 0.3.46 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1194,7 +1205,7 @@ dependencies = [ "indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1363,7 +1374,7 @@ dependencies = [ "pem 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "ring 0.16.12 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.52 (registry+https://github.com/rust-lang/crates.io-index)", "simple_asn1 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1398,10 +1409,10 @@ dependencies = [ "activitypub 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-files 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-rt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-rt 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-web 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-web-actors 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "bcrypt 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bcrypt 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "comrak 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "config 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1409,7 +1420,7 @@ dependencies = [ "diesel_migrations 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "dotenv 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "failure 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "failure 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "hjson 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "htmlescape 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1417,18 +1428,18 @@ dependencies = [ "jsonwebtoken 7.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "lettre 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", - "lettre_email 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "lettre_email 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "rss 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.52 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "strum 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", "strum_macros 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1445,16 +1456,16 @@ dependencies = [ "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.52 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "lettre_email" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "email 0.0.21 (registry+https://github.com/rust-lang/crates.io-index)", + "email 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", "lettre 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1951,6 +1962,18 @@ dependencies = [ "scheduled-thread-pool 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "rand" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "rand" version = "0.6.5" @@ -2198,6 +2221,11 @@ name = "ryu" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "schannel" version = "0.1.18" @@ -2314,7 +2342,7 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.51" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2574,7 +2602,7 @@ dependencies = [ [[package]] name = "tokio" -version = "0.2.18" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2602,7 +2630,7 @@ dependencies = [ "futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "pin-project-lite 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2615,7 +2643,7 @@ dependencies = [ "futures-sink 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "pin-project-lite 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2633,7 +2661,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "async-trait 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", "enum-as-inner 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "failure 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "failure 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2641,7 +2669,7 @@ dependencies = [ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "socket2 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2651,7 +2679,7 @@ version = "0.18.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "failure 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "failure 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "ipconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2659,7 +2687,7 @@ dependencies = [ "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "resolv-conf 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "trust-dns-proto 0.18.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2962,7 +2990,7 @@ dependencies = [ "checksum actix-http 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c16664cc4fdea8030837ad5a845eb231fb93fc3c5c171edfefb52fad92ce9019" "checksum actix-macros 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "21705adc76bbe4bc98434890e73a89cd00c6015e5704a60bb6eea6c3b72316b6" "checksum actix-router 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9d7a10ca4d94e8c8e7a87c5173aba1b97ba9a6563ca02b0e1cd23531093d3ec8" -"checksum actix-rt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "20066d9200ef8d441ac156c76dd36c3f1e9a15976c34e69ae97f7f570b331882" +"checksum actix-rt 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "143fcc2912e0d1de2bcf4e2f720d2a60c28652ab4179685a1ee159e0fb3db227" "checksum actix-server 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "582a7173c281a4f46b5aa168a11e7f37183dcb71177a39312cc2264da7a632c9" "checksum actix-service 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d3e4fc95dfa7e24171b2d0bb46b85f8ab0e8499e4e3caec691fc4ea65c287564" "checksum actix-testing 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "48494745b72d0ea8ff0cf874aaf9b622a3ee03d7081ee0c04edea4f26d32c911" @@ -2990,7 +3018,8 @@ dependencies = [ "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" "checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" "checksum base64 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d5ca2cd0adc3f48f9e9ea5a6bbdf9ccc0bfade884847e484d452414c7ccffb3" -"checksum bcrypt 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f055c8591efe08e03f534ee632672ea3643c3932e485f422107ec6cc1157b0ea" +"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" +"checksum bcrypt 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6f02d7d008a57bcb2251ba115b803934e02315edbde9a861c88713493e381b63" "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" "checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" "checksum block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774" @@ -3034,7 +3063,7 @@ dependencies = [ "checksum dtoa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0dd841b58510c9618291ffa448da2e4e0f699d984d436122372f446dae62263d" "checksum dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3" "checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" -"checksum email 0.0.21 (registry+https://github.com/rust-lang/crates.io-index)" = "65360503b8831670969621be3d3814c4c7be44c642de11f8c0f5aaa01f057b3e" +"checksum email 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)" = "91549a51bb0241165f13d57fc4c72cef063b4088fb078b019ecbf464a45f22e4" "checksum encoding