fedi

docs/CHANGELOG-autogenerated.md

@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 
-## [Unreleased (2022-10-27)]
+## [Unreleased (2022-10-29)]
 ### Added
 - Enable/disable extensions [#448](https://github.com/bonfire-networks/bonfire-app/issues/448) 
 - Coordination MVP [#445](https://github.com/bonfire-networks/bonfire-app/issues/445) by mayel & ivanminutillo

flavours/classic/config/config.exs

@@ -84,8 +84,7 @@ config :bonfire, Oban,
   plugins: [Oban.Plugins.Pruner],
   queues: [
     federator_incoming: 50,
-    federator_outgoing: 50,
-    ap_incoming: 15
+    federator_outgoing: 50
   ]
 
 config :mime, :types, %{

flavours/classic/config/dev.exs

@@ -73,9 +73,11 @@ config :bonfire, Bonfire.Web.Endpoint,
       ] ++ path_dep_patterns
   ]
 
-config :logger, :console,
+config :logger,
   level: :debug,
-  truncate: :infinity,
+  truncate: :infinity
+
+config :logger, :console,
   # Do not include metadata or timestamps
   format: "[$level] $message\n"
 

flavours/classic/config/test.exs

@@ -44,15 +44,11 @@ config :bonfire, Bonfire.Common.Repo,
 
 config :bonfire, Bonfire.Web.Endpoint, http: [port: 4001]
 
-config :bonfire, Oban, testing: :manual
-
 config :pbkdf2_elixir, :rounds, 1
 
 config :mix_test_interactive,
   clear: true
 
-config :paginator, ecto_repos: [Bonfire.Common.Repo]
-
 config :paginator, Paginator.Repo,
   pool: Ecto.Adapters.SQL.Sandbox,
   username: System.get_env("POSTGRES_USER", "postgres"),

flavours/cooperation/config/activity_pub_test.exs

@@ -1,18 +1,9 @@
 import Config
 
-config :activity_pub, :repo, Bonfire.Common.Repo
-config :activity_pub, :endpoint_module, Bonfire.Web.Endpoint
-
 config :activity_pub, :adapter, Bonfire.Federate.ActivityPub.Adapter
-
-config :activity_pub, ecto_repos: [Bonfire.Common.Repo]
-
-config :activity_pub, Oban,
-  repo: Bonfire.Common.Repo,
-  queues: false
-
 config :activity_pub, :instance, federating: false
 # rewrite_policy: [ActivityPub.MRF.SimplePolicy]
+config :activity_pub, :disable_test_apps, true
 
 config :tesla, adapter: Tesla.Mock
 

flavours/cooperation/config/config.exs

@@ -43,9 +43,11 @@ config :bonfire, Bonfire.Web.Endpoint,
 config :phoenix, :json_library, Jason
 config :phoenix_gon, :json_library, Jason
 
+config :bonfire, ecto_repos: [Bonfire.Common.Repo]
 config :ecto_sparkles, :otp_app, :bonfire
-config :bonfire, :ecto_repos, [Bonfire.Common.Repo]
 config :rauversion_extension, :repo_module, Bonfire.Common.Repo
+config :activity_pub, :repo, Bonfire.Common.Repo
+config :activity_pub, :endpoint_module, Bonfire.Web.Endpoint
 
 config :rauversion_extension, :user_schema, Bonfire.Data.Identity.User
 config :rauversion_extension, :router_helper, Bonfire.Web.Router.Helpers
@@ -55,6 +57,7 @@ config :rauversion_extension, :user_key_type, :uuid
 
 config :bonfire, Bonfire.Common.Repo, types: Bonfire.Geolocate.PostgresTypes
 config :bonfire, Bonfire.Common.TestInstanceRepo, types: Bonfire.Geolocate.PostgresTypes
+config :bonfire, Bonfire.Common.TestInstanceRepo, database: "bonfire_test_instance"
 # priv: flavour_path <> "/repo"
 
 # ecto query filtering
@@ -69,8 +72,7 @@ config :bonfire, Oban,
   plugins: [Oban.Plugins.Pruner],
   queues: [
     federator_incoming: 50,
-    federator_outgoing: 50,
-    ap_incoming: 15
+    federator_outgoing: 50
   ]
 
 config :mime, :types, %{

flavours/cooperation/config/dev.exs

@@ -62,9 +62,11 @@ config :bonfire, Bonfire.Web.Endpoint,
 
 config :bonfire, Bonfire.Web.Endpoint, phoenix_profiler: [server: Bonfire.Web.Profiler]
 
-config :logger, :console,
+config :logger,
   level: :debug,
-  # truncate: :infinity,
+  truncate: :infinity
+
+config :logger, :console,
   # Do not include metadata or timestamps
   format: "[$level] $message\n"
 

flavours/cooperation/config/runtime.exs

@@ -100,17 +100,21 @@ database =
     _ -> System.get_env("POSTGRES_DB", "bonfire")
   end
 
-config :bonfire, :ecto_repos, repos
+config :bonfire, ecto_repos: repos
 config :paginator, ecto_repos: repos
 config :bonfire, Bonfire.Common.Repo, repo_connection_config
 config :bonfire, Bonfire.Common.TestInstanceRepo, repo_connection_config
 config :beacon, Beacon.Repo, repo_connection_config
 config :bonfire, Bonfire.Common.Repo, database: database
-config :bonfire, Bonfire.Common.TestInstanceRepo, database: "bonfire_test_instance"
 config :beacon, Beacon.Repo, database: database
 config :paginator, Paginator.Repo, database: database
 config :beacon, Beacon.Repo, pool_size: pool_size
 config :bonfire, Bonfire.Common.TestInstanceRepo, priv: "priv/repo"
+config :activity_pub, ecto_repos: repos
+
+config :activity_pub, Oban,
+  repo: Bonfire.Common.Repo,
+  queues: false
 
 # start prod-only config
 if config_env() == :prod do

flavours/cooperation/config/test.exs

@@ -12,8 +12,9 @@ config :bonfire_search,
 
 ## Other general test config
 
-config :logger, level: :info
-# config :logger, level: :notice
+config :logger,
+  level: :info,
+  truncate: :infinity
 
 # Configure your database
 # db = "bonfire_test#{System.get_env("MIX_TEST_PARTITION")}"
@@ -42,13 +43,26 @@ config :bonfire, Bonfire.Web.FakeRemoteEndpoint,
   live_view: [signing_salt: System.get_env("SIGNING_SALT")],
   render_errors: [view: Bonfire.UI.Common.ErrorView, accepts: ~w(html json), layout: false]
 
-config :tesla,
-  adapter:
-    if(System.get_env("TEST_INSTANCE") == "yes", do: Tesla.Adapter.Hackney, else: Tesla.Mock)
+test_instance? = System.get_env("TEST_INSTANCE") == "yes"
 
-config :bonfire, Oban,
-  # testing: :inline
-  testing: if(System.get_env("TEST_INSTANCE") == "yes", do: :inline, else: :manual)
+config :tesla,
+  adapter: if(test_instance?, do: Tesla.Adapter.Hackney, else: Tesla.Mock)
+
+oban_mode = if(test_instance?, do: :inline, else: :manual)
+config :bonfire, Oban, testing: oban_mode
+config :activity_pub, Oban, testing: oban_mode
+
+config :activity_pub, :disable_cache, test_instance?
+
+if test_instance? do
+  config :logger, :console,
+    format: "[$level $metadata] $message\n",
+    metadata: [:instance, :action]
+else
+  config :logger, :console,
+    format: "[$level $metadata] $message\n",
+    metadata: [:action]
+end
 
 config :pbkdf2_elixir, :rounds, 1
 

flavours/haha/config/config.exs

@@ -61,8 +61,7 @@ config :bonfire, Oban,
   plugins: [Oban.Plugins.Pruner],
   queues: [
     federator_incoming: 50,
-    federator_outgoing: 50,
-    ap_incoming: 15
+    federator_outgoing: 50
   ]
 
 config :mime, :types, %{

flavours/haha/config/dev.exs

@@ -56,9 +56,11 @@ config :bonfire, Bonfire.Web.Endpoint,
       ] ++ path_dep_patterns
   ]
 
-config :logger, :console,
+config :logger,
   level: :debug,
-  # truncate: :infinity,
+  truncate: :infinity
+
+config :logger, :console,
   # Do not include metadata or timestamps
   format: "[$level] $message\n"
 

flavours/haha/config/test.exs

@@ -34,8 +34,6 @@ config :bonfire, Bonfire.Web.Endpoint,
   http: [port: 4000],
   server: false
 
-config :bonfire, Oban, testing: :manual
-
 config :pbkdf2_elixir, :rounds, 1
 
 config :mix_test_interactive,

flavours/reflow/config/config.exs

@@ -62,8 +62,7 @@ config :bonfire, Oban,
   plugins: [Oban.Plugins.Pruner],
   queues: [
     federator_incoming: 50,
-    federator_outgoing: 50,
-    ap_incoming: 15
+    federator_outgoing: 50
   ]
 
 config :mime, :types, %{

flavours/reflow/config/dev.exs

@@ -55,9 +55,11 @@ config :bonfire, Bonfire.Web.Endpoint,
       ] ++ path_dep_patterns
   ]
 
-config :logger, :console,
+config :logger,
   level: :debug,
-  # truncate: :infinity,
+  truncate: :infinity
+
+config :logger, :console,
   # Do not include metadata or timestamps
   format: "[$level] $message\n"
 

flavours/reflow/config/test.exs

@@ -47,8 +47,6 @@ config :bonfire, Bonfire.Web.FakeRemoteEndpoint,
   live_view: [signing_salt: System.get_env("SIGNING_SALT")],
   render_errors: [view: Bonfire.UI.Common.ErrorView, accepts: ~w(html json), layout: false]
 
-config :bonfire, Oban, testing: :manual
-
 config :pbkdf2_elixir, :rounds, 1
 
 config :mix_test_interactive,

justfile

@@ -411,7 +411,7 @@ ap_lib := "forks/activity_pub"
 ap_integration := "forks/bonfire_federate_activitypub/test/activity_pub_integration"
 ap_boundaries := "forks/bonfire_federate_activitypub/test/ap_boundaries"
 ap_ext := "forks/*/test/*federat* forks/*/test/*/*federat* forks/*/test/*/*/*federat*"
-# ap_two := "forks/bonfire_federate_activitypub/test/two_instances"
+# ap_two := "forks/bonfire_federate_activitypub/test/dance"
 
 test-federation: 
 	just test-stale {{ ap_lib }}
@@ -428,7 +428,7 @@ test-federation-integration *args=ap_integration:
 test-federation-ext *args=ap_ext: 
 	just test-watch $@
 
-test-federation-two *args='': 
+test-federation-dance *args='': 
 	TEST_INSTANCE=yes just test-watch --only test_instance $@
 
 # dev-test-watch: init ## Run tests