No OneTemporary
Actions

Authored By

Unknown

Size

44 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/config/config.exs b/config/config.exs
	index 6fb4a0969..b742a650d 100644
	--- a/config/config.exs
	+++ b/config/config.exs
	@@ -1,588 +1,588 @@
	# .i;;;;i.
	# iYcviii;vXY:
	# .YXi .i1c.
	# .YC. . in7.
	# .vc. ...... ;1c.
	# i7, .. .;1;
	# i7, .. ... .Y1i
	# ,7v .6MMM@; .YX,
	# .7;. ..IMMMMMM1 :t7.
	# .;Y. ;$MMMMMM9. :tc.
	# vY. .. .nMMM@MMU. ;1v.
	# i7i ... .#MM@M@C. .....:71i
	# it: .... $MMM@9;.,i;;;i,;tti
	# :t7. ..... 0MMMWv.,iii:::,,;St.
	# .nC. ..... IMMMQ..,::::::,.,czX.
	# .ct: ....... .ZMMMI..,:::::::,,:76Y.
	# c2: ......,i..Y$M@t..:::::::,,..inZY
	# vov ......:ii..c$MBc..,,,,,,,,,,..iI9i
	# i9Y ......iii:..7@MA,..,,,,,,,,,....;AA:
	# iIS. ......:ii::..;@MI....,............;Ez.
	# .I9. ......:i::::...8M1..................C0z.
	# .z9; ......:i::::,.. .i:...................zWX.
	# vbv ......,i::::,,. ................. :AQY
	# c6Y. .,...,::::,,..:t0@@QY. ................ :8bi
	# :6S. ..,,...,:::,,,..EMMMMMMI. ............... .;bZ,
	# :6o, .,,,,..:::,,,..i#MMMMMM#v................. YW2.
	# .n8i ..,,,,,,,::,,,,.. tMMMMM@C:.................. .1Wn
	# 7Uc. .:::,,,,,::,,,,.. i1t;,..................... .UEi
	# 7C...::::::::::::,,,,.. .................... vSi.
	# ;1;...,,::::::,......... .................. Yz:
	# v97,......... .voC.
	# izAotX7777777777777777777777777777777777777777Y7n92:
	# .;CoIIIIIUAA666666699999ZZZZZZZZZZZZZZZZZZZZ6ov.
	#
	# !!! ATTENTION !!!
	# DO NOT EDIT THIS FILE! THIS FILE CONTAINS THE DEFAULT VALUES FOR THE CON-
	# FIGURATION! EDIT YOUR SECRET FILE (either prod.secret.exs, dev.secret.exs).
	#
	# This file is responsible for configuring your application
	# and its dependencies with the aid of the Mix.Config module.
	#
	# This configuration file is loaded before any dependency and
	# is restricted to this project.
	use Mix.Config

	# General application configuration
	config :pleroma, ecto_repos: [Pleroma.Repo]

	config :pleroma, Pleroma.Repo,
	types: Pleroma.PostgresTypes,
	telemetry_event: [Pleroma.Repo.Instrumenter],
	migration_lock: nil

	scheduled_jobs =
	with digest_config <- Application.get_env(:pleroma, :email_notifications)[:digest],
	true <- digest_config[:active] do
	- [{digest_config[:schedule], {Pleroma.DigestEmailWorker, :perform, []}}]
	+ [{digest_config[:schedule], {Pleroma.Daemons.DigestEmailDaemon, :perform, []}}]
	else
	_ -> []
	end

	scheduled_jobs =
	scheduled_jobs ++
	[{"0 /6 * * *", {Pleroma.Web.Websub, :refresh_subscriptions, []}}]

	config :pleroma, Pleroma.Scheduler,
	global: true,
	overlap: true,
	timezone: :utc,
	jobs: scheduled_jobs

	config :pleroma, Pleroma.Captcha,
	enabled: false,
	seconds_valid: 60,
	method: Pleroma.Captcha.Kocaptcha

	config :pleroma, :hackney_pools,
	federation: [
	max_connections: 50,
	timeout: 150_000
	],
	media: [
	max_connections: 50,
	timeout: 150_000
	],
	upload: [
	max_connections: 25,
	timeout: 300_000
	]

	config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"

	# Upload configuration
	config :pleroma, Pleroma.Upload,
	uploader: Pleroma.Uploaders.Local,
	filters: [Pleroma.Upload.Filter.Dedupe],
	link_name: true,
	proxy_remote: false,
	proxy_opts: [
	redirect_on_failure: false,
	max_body_length: 25 * 1_048_576,
	http: [
	follow_redirect: true,
	pool: :upload
	]
	]

	config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"

	config :pleroma, Pleroma.Uploaders.S3,
	bucket: nil,
	public_endpoint: "https://s3.amazonaws.com"

	config :pleroma, Pleroma.Uploaders.MDII,
	cgi: "https://mdii.sakura.ne.jp/mdii-post.cgi",
	files: "https://mdii.sakura.ne.jp"

	config :pleroma, :emoji,
	shortcode_globs: ["/emoji/custom/*/.png"],
	pack_extensions: [".png", ".gif"],
	groups: [
	# Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md`
	Custom: ["/emoji/.png", "/emoji//.png"]
	],
	default_manifest: "https://git.pleroma.social/pleroma/emoji-index/raw/master/index.json"

	config :pleroma, :uri_schemes,
	valid_schemes: [
	"https",
	"http",
	"dat",
	"dweb",
	"gopher",
	"ipfs",
	"ipns",
	"irc",
	"ircs",
	"magnet",
	"mailto",
	"mumble",
	"ssb",
	"xmpp"
	]

	websocket_config = [
	path: "/websocket",
	serializer: [
	{Phoenix.Socket.V1.JSONSerializer, "~> 1.0.0"},
	{Phoenix.Socket.V2.JSONSerializer, "~> 2.0.0"}
	],
	timeout: 60_000,
	transport_log: false,
	compress: false
	]

	# Configures the endpoint
	config :pleroma, Pleroma.Web.Endpoint,
	instrumenters: [Pleroma.Web.Endpoint.Instrumenter],
	url: [host: "localhost"],
	http: [
	ip: {127, 0, 0, 1},
	dispatch: [
	{:_,
	[
	{"/api/v1/streaming", Pleroma.Web.MastodonAPI.WebsocketHandler, []},
	{"/websocket", Phoenix.Endpoint.CowboyWebSocket,
	{Phoenix.Transports.WebSocket,
	{Pleroma.Web.Endpoint, Pleroma.Web.UserSocket, websocket_config}}},
	{:_, Phoenix.Endpoint.Cowboy2Handler, {Pleroma.Web.Endpoint, []}}
	]}
	]
	],
	protocol: "https",
	secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl",
	signing_salt: "CqaoopA2",
	render_errors: [view: Pleroma.Web.ErrorView, accepts: ~w(json)],
	pubsub: [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2],
	secure_cookie_flag: true,
	extra_cookie_attrs: [
	"SameSite=Lax"
	]

	# Configures Elixir's Logger
	config :logger, :console,
	format: "$time $metadata[$level] $message\n",
	metadata: [:request_id]

	config :logger, :ex_syslogger,
	level: :debug,
	ident: "pleroma",
	format: "$metadata[$level] $message",
	metadata: [:request_id]

	config :quack,
	level: :warn,
	meta: [:all],
	webhook_url: "https://hooks.slack.com/services/YOUR-KEY-HERE"

	config :mime, :types, %{
	"application/xml" => ["xml"],
	"application/xrd+xml" => ["xrd+xml"],
	"application/jrd+json" => ["jrd+json"],
	"application/activity+json" => ["activity+json"],
	"application/ld+json" => ["activity+json"]
	}

	config :tesla, adapter: Tesla.Adapter.Hackney

	# Configures http settings, upstream proxy etc.
	config :pleroma, :http,
	proxy_url: nil,
	send_user_agent: true,
	adapter: [
	ssl_options: [
	# Workaround for remote server certificate chain issues
	partial_chain: &:hackney_connect.partial_chain/1,
	# We don't support TLS v1.3 yet
	versions: [:tlsv1, :"tlsv1.1", :"tlsv1.2"]
	]
	]

	config :pleroma, :instance,
	name: "Pleroma",
	email: "example@example.com",
	notify_email: "noreply@example.com",
	description: "A Pleroma instance, an alternative fediverse server",
	limit: 5_000,
	remote_limit: 100_000,
	upload_limit: 16_000_000,
	avatar_upload_limit: 2_000_000,
	background_upload_limit: 4_000_000,
	banner_upload_limit: 4_000_000,
	poll_limits: %{
	max_options: 20,
	max_option_chars: 200,
	min_expiration: 0,
	max_expiration: 365 * 24 * 60 * 60
	},
	registrations_open: true,
	federating: true,
	federation_incoming_replies_max_depth: 100,
	federation_reachability_timeout_days: 7,
	federation_publisher_modules: [
	Pleroma.Web.ActivityPub.Publisher,
	Pleroma.Web.Websub,
	Pleroma.Web.Salmon
	],
	allow_relay: true,
	rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
	public: true,
	quarantined_instances: [],
	managed_config: true,
	static_dir: "instance/static/",
	allowed_post_formats: [
	"text/plain",
	"text/html",
	"text/markdown",
	"text/bbcode"
	],
	mrf_transparency: true,
	mrf_transparency_exclusions: [],
	autofollowed_nicknames: [],
	max_pinned_statuses: 1,
	no_attachment_links: false,
	welcome_user_nickname: nil,
	welcome_message: nil,
	max_report_comment_size: 1000,
	safe_dm_mentions: false,
	healthcheck: false,
	remote_post_retention_days: 90,
	skip_thread_containment: true,
	limit_to_local_content: :unauthenticated,
	dynamic_configuration: false,
	user_bio_length: 5000,
	user_name_length: 100,
	max_account_fields: 10,
	max_remote_account_fields: 20,
	account_field_name_length: 512,
	account_field_value_length: 512,
	external_user_synchronization: true

	config :pleroma, :markup,
	# XXX - unfortunately, inline images must be enabled by default right now, because
	# of custom emoji. Issue #275 discusses defanging that somehow.
	allow_inline_images: true,
	allow_headings: false,
	allow_tables: false,
	allow_fonts: false,
	scrub_policy: [
	Pleroma.HTML.Transform.MediaProxy,
	Pleroma.HTML.Scrubber.Default
	]

	config :pleroma, :frontend_configurations,
	pleroma_fe: %{
	theme: "pleroma-dark",
	logo: "/static/logo.png",
	background: "/images/city.jpg",
	redirectRootNoLogin: "/main/all",
	redirectRootLogin: "/main/friends",
	showInstanceSpecificPanel: true,
	scopeOptionsEnabled: false,
	formattingOptionsEnabled: false,
	collapseMessageWithSubject: false,
	hidePostStats: false,
	hideUserStats: false,
	scopeCopy: true,
	subjectLineBehavior: "email",
	alwaysShowSubjectInput: true
	},
	masto_fe: %{
	showInstanceSpecificPanel: true
	}

	config :pleroma, :assets,
	mascots: [
	pleroma_fox_tan: %{
	url: "/images/pleroma-fox-tan-smol.png",
	mime_type: "image/png"
	},
	pleroma_fox_tan_shy: %{
	url: "/images/pleroma-fox-tan-shy.png",
	mime_type: "image/png"
	}
	],
	default_mascot: :pleroma_fox_tan

	config :pleroma, :activitypub,
	unfollow_blocked: true,
	outgoing_blocks: true,
	follow_handshake_timeout: 500,
	sign_object_fetches: true

	config :pleroma, :user, deny_follow_blocked: true

	config :pleroma, :mrf_normalize_markup, scrub_policy: Pleroma.HTML.Scrubber.Default

	config :pleroma, :mrf_rejectnonpublic,
	allow_followersonly: false,
	allow_direct: false

	config :pleroma, :mrf_hellthread,
	delist_threshold: 10,
	reject_threshold: 20

	config :pleroma, :mrf_simple,
	media_removal: [],
	media_nsfw: [],
	federated_timeline_removal: [],
	report_removal: [],
	reject: [],
	accept: [],
	avatar_removal: [],
	banner_removal: []

	config :pleroma, :mrf_keyword,
	reject: [],
	federated_timeline_removal: [],
	replace: []

	config :pleroma, :mrf_subchain, match_actor: %{}

	config :pleroma, :mrf_vocabulary,
	accept: [],
	reject: []

	config :pleroma, :rich_media,
	enabled: true,
	ignore_hosts: [],
	ignore_tld: ["local", "localdomain", "lan"],
	parsers: [
	Pleroma.Web.RichMedia.Parsers.TwitterCard,
	Pleroma.Web.RichMedia.Parsers.OGP,
	Pleroma.Web.RichMedia.Parsers.OEmbed
	],
	ttl_setters: [Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl]

	config :pleroma, :media_proxy,
	enabled: false,
	proxy_opts: [
	redirect_on_failure: false,
	max_body_length: 25 * 1_048_576,
	http: [
	follow_redirect: true,
	pool: :media
	]
	],
	whitelist: []

	config :pleroma, :chat, enabled: true

	config :phoenix, :format_encoders, json: Jason

	config :pleroma, :gopher,
	enabled: false,
	ip: {0, 0, 0, 0},
	port: 9999

	config :pleroma, Pleroma.Web.Metadata,
	providers: [
	Pleroma.Web.Metadata.Providers.OpenGraph,
	Pleroma.Web.Metadata.Providers.TwitterCard,
	Pleroma.Web.Metadata.Providers.RelMe
	],
	unfurl_nsfw: false

	config :pleroma, :suggestions,
	enabled: false,
	third_party_engine:
	"http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-suggestions-api.cgi?{{host}}+{{user}}",
	timeout: 300_000,
	limit: 40,
	web: "https://vinayaka.distsn.org"

	config :pleroma, :http_security,
	enabled: true,
	sts: false,
	sts_max_age: 31_536_000,
	ct_max_age: 2_592_000,
	referrer_policy: "same-origin"

	config :cors_plug,
	max_age: 86_400,
	methods: ["POST", "PUT", "DELETE", "GET", "PATCH", "OPTIONS"],
	expose: [
	"Link",
	"X-RateLimit-Reset",
	"X-RateLimit-Limit",
	"X-RateLimit-Remaining",
	"X-Request-Id",
	"Idempotency-Key"
	],
	credentials: true,
	headers: ["Authorization", "Content-Type", "Idempotency-Key"]

	config :pleroma, Pleroma.User,
	restricted_nicknames: [
	".well-known",
	"~",
	"about",
	"activities",
	"api",
	"auth",
	"check_password",
	"dev",
	"friend-requests",
	"inbox",
	"internal",
	"main",
	"media",
	"nodeinfo",
	"notice",
	"oauth",
	"objects",
	"ostatus_subscribe",
	"pleroma",
	"proxy",
	"push",
	"registration",
	"relay",
	"settings",
	"status",
	"tag",
	"user-search",
	"user_exists",
	"users",
	"web"
	]

	config :pleroma, Oban,
	repo: Pleroma.Repo,
	verbose: false,
	prune: {:maxlen, 1500},
	queues: [
	activity_expiration: 10,
	federator_incoming: 50,
	federator_outgoing: 50,
	web_push: 50,
	mailer: 10,
	transmogrifier: 20,
	scheduled_activities: 10,
	background: 5
	]

	config :pleroma, :workers,
	retries: [
	federator_incoming: 5,
	federator_outgoing: 5
	]

	config :pleroma, :fetch_initial_posts,
	enabled: false,
	pages: 5

	config :auto_linker,
	opts: [
	scheme: true,
	extra: true,
	# TODO: Set to :no_scheme when it works properly
	validate_tld: true,
	class: false,
	strip_prefix: false,
	new_window: false,
	rel: false
	]

	config :pleroma, :ldap,
	enabled: System.get_env("LDAP_ENABLED") == "true",
	host: System.get_env("LDAP_HOST") \|\| "localhost",
	port: String.to_integer(System.get_env("LDAP_PORT") \|\| "389"),
	ssl: System.get_env("LDAP_SSL") == "true",
	sslopts: [],
	tls: System.get_env("LDAP_TLS") == "true",
	tlsopts: [],
	base: System.get_env("LDAP_BASE") \|\| "dc=example,dc=com",
	uid: System.get_env("LDAP_UID") \|\| "cn"

	config :esshd,
	enabled: false

	oauth_consumer_strategies =
	System.get_env("OAUTH_CONSUMER_STRATEGIES")
	\|> to_string()
	\|> String.split()
	\|> Enum.map(&hd(String.split(&1, ":")))

	ueberauth_providers =
	for strategy <- oauth_consumer_strategies do
	strategy_module_name = "Elixir.Ueberauth.Strategy.#{String.capitalize(strategy)}"
	strategy_module = String.to_atom(strategy_module_name)
	{String.to_atom(strategy), {strategy_module, [callback_params: ["state"]]}}
	end

	config :ueberauth,
	Ueberauth,
	base_path: "/oauth",
	providers: ueberauth_providers

	config :pleroma, :auth, oauth_consumer_strategies: oauth_consumer_strategies

	config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false

	config :pleroma, Pleroma.Emails.UserEmail,
	logo: nil,
	styling: %{
	link_color: "#d8a070",
	background_color: "#2C3645",
	content_background_color: "#1B2635",
	header_color: "#d8a070",
	text_color: "#b9b9ba",
	text_muted_color: "#b9b9ba"
	}

	config :prometheus, Pleroma.Web.Endpoint.MetricsExporter, path: "/api/pleroma/app_metrics"

	config :pleroma, Pleroma.ScheduledActivity,
	daily_user_limit: 25,
	total_user_limit: 300,
	enabled: true

	config :pleroma, :email_notifications,
	digest: %{
	active: false,
	schedule: "0 0 * * 0",
	interval: 7,
	inactivity_threshold: 7
	}

	config :pleroma, :oauth2,
	token_expires_in: 600,
	issue_new_refresh_token: true,
	clean_expired_tokens: false,
	clean_expired_tokens_interval: 86_400_000

	config :pleroma, :database, rum_enabled: false

	config :pleroma, :env, Mix.env()

	config :http_signatures,
	adapter: Pleroma.Signature

	config :pleroma, :rate_limit, nil

	config :pleroma, Pleroma.ActivityExpiration, enabled: true

	# Import environment specific config. This must remain at the bottom
	# of this file so it overrides the configuration defined above.
	import_config "#{Mix.env()}.exs"
	diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
	index f8f866dbd..0c27027a0 100644
	--- a/lib/pleroma/application.ex
	+++ b/lib/pleroma/application.ex
	@@ -1,165 +1,165 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Application do
	import Cachex.Spec
	use Application

	@name Mix.Project.config()[:name]
	@version Mix.Project.config()[:version]
	@repository Mix.Project.config()[:source_url]
	@env Mix.env()

	def name, do: @name
	def version, do: @version
	def named_version, do: @name <> " " <> @version
	def repository, do: @repository

	def user_agent do
	info = "#{Pleroma.Web.base_url()} <#{Pleroma.Config.get([:instance, :email], "")}>"
	named_version() <> "; " <> info
	end

	# See http://elixir-lang.org/docs/stable/elixir/Application.html
	# for more information on OTP Applications
	def start(_type, _args) do
	Pleroma.Config.DeprecationWarnings.warn()
	setup_instrumenters()

	# Define workers and child supervisors to be supervised
	children =
	[
	Pleroma.Repo,
	Pleroma.Scheduler,
	Pleroma.Config.TransferTask,
	Pleroma.Emoji,
	Pleroma.Captcha,
	Pleroma.FlakeId,
	- Pleroma.ScheduledActivityWorker,
	- Pleroma.ActivityExpirationWorker
	+ Pleroma.Daemons.ScheduledActivityDaemon,
	+ Pleroma.Daemons.ActivityExpirationDaemon
	] ++
	cachex_children() ++
	hackney_pool_children() ++
	[
	Pleroma.Stats,
	{Oban, Pleroma.Config.get(Oban)},
	%{
	id: :web_push_init,
	start: {Task, :start_link, [&Pleroma.Web.Push.init/0]},
	restart: :temporary
	},
	%{
	id: :federator_init,
	start: {Task, :start_link, [&Pleroma.Web.Federator.init/0]},
	restart: :temporary
	},
	%{
	id: :internal_fetch_init,
	start: {Task, :start_link, [&Pleroma.Web.ActivityPub.InternalFetchActor.init/0]},
	restart: :temporary
	}
	] ++
	oauth_cleanup_child(oauth_cleanup_enabled?()) ++
	streamer_child(@env) ++
	chat_child(@env, chat_enabled?()) ++
	[
	Pleroma.Web.Endpoint,
	Pleroma.Gopher.Server
	]

	# See http://elixir-lang.org/docs/stable/elixir/Supervisor.html
	# for other strategies and supported options
	opts = [strategy: :one_for_one, name: Pleroma.Supervisor]
	Supervisor.start_link(children, opts)
	end

	defp setup_instrumenters do
	require Prometheus.Registry

	if Application.get_env(:prometheus, Pleroma.Repo.Instrumenter) do
	:ok =
	:telemetry.attach(
	"prometheus-ecto",
	[:pleroma, :repo, :query],
	&Pleroma.Repo.Instrumenter.handle_event/4,
	%{}
	)

	Pleroma.Repo.Instrumenter.setup()
	end

	Pleroma.Web.Endpoint.MetricsExporter.setup()
	Pleroma.Web.Endpoint.PipelineInstrumenter.setup()
	Pleroma.Web.Endpoint.Instrumenter.setup()
	end

	def enabled_hackney_pools do
	[:media] ++
	if Application.get_env(:tesla, :adapter) == Tesla.Adapter.Hackney do
	[:federation]
	else
	[]
	end ++
	if Pleroma.Config.get([Pleroma.Upload, :proxy_remote]) do
	[:upload]
	else
	[]
	end
	end

	defp cachex_children do
	[
	build_cachex("used_captcha", ttl_interval: seconds_valid_interval()),
	build_cachex("user", default_ttl: 25_000, ttl_interval: 1000, limit: 2500),
	build_cachex("object", default_ttl: 25_000, ttl_interval: 1000, limit: 2500),
	build_cachex("rich_media", default_ttl: :timer.minutes(120), limit: 5000),
	build_cachex("scrubber", limit: 2500),
	build_cachex("idempotency", expiration: idempotency_expiration(), limit: 2500)
	]
	end

	defp idempotency_expiration,
	do: expiration(default: :timer.seconds(6 * 60 * 60), interval: :timer.seconds(60))

	defp seconds_valid_interval,
	do: :timer.seconds(Pleroma.Config.get!([Pleroma.Captcha, :seconds_valid]))

	defp build_cachex(type, opts),
	do: %{
	id: String.to_atom("cachex_" <> type),
	start: {Cachex, :start_link, [String.to_atom(type <> "_cache"), opts]},
	type: :worker
	}

	defp chat_enabled?, do: Pleroma.Config.get([:chat, :enabled])

	defp oauth_cleanup_enabled?,
	do: Pleroma.Config.get([:oauth2, :clean_expired_tokens], false)

	defp streamer_child(:test), do: []

	defp streamer_child(_) do
	[Pleroma.Web.Streamer]
	end

	defp oauth_cleanup_child(true),
	do: [Pleroma.Web.OAuth.Token.CleanWorker]

	defp oauth_cleanup_child(_), do: []

	defp chat_child(:test, _), do: []

	defp chat_child(_env, true) do
	[Pleroma.Web.ChatChannel.ChatChannelState]
	end

	defp chat_child(_, _), do: []

	defp hackney_pool_children do
	for pool <- enabled_hackney_pools() do
	options = Pleroma.Config.get([:hackney_pools, pool])
	:hackney_pool.child_spec(pool, options)
	end
	end
	end
	diff --git a/lib/pleroma/activity_expiration_worker.ex b/lib/pleroma/daemons/activity_expiration_daemon.ex
	similarity index 96%
	rename from lib/pleroma/activity_expiration_worker.ex
	rename to lib/pleroma/daemons/activity_expiration_daemon.ex
	index c0820c202..cab7628c4 100644
	--- a/lib/pleroma/activity_expiration_worker.ex
	+++ b/lib/pleroma/daemons/activity_expiration_daemon.ex
	@@ -1,66 +1,66 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	-defmodule Pleroma.ActivityExpirationWorker do
	+defmodule Pleroma.Daemons.ActivityExpirationDaemon do
	alias Pleroma.Activity
	alias Pleroma.ActivityExpiration
	alias Pleroma.Config
	alias Pleroma.Repo
	alias Pleroma.User
	alias Pleroma.Web.CommonAPI

	require Logger
	use GenServer
	import Ecto.Query

	@schedule_interval :timer.minutes(1)

	def start_link(_) do
	GenServer.start_link(__MODULE__, nil)
	end

	@impl true
	def init(_) do
	if Config.get([ActivityExpiration, :enabled]) do
	schedule_next()
	{:ok, nil}
	else
	:ignore
	end
	end

	def perform(:execute, expiration_id) do
	try do
	expiration =
	ActivityExpiration
	\|> where([e], e.id == ^expiration_id)
	\|> Repo.one!()

	activity = Activity.get_by_id_with_object(expiration.activity_id)
	user = User.get_by_ap_id(activity.object.data["actor"])
	CommonAPI.delete(activity.id, user)
	rescue
	error ->
	Logger.error("#{__MODULE__} Couldn't delete expired activity: #{inspect(error)}")
	end
	end

	@impl true
	def handle_info(:perform, state) do
	ActivityExpiration.due_expirations(@schedule_interval)
	\|> Enum.each(fn expiration ->
	Pleroma.Workers.ActivityExpirationWorker.enqueue(
	"activity_expiration",
	%{"activity_expiration_id" => expiration.id}
	)
	end)

	schedule_next()
	{:noreply, state}
	end

	defp schedule_next do
	Process.send_after(self(), :perform, @schedule_interval)
	end
	end
	diff --git a/lib/pleroma/digest_email_worker.ex b/lib/pleroma/daemons/digest_email_daemon.ex
	similarity index 96%
	rename from lib/pleroma/digest_email_worker.ex
	rename to lib/pleroma/daemons/digest_email_daemon.ex
	index 5be7cf26b..462ad2c55 100644
	--- a/lib/pleroma/digest_email_worker.ex
	+++ b/lib/pleroma/daemons/digest_email_daemon.ex
	@@ -1,42 +1,42 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	-defmodule Pleroma.DigestEmailWorker do
	+defmodule Pleroma.Daemons.DigestEmailDaemon do
	alias Pleroma.Repo
	alias Pleroma.Workers.DigestEmailsWorker

	import Ecto.Query

	def perform do
	config = Pleroma.Config.get([:email_notifications, :digest])
	negative_interval = -Map.fetch!(config, :interval)
	inactivity_threshold = Map.fetch!(config, :inactivity_threshold)
	inactive_users_query = Pleroma.User.list_inactive_users_query(inactivity_threshold)

	now = NaiveDateTime.truncate(NaiveDateTime.utc_now(), :second)

	from(u in inactive_users_query,
	where: fragment(~s(? #> '{"email_notifications","digest"}' @> 'true'), u.info),
	where: u.last_digest_emailed_at < datetime_add(^now, ^negative_interval, "day"),
	select: u
	)
	\|> Repo.all()
	\|> Enum.each(fn user ->
	DigestEmailsWorker.enqueue("digest_email", %{"user_id" => user.id})
	end)
	end

	@doc """
	Send digest email to the given user.
	Updates `last_digest_emailed_at` field for the user and returns the updated user.
	"""
	@spec perform(Pleroma.User.t()) :: Pleroma.User.t()
	def perform(user) do
	with %Swoosh.Email{} = email <- Pleroma.Emails.UserEmail.digest_email(user) do
	Pleroma.Emails.Mailer.deliver_async(email)
	end

	Pleroma.User.touch_last_digest_emailed_at(user)
	end
	end
	diff --git a/lib/pleroma/scheduled_activity_worker.ex b/lib/pleroma/daemons/scheduled_activity_daemon.ex
	similarity index 96%
	rename from lib/pleroma/scheduled_activity_worker.ex
	rename to lib/pleroma/daemons/scheduled_activity_daemon.ex
	index c41a542de..aee5f723a 100644
	--- a/lib/pleroma/scheduled_activity_worker.ex
	+++ b/lib/pleroma/daemons/scheduled_activity_daemon.ex
	@@ -1,62 +1,62 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	-defmodule Pleroma.ScheduledActivityWorker do
	+defmodule Pleroma.Daemons.ScheduledActivityDaemon do
	@moduledoc """
	Sends scheduled activities to the job queue.
	"""

	alias Pleroma.Config
	alias Pleroma.ScheduledActivity
	alias Pleroma.User
	alias Pleroma.Web.CommonAPI

	use GenServer
	require Logger

	@schedule_interval :timer.minutes(1)

	def start_link(_) do
	GenServer.start_link(__MODULE__, nil)
	end

	def init(_) do
	if Config.get([ScheduledActivity, :enabled]) do
	schedule_next()
	{:ok, nil}
	else
	:ignore
	end
	end

	def perform(:execute, scheduled_activity_id) do
	try do
	{:ok, scheduled_activity} = ScheduledActivity.delete(scheduled_activity_id)
	%User{} = user = User.get_cached_by_id(scheduled_activity.user_id)
	{:ok, _result} = CommonAPI.post(user, scheduled_activity.params)
	rescue
	error ->
	Logger.error(
	"#{__MODULE__} Couldn't create a status from the scheduled activity: #{inspect(error)}"
	)
	end
	end

	def handle_info(:perform, state) do
	ScheduledActivity.due_activities(@schedule_interval)
	\|> Enum.each(fn scheduled_activity ->
	Pleroma.Workers.ScheduledActivityWorker.enqueue(
	"execute",
	%{"activity_id" => scheduled_activity.id}
	)
	end)

	schedule_next()
	{:noreply, state}
	end

	defp schedule_next do
	Process.send_after(self(), :perform, @schedule_interval)
	end
	end
	diff --git a/lib/pleroma/workers/activity_expiration_worker.ex b/lib/pleroma/workers/activity_expiration_worker.ex
	index 60dd3feba..4e3e4195f 100644
	--- a/lib/pleroma/workers/activity_expiration_worker.ex
	+++ b/lib/pleroma/workers/activity_expiration_worker.ex
	@@ -1,23 +1,18 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Workers.ActivityExpirationWorker do
	- # Note: `max_attempts` is intended to be overridden in `new/2` call
	- use Oban.Worker,
	- queue: "activity_expiration",
	- max_attempts: 1
	-
	use Pleroma.Workers.WorkerHelper, queue: "activity_expiration"

	@impl Oban.Worker
	def perform(
	%{
	"op" => "activity_expiration",
	"activity_expiration_id" => activity_expiration_id
	},
	_job
	) do
	- Pleroma.ActivityExpirationWorker.perform(:execute, activity_expiration_id)
	+ Pleroma.Daemons.ActivityExpirationDaemon.perform(:execute, activity_expiration_id)
	end
	end
	diff --git a/lib/pleroma/workers/background_worker.ex b/lib/pleroma/workers/background_worker.ex
	index b9aef3a92..082f20ab7 100644
	--- a/lib/pleroma/workers/background_worker.ex
	+++ b/lib/pleroma/workers/background_worker.ex
	@@ -1,74 +1,69 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Workers.BackgroundWorker do
	alias Pleroma.Activity
	alias Pleroma.User
	alias Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy
	alias Pleroma.Web.OAuth.Token.CleanWorker

	- # Note: `max_attempts` is intended to be overridden in `new/2` call
	- use Oban.Worker,
	- queue: "background",
	- max_attempts: 1
	-
	use Pleroma.Workers.WorkerHelper, queue: "background"

	@impl Oban.Worker
	def perform(%{"op" => "fetch_initial_posts", "user_id" => user_id}, _job) do
	user = User.get_cached_by_id(user_id)
	User.perform(:fetch_initial_posts, user)
	end

	def perform(%{"op" => "deactivate_user", "user_id" => user_id, "status" => status}, _job) do
	user = User.get_cached_by_id(user_id)
	User.perform(:deactivate_async, user, status)
	end

	def perform(%{"op" => "delete_user", "user_id" => user_id}, _job) do
	user = User.get_cached_by_id(user_id)
	User.perform(:delete, user)
	end

	def perform(
	%{
	"op" => "blocks_import",
	"blocker_id" => blocker_id,
	"blocked_identifiers" => blocked_identifiers
	},
	_job
	) do
	blocker = User.get_cached_by_id(blocker_id)
	User.perform(:blocks_import, blocker, blocked_identifiers)
	end

	def perform(
	%{
	"op" => "follow_import",
	"follower_id" => follower_id,
	"followed_identifiers" => followed_identifiers
	},
	_job
	) do
	follower = User.get_cached_by_id(follower_id)
	User.perform(:follow_import, follower, followed_identifiers)
	end

	def perform(%{"op" => "clean_expired_tokens"}, _job) do
	CleanWorker.perform(:clean)
	end

	def perform(%{"op" => "media_proxy_preload", "message" => message}, _job) do
	MediaProxyWarmingPolicy.perform(:preload, message)
	end

	def perform(%{"op" => "media_proxy_prefetch", "url" => url}, _job) do
	MediaProxyWarmingPolicy.perform(:prefetch, url)
	end

	def perform(%{"op" => "fetch_data_for_activity", "activity_id" => activity_id}, _job) do
	activity = Activity.get_by_id(activity_id)
	Pleroma.Web.RichMedia.Helpers.perform(:fetch, activity)
	end
	end
	diff --git a/lib/pleroma/workers/digest_emails_worker.ex b/lib/pleroma/workers/digest_emails_worker.ex
	index ca073ce67..3e5a836d0 100644
	--- a/lib/pleroma/workers/digest_emails_worker.ex
	+++ b/lib/pleroma/workers/digest_emails_worker.ex
	@@ -1,21 +1,16 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Workers.DigestEmailsWorker do
	alias Pleroma.User

	- # Note: `max_attempts` is intended to be overridden in `new/2` call
	- use Oban.Worker,
	- queue: "digest_emails",
	- max_attempts: 1
	-
	use Pleroma.Workers.WorkerHelper, queue: "digest_emails"

	@impl Oban.Worker
	def perform(%{"op" => "digest_email", "user_id" => user_id}, _job) do
	user_id
	\|> User.get_cached_by_id()
	- \|> Pleroma.DigestEmailWorker.perform()
	+ \|> Pleroma.Daemons.DigestEmailDaemon.perform()
	end
	end
	diff --git a/lib/pleroma/workers/mailer_worker.ex b/lib/pleroma/workers/mailer_worker.ex
	index a4bd54a6c..1b7a0eb3e 100644
	--- a/lib/pleroma/workers/mailer_worker.ex
	+++ b/lib/pleroma/workers/mailer_worker.ex
	@@ -1,20 +1,15 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Workers.MailerWorker do
	- # Note: `max_attempts` is intended to be overridden in `new/2` call
	- use Oban.Worker,
	- queue: "mailer",
	- max_attempts: 1
	-
	use Pleroma.Workers.WorkerHelper, queue: "mailer"

	@impl Oban.Worker
	def perform(%{"op" => "email", "encoded_email" => encoded_email, "config" => config}, _job) do
	encoded_email
	\|> Base.decode64!()
	\|> :erlang.binary_to_term()
	\|> Pleroma.Emails.Mailer.deliver(config)
	end
	end
	diff --git a/lib/pleroma/workers/publisher_worker.ex b/lib/pleroma/workers/publisher_worker.ex
	index a3ac22635..455f7fc7e 100644
	--- a/lib/pleroma/workers/publisher_worker.ex
	+++ b/lib/pleroma/workers/publisher_worker.ex
	@@ -1,30 +1,25 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Workers.PublisherWorker do
	alias Pleroma.Activity
	alias Pleroma.Web.Federator

	- # Note: `max_attempts` is intended to be overridden in `new/2` call
	- use Oban.Worker,
	- queue: "federator_outgoing",
	- max_attempts: 1
	-
	use Pleroma.Workers.WorkerHelper, queue: "federator_outgoing"

	def backoff(attempt) when is_integer(attempt) do
	Pleroma.Workers.WorkerHelper.sidekiq_backoff(attempt, 5)
	end

	@impl Oban.Worker
	def perform(%{"op" => "publish", "activity_id" => activity_id}, _job) do
	activity = Activity.get_by_id(activity_id)
	Federator.perform(:publish, activity)
	end

	def perform(%{"op" => "publish_one", "module" => module_name, "params" => params}, _job) do
	params = Map.new(params, fn {k, v} -> {String.to_atom(k), v} end)
	Federator.perform(:publish_one, String.to_atom(module_name), params)
	end
	end
	diff --git a/lib/pleroma/workers/receiver_worker.ex b/lib/pleroma/workers/receiver_worker.ex
	index 3cc415ce4..83d528a66 100644
	--- a/lib/pleroma/workers/receiver_worker.ex
	+++ b/lib/pleroma/workers/receiver_worker.ex
	@@ -1,23 +1,18 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Workers.ReceiverWorker do
	alias Pleroma.Web.Federator

	- # Note: `max_attempts` is intended to be overridden in `new/2` call
	- use Oban.Worker,
	- queue: "federator_incoming",
	- max_attempts: 1
	-
	use Pleroma.Workers.WorkerHelper, queue: "federator_incoming"

	@impl Oban.Worker
	def perform(%{"op" => "incoming_doc", "body" => doc}, _job) do
	Federator.perform(:incoming_doc, doc)
	end

	def perform(%{"op" => "incoming_ap_doc", "params" => params}, _job) do
	Federator.perform(:incoming_ap_doc, params)
	end
	end
	diff --git a/lib/pleroma/workers/scheduled_activity_worker.ex b/lib/pleroma/workers/scheduled_activity_worker.ex
	index 936bb64d3..ca7d53af1 100644
	--- a/lib/pleroma/workers/scheduled_activity_worker.ex
	+++ b/lib/pleroma/workers/scheduled_activity_worker.ex
	@@ -1,17 +1,12 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Workers.ScheduledActivityWorker do
	- # Note: `max_attempts` is intended to be overridden in `new/2` call
	- use Oban.Worker,
	- queue: "scheduled_activities",
	- max_attempts: 1
	-
	use Pleroma.Workers.WorkerHelper, queue: "scheduled_activities"

	@impl Oban.Worker
	def perform(%{"op" => "execute", "activity_id" => activity_id}, _job) do
	- Pleroma.ScheduledActivityWorker.perform(:execute, activity_id)
	+ Pleroma.Daemons.ScheduledActivityDaemon.perform(:execute, activity_id)
	end
	end
	diff --git a/lib/pleroma/workers/subscriber_worker.ex b/lib/pleroma/workers/subscriber_worker.ex
	index 4fb994554..fc490e300 100644
	--- a/lib/pleroma/workers/subscriber_worker.ex
	+++ b/lib/pleroma/workers/subscriber_worker.ex
	@@ -1,31 +1,26 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Workers.SubscriberWorker do
	alias Pleroma.Repo
	alias Pleroma.Web.Federator
	alias Pleroma.Web.Websub

	- # Note: `max_attempts` is intended to be overridden in `new/2` call
	- use Oban.Worker,
	- queue: "federator_outgoing",
	- max_attempts: 1
	-
	use Pleroma.Workers.WorkerHelper, queue: "federator_outgoing"

	@impl Oban.Worker
	def perform(%{"op" => "refresh_subscriptions"}, _job) do
	Federator.perform(:refresh_subscriptions)
	end

	def perform(%{"op" => "request_subscription", "websub_id" => websub_id}, _job) do
	websub = Repo.get(Websub.WebsubClientSubscription, websub_id)
	Federator.perform(:request_subscription, websub)
	end

	def perform(%{"op" => "verify_websub", "websub_id" => websub_id}, _job) do
	websub = Repo.get(Websub.WebsubServerSubscription, websub_id)
	Federator.perform(:verify_websub, websub)
	end
	end
	diff --git a/lib/pleroma/workers/transmogrifier_worker.ex b/lib/pleroma/workers/transmogrifier_worker.ex
	index 6fecc2bf9..b581a2f86 100644
	--- a/lib/pleroma/workers/transmogrifier_worker.ex
	+++ b/lib/pleroma/workers/transmogrifier_worker.ex
	@@ -1,20 +1,15 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Workers.TransmogrifierWorker do
	alias Pleroma.User

	- # Note: `max_attempts` is intended to be overridden in `new/2` call
	- use Oban.Worker,
	- queue: "transmogrifier",
	- max_attempts: 1
	-
	use Pleroma.Workers.WorkerHelper, queue: "transmogrifier"

	@impl Oban.Worker
	def perform(%{"op" => "user_upgrade", "user_id" => user_id}, _job) do
	user = User.get_cached_by_id(user_id)
	Pleroma.Web.ActivityPub.Transmogrifier.perform(:user_upgrade, user)
	end
	end
	diff --git a/lib/pleroma/workers/web_pusher_worker.ex b/lib/pleroma/workers/web_pusher_worker.ex
	index 4c2591a5c..bea2baffb 100644
	--- a/lib/pleroma/workers/web_pusher_worker.ex
	+++ b/lib/pleroma/workers/web_pusher_worker.ex
	@@ -1,21 +1,16 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Workers.WebPusherWorker do
	alias Pleroma.Notification
	alias Pleroma.Repo

	- # Note: `max_attempts` is intended to be overridden in `new/2` call
	- use Oban.Worker,
	- queue: "web_push",
	- max_attempts: 1
	-
	use Pleroma.Workers.WorkerHelper, queue: "web_push"

	@impl Oban.Worker
	def perform(%{"op" => "web_push", "notification_id" => notification_id}, _job) do
	notification = Repo.get(Notification, notification_id)
	Pleroma.Web.Push.Impl.perform(notification)
	end
	end
	diff --git a/lib/pleroma/workers/worker_helper.ex b/lib/pleroma/workers/worker_helper.ex
	index b12f198d4..358efa14a 100644
	--- a/lib/pleroma/workers/worker_helper.ex
	+++ b/lib/pleroma/workers/worker_helper.ex
	@@ -1,41 +1,46 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Workers.WorkerHelper do
	alias Pleroma.Config
	alias Pleroma.Workers.WorkerHelper

	def worker_args(queue) do
	case Config.get([:workers, :retries, queue]) do
	nil -> []
	max_attempts -> [max_attempts: max_attempts]
	end
	end

	def sidekiq_backoff(attempt, pow \\ 4, base_backoff \\ 15) do
	backoff =
	:math.pow(attempt, pow) +
	base_backoff +
	:rand.uniform(2 * base_backoff) * attempt

	trunc(backoff)
	end

	defmacro __using__(opts) do
	caller_module = __CALLER__.module
	queue = Keyword.fetch!(opts, :queue)

	quote do
	+ # Note: `max_attempts` is intended to be overridden in `new/2` call
	+ use Oban.Worker,
	+ queue: unquote(queue),
	+ max_attempts: 1
	+
	def enqueue(op, params, worker_args \\ []) do
	params = Map.merge(%{"op" => op}, params)
	queue_atom = String.to_atom(unquote(queue))
	worker_args = worker_args ++ WorkerHelper.worker_args(queue_atom)

	unquote(caller_module)
	\|> apply(:new, [params, worker_args])
	\|> Pleroma.Repo.insert()
	end
	end
	end
	end
	diff --git a/test/activity_expiration_worker_test.exs b/test/daemons/activity_expiration_daemon_test.exs
	similarity index 86%
	rename from test/activity_expiration_worker_test.exs
	rename to test/daemons/activity_expiration_daemon_test.exs
	index 939d912f1..31f4a70a6 100644
	--- a/test/activity_expiration_worker_test.exs
	+++ b/test/daemons/activity_expiration_daemon_test.exs
	@@ -1,17 +1,17 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.ActivityExpirationWorkerTest do
	use Pleroma.DataCase
	alias Pleroma.Activity
	import Pleroma.Factory

	test "deletes an activity" do
	activity = insert(:note_activity)
	expiration = insert(:expiration_in_the_past, %{activity_id: activity.id})
	- Pleroma.ActivityExpirationWorker.perform(:execute, expiration.id)
	+ Pleroma.Daemons.ActivityExpirationDaemon.perform(:execute, expiration.id)

	refute Repo.get(Activity, activity.id)
	end
	end
	diff --git a/test/web/digest_email_worker_test.exs b/test/daemons/digest_email_daemon_test.exs
	similarity index 88%
	rename from test/web/digest_email_worker_test.exs
	rename to test/daemons/digest_email_daemon_test.exs
	index 5dfd920fa..3168f3b9a 100644
	--- a/test/web/digest_email_worker_test.exs
	+++ b/test/daemons/digest_email_daemon_test.exs
	@@ -1,35 +1,35 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	-defmodule Pleroma.DigestEmailWorkerTest do
	+defmodule Pleroma.DigestEmailDaemonTest do
	use Pleroma.DataCase
	import Pleroma.Factory

	- alias Pleroma.DigestEmailWorker
	+ alias Pleroma.Daemons.DigestEmailDaemon
	alias Pleroma.Tests.ObanHelpers
	alias Pleroma.User
	alias Pleroma.Web.CommonAPI

	test "it sends digest emails" do
	user = insert(:user)

	date =
	Timex.now()
	\|> Timex.shift(days: -10)
	\|> Timex.to_naive_datetime()

	user2 = insert(:user, last_digest_emailed_at: date)
	User.switch_email_notifications(user2, "digest", true)
	CommonAPI.post(user, %{"status" => "hey @#{user2.nickname}!"})

	- DigestEmailWorker.perform()
	+ DigestEmailDaemon.perform()
	ObanHelpers.perform_all()
	# Performing job(s) enqueued at previous step
	ObanHelpers.perform_all()

	assert_received {:email, email}
	assert email.to == [{user2.name, user2.email}]
	assert email.subject == "Your digest from #{Pleroma.Config.get(:instance)[:name]}"
	end
	end
	diff --git a/test/scheduled_activity_worker_test.exs b/test/daemons/scheduled_activity_daemon_test.exs
	similarity index 82%
	rename from test/scheduled_activity_worker_test.exs
	rename to test/daemons/scheduled_activity_daemon_test.exs
	index e3ad1244e..32820b2b7 100644
	--- a/test/scheduled_activity_worker_test.exs
	+++ b/test/daemons/scheduled_activity_daemon_test.exs
	@@ -1,19 +1,19 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	-defmodule Pleroma.ScheduledActivityWorkerTest do
	+defmodule Pleroma.ScheduledActivityDaemonTest do
	use Pleroma.DataCase
	alias Pleroma.ScheduledActivity
	import Pleroma.Factory

	test "creates a status from the scheduled activity" do
	user = insert(:user)
	scheduled_activity = insert(:scheduled_activity, user: user, params: %{status: "hi"})
	- Pleroma.ScheduledActivityWorker.perform(:execute, scheduled_activity.id)
	+ Pleroma.Daemons.ScheduledActivityDaemon.perform(:execute, scheduled_activity.id)

	refute Repo.get(ScheduledActivity, scheduled_activity.id)
	activity = Repo.all(Pleroma.Activity) \|> Enum.find(&(&1.actor == user.ap_id))
	assert Pleroma.Object.normalize(activity).data["content"] == "hi"
	end
	end

File Metadata

Mime Type: text/x-diff
Expires: Mon, Nov 2, 9:27 AM (4 h, 9 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1804202
Default Alt Text: (44 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions