Fix warnings

flavours/classic/config/bonfire_data.exs

@@ -140,7 +140,7 @@ alias Bonfire.Data.ActivityPub.Actor
 alias Bonfire.Data.ActivityPub.Peer
 alias Bonfire.Data.ActivityPub.Peered
 
-alias Bonfire.Boundaries.Permitted
+# alias Bonfire.Boundaries.Permitted
 alias Bonfire.Boundaries.Stereotyped
 
 alias Bonfire.Data.Edges.Edge
@@ -334,7 +334,7 @@ config :pointers, Pointer,
          join_keys: [circle_id: :id, subject_id: :id]
        )
 
-       has_one(:permitted, unquote(Permitted), foreign_key: :object_id)
+       #  has_one(:permitted, unquote(Permitted), foreign_key: :object_id)
        has_one(:user, unquote(User), foreign_key: :id)
        has_one(:post, unquote(Post), foreign_key: :id)
        has_one(:message, unquote(Message), foreign_key: :id)
@@ -482,8 +482,18 @@ config :bonfire_data_identity, Character,
        unquote_splicing(common.([:actor, :peered, :profile]))
        has_one(:user, unquote(User), unquote(mixin))
        has_one(:feed, unquote(Feed), unquote(mixin))
-       has_many(:followers, unquote(Follow), foreign_key: :following_id, references: :id)
-       has_many(:followed, unquote(Follow), foreign_key: :follower_id, references: :id)
+
+       has_many(:followers, unquote(Edge),
+         foreign_key: :object_id,
+         references: :id,
+         where: [table_id: @follow_ulid]
+       )
+
+       has_many(:followed, unquote(Edge),
+         foreign_key: :subject_id,
+         references: :id,
+         where: [table_id: @follow_ulid]
+       )
 
        has_one(:follow_count, unquote(EdgeTotal),
          foreign_key: :id,
@@ -762,7 +772,7 @@ config :bonfire_data_social, Post,
        # has
        unquote_splicing(common.([:direct_replies]))
        # special
-       has_one(:permitted, unquote(Permitted), foreign_key: :object_id)
+       #  has_one(:permitted, unquote(Permitted), foreign_key: :object_id)
        # has_one:  [creator_user: {[through: [:created, :creator_user]]}],
        # has_one:  [creator_character: {[through: [:created, :creator_character]]}],
        # has_one:  [creator_profile: {[through: [:created, :creator_profile]]}],
@@ -889,7 +899,7 @@ config :bonfire_pages, Page,
        unquote_splicing(common.([:controlled, :tagged, :tags, :files, :media, :feed_publishes]))
 
        # special
-       has_one(:permitted, unquote(Permitted), foreign_key: :object_id)
+       #  has_one(:permitted, unquote(Permitted), foreign_key: :object_id)
 
        has_one(:like_count, unquote(EdgeTotal),
          references: :id,
@@ -929,7 +939,7 @@ config :bonfire_pages, Section,
        unquote_splicing(common.([:controlled, :tagged, :tags, :files, :media, :feed_publishes]))
 
        # special
-       has_one(:permitted, unquote(Permitted), foreign_key: :object_id)
+       #  has_one(:permitted, unquote(Permitted), foreign_key: :object_id)
 
        has_one(:like_count, unquote(EdgeTotal),
          references: :id,

justfile

@@ -118,13 +118,15 @@ prepare:
 	just build
 
 # Run the app in development
-dev: init dev-run 
+@dev *args='': init 
+	just dev-run {{args}}
 
 @dev-extra: 
 	iex --sname extra --remsh dev
 
-@dev-run:
-	{{ if WITH_DOCKER == "total" { "just docker-stop-web && docker-compose run --name $WEB_CONTAINER --service-ports web" } else { "iex --sname dev -S mix phx.server" } }}
+dev-run *args='':
+	{{ if WITH_DOCKER == "total" { "just docker-stop-web && docker-compose run --name $WEB_CONTAINER --service-ports web" } else { "iex --sname dev -S mix phx.server $args" } }}
+# TODO: pass args to docker as well
 
 @dev-remote: init
 	{{ if WITH_DOCKER == "total" { "WITH_FORKS=0 just docker-stop-web && docker-compose run --name $WEB_CONTAINER --service-ports web" } else { "WITH_FORKS=0 iex -S mix phx.server" } }}
@@ -146,9 +148,14 @@ arch:
 	just mix arch.apps.xref --format svg --out reports/dev/static/html/data/apps.svg
 # just mix arch.xref --format svg --out reports/dev/static/modules.png Bonfire.Web.Router Bonfire.UI.Social.Routes Bonfire.UI.Me.Routes 
 
-# Force the app to recompile
-recompile: 
-	just mix "compile --force"
+# Compile the app + extensions
+compile *args='': 
+	just mix bonfire.deps.compile $args
+	just mix compile $args
+
+# Force the app + extensions to recompile
+recompile *args='': 
+	just compile --force $args
 
 dev-test: 
 	@MIX_ENV=test START_SERVER=yes just dev-run

mix.exs

@@ -310,8 +310,8 @@ defmodule Bonfire.Umbrella.MixProject do
       "bonfire.deps.clean.api": [
         "deps.clean " <> Mixer.deps_to_clean(config(), :api) <> " --build"
       ],
-      "bonfire.deps.recompile": [
-        "deps.compile " <> Mixer.deps_to_update(config()) <> " --force"
+      "bonfire.deps.compile": [
+        "deps.compile " <> Mixer.deps_to_update(config())
       ],
       "ecto.seeds": [
         "run #{Mixer.flavour_path(config())}/repo/seeds.exs"

mix.lock

@@ -44,7 +44,7 @@
   "bonfire_search": {:git, "https://github.com/bonfire-networks/bonfire_search", "27b55370e0e61f7a154b3c9d9efea2860d96bf23", [branch: "main"]},
   "bonfire_social": {:git, "https://github.com/bonfire-networks/bonfire_social", "9fead2eae3c8bce093a20f04639dc8467adba319", [branch: "main"]},
   "bonfire_tag": {:git, "https://github.com/bonfire-networks/bonfire_tag", "d09a092d5adf53e6d830fb6fd7cbd94f8db9284e", [branch: "main"]},
-  "bonfire_ui_common": {:git, "https://github.com/bonfire-networks/bonfire_ui_common", "90e0a24ed4a80976dc91b144263033755914a702", [branch: "main"]},
+  "bonfire_ui_common": {:git, "https://github.com/bonfire-networks/bonfire_ui_common", "b669a42f09cdb13911fc7febe0660ee09ec986be", [branch: "main"]},
   "bonfire_ui_coordination": {:git, "https://github.com/bonfire-networks/bonfire_ui_coordination", "2fd412764bfa82aebede8e0b97e8715a834a8db1", [branch: "main"]},
   "bonfire_ui_kanban": {:git, "https://github.com/bonfire-networks/bonfire_ui_kanban", "22b3378bb7d57105743e7541b777078663636a75", [branch: "main"]},
   "bonfire_ui_me": {:git, "https://github.com/bonfire-networks/bonfire_ui_me", "0c2f0e0cdc45b53d966912071283b4e68224ab8b", [branch: "main"]},