Merge branch 'main' into hot_rank_column

api_tests/prepare-drone-federation-test.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 export RUST_BACKTRACE=1

api_tests/run-federation-test.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 export LEMMY_DATABASE_URL=postgres://lemmy:password@localhost:5432

crates/api_crud/src/private_message/create.rs

@@ -89,14 +89,11 @@ impl PerformCrud for CreatePrivateMessage {
       let local_recipient = LocalUserView::read_person(context.pool(), recipient_id).await?;
       let lang = get_interface_language(&local_recipient);
       let inbox_link = format!("{}/inbox", context.settings().get_protocol_and_hostname());
+      let sender_name = &local_user_view.person.name;
       send_email_to_user(
         &local_recipient,
-        &lang.notification_private_message_subject(&local_recipient.person.name),
-        &lang.notification_private_message_body(
-          inbox_link,
-          &content_slurs_removed,
-          &local_recipient.person.name,
-        ),
+        &lang.notification_private_message_subject(sender_name),
+        &lang.notification_private_message_body(inbox_link, &content_slurs_removed, sender_name),
         context.settings(),
       );
     }

docker/docker_db_backup.sh

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 docker-compose exec postgres pg_dumpall -c -U lemmy > dump_`date +%Y-%m-%d"_"%H_%M_%S`.sql

docker/test_deploy.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 export COMPOSE_DOCKER_CLI_BUILD=1

scripts/clear_db.sh

@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 psql -U lemmy -c "DROP SCHEMA public CASCADE; CREATE SCHEMA public; DROP SCHEMA utils CASCADE;"

scripts/compilation_benchmark.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 times=3

scripts/db-init.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # Default configurations

scripts/fix-clippy.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 CWD="$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)"

scripts/install.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # Set the database variable to the default first.

scripts/query_testing/apache_bench_report.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 declare -a arr=(

scripts/query_testing/api_benchmark.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # By default, this script runs against `http://127.0.0.1:8536`, but you can pass a different Lemmy instance,

scripts/query_testing/views_old/generate_reports.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # You can import these to http://tatiyants.com/pev/#/plans/new

scripts/query_testing/views_to_diesel_migration/generate_reports.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # You can import these to http://tatiyants.com/pev/#/plans/new

scripts/restore_db.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 psql -U lemmy -c "DROP SCHEMA public CASCADE; CREATE SCHEMA public;"
 cat docker/lemmy_dump_2021-01-29_16_13_40.sqldump | psql -U lemmy

scripts/test.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 PACKAGE="$1"

scripts/update_config_defaults.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 dest=${1-config/defaults.hjson}

scripts/update_translations.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 pushd ../../lemmy-translations

scripts/upgrade_deps.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 pushd ../