Merge branch 'dev' into 'main'

version 0.3.3

See merge request pleroma/relay!59

docs/commands.md

@@ -16,8 +16,7 @@ Run the relay.
 
 ## Setup
 
-Run the setup wizard to configure your relay. For the PostgreSQL backend, the database has to be
-created first.
+Run the setup wizard to configure your relay.
 
 	activityrelay setup
 
@@ -30,16 +29,6 @@ not specified, the config will get backed up as `relay.backup.yaml` before conve
 	activityrelay convert --old-config relaycfg.yaml
 
 
-## Switch Backend
-
-Change the database backend from the current one to the other. The config will be updated after
-running the command.
-
-Note: If switching to PostgreSQL, make sure the database exists first.
-
-	activityrelay switch-backend
-
-
 ## Edit Config
 
 Open the config file in a text editor. If an editor is not specified with `--editor`, the default

relay/database/connection.py

@@ -4,7 +4,7 @@ import secrets
 
 from argon2 import PasswordHasher
 from blib import Date, convert_to_boolean
-from bsql import BackendType, Connection as SqlConnection, Row, Update
+from bsql import Connection as SqlConnection, Row, Update
 from collections.abc import Iterator
 from datetime import datetime, timezone
 from typing import TYPE_CHECKING, Any
@@ -51,17 +51,6 @@ class Connection(SqlConnection):
 				yield instance
 
 
-	def drop_tables(self) -> None:
-		with self.cursor() as cur:
-			for table in self.get_tables():
-				query = f"DROP TABLE IF EXISTS {table}"
-
-				if self.database.backend.backend_type == BackendType.POSTGRESQL:
-					query += " CASCADE"
-
-				cur.execute(query)
-
-
 	def fix_timestamps(self) -> None:
 		for app in self.select('apps').all(schema.App):
 			data = {'created': app.created.timestamp(), 'accessed': app.accessed.timestamp()}

relay/manage.py

@@ -102,7 +102,34 @@ def cli_setup(ctx: click.Context, skip_questions: bool) -> None:
 			)
 
 		elif ctx.obj.config.db_type == 'postgres':
-			config_postgresql(ctx.obj.config)
+			ctx.obj.config.pg_name = click.prompt(
+				'What is the name of the database?',
+				default = ctx.obj.config.pg_name
+			)
+
+			ctx.obj.config.pg_host = click.prompt(
+				'What IP address, hostname, or unix socket does the server listen on?',
+				default = ctx.obj.config.pg_host,
+				type = int
+			)
+
+			ctx.obj.config.pg_port = click.prompt(
+				'What port does the server listen on?',
+				default = ctx.obj.config.pg_port,
+				type = int
+			)
+
+			ctx.obj.config.pg_user = click.prompt(
+				'Which user will authenticate with the server?',
+				default = ctx.obj.config.pg_user
+			)
+
+			ctx.obj.config.pg_pass = click.prompt(
+				'User password',
+				hide_input = True,
+				show_default = False,
+				default = ctx.obj.config.pg_pass or ""
+			) or None
 
 		ctx.obj.config.ca_type = click.prompt(
 			'Which caching backend?',
@@ -187,18 +214,21 @@ def cli_run(ctx: click.Context, dev: bool = False) -> None:
 
 
 @cli.command('db-maintenance')
+@click.option('--fix-timestamps', '-t', is_flag = True,
+	help = 'Make sure timestamps in the database are float values')
 @click.pass_context
-def cli_db_maintenance(ctx: click.Context) -> None:
+def cli_db_maintenance(ctx: click.Context, fix_timestamps: bool) -> None:
 	'Perform maintenance tasks on the database'
 
+	if fix_timestamps:
+		with ctx.obj.database.session(True) as conn:
+			conn.fix_timestamps()
+
 	if ctx.obj.config.db_type == "postgres":
 		return
 
-	with ctx.obj.database.session(False) as s:
-		with s.transaction():
-			s.fix_timestamps()
-
-		with s.execute("VACUUM"):
+	with ctx.obj.database.session(False) as conn:
+		with conn.execute("VACUUM"):
 			pass
 
 
@@ -317,24 +347,9 @@ def cli_switchbackend(ctx: click.Context) -> None:
 
 	config = Config(ctx.obj.config.path, load = True)
 	config.db_type = "sqlite" if config.db_type == "postgres" else "postgres"
-
-	if config.db_type == "postgres":
-		if click.confirm("Setup PostgreSQL configuration?"):
-			config_postgresql(config)
-
-		order = ("SQLite", "PostgreSQL")
-		click.pause("Make sure the database and user already exist before continuing")
-
-	else:
-		order = ("PostgreSQL", "SQLite")
-
-	click.echo(f"About to convert from {order[0]} to {order[1]}...")
 	database = get_database(config, migrate = False)
 
 	with database.session(True) as new, ctx.obj.database.session(False) as old:
-		if click.confirm("All tables in the destination database will be dropped. Continue?"):
-			new.drop_tables()
-
 		new.create_tables()
 
 		for table in schema.TABLES.keys():
@@ -342,7 +357,7 @@ def cli_switchbackend(ctx: click.Context) -> None:
 				new.insert(table, row).close()
 
 		config.save()
-		click.echo("Done!")
+		click.echo(f"Converted database to {repr(config.db_type)}")
 
 
 @cli.group('config')
@@ -1003,35 +1018,6 @@ def cli_whitelist_import(ctx: click.Context) -> None:
 		click.echo('Imported whitelist from inboxes')
 
 
-def config_postgresql(config: Config) -> None:
-	config.pg_name = click.prompt(
-		'What is the name of the database?',
-		default = config.pg_name
-	)
-
-	config.pg_host = click.prompt(
-		'What IP address, hostname, or unix socket does the server listen on?',
-		default = config.pg_host,
-	)
-
-	config.pg_port = click.prompt(
-		'What port does the server listen on?',
-		default = config.pg_port,
-		type = int
-	)
-
-	config.pg_user = click.prompt(
-		'Which user will authenticate with the server?',
-		default = config.pg_user
-	)
-
-	config.pg_pass = click.prompt(
-		'User password',
-		hide_input = True,
-		show_default = False,
-		default = config.pg_pass or ""
-	) or None
-
 
 def main() -> None:
 	cli(prog_name='activityrelay')

relay/processors.py

@@ -171,9 +171,9 @@ async def handle_follow(view: ActorView, conn: Connection) -> None:
 
 
 async def handle_undo(view: ActorView, conn: Connection) -> None:
+	# If the object is not a Follow, forward it
 	if view.message.object['type'] != 'Follow':
-		# forwarding deletes does not work, so don't bother
-		# await handle_forward(view, conn)
+		await handle_forward(view, conn)
 		return
 
 	# prevent past unfollows from removing an instance

relay/views/activitypub.py

@@ -1,7 +1,6 @@
 import aputils
 import traceback
 
-from aiohttp import ClientConnectorError
 from aiohttp.web import Request
 from blib import HttpError
 
@@ -105,10 +104,6 @@ class ActorView(View):
 			logging.debug('HTTP Status %i: %s', e.status, e.message)
 			raise HttpError(400, 'failed to fetch actor')
 
-		except ClientConnectorError as e:
-			logging.warning('Error when trying to fetch actor: %s, %s', self.signature.keyid, str(e))
-			raise HttpError(400, 'failed to fetch actor')
-
 		except Exception:
 			traceback.print_exc()
 			raise HttpError(500, 'unexpected error when fetching actor')