yiffspace 0.0.22 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55b429503eee52d6ce298af0e2ce3e65327f630c6f7fc0114e58d49a324c2fd3
-  data.tar.gz: 017a1eaaf6a5ee571fa8e29cc3f7a2da617d1b6de78f9d5d834bb248a9212326
+  metadata.gz: 483249113d393f9851f4641c08e917c087a5c1db46cbbd44c8097c0760b883c5
+  data.tar.gz: 5e2daacda68d812268a384cc00ccc6df4cb05e267725feee663af3b1a5976e86
 SHA512:
-  metadata.gz: 62391e56655903180b26837749b124f5c4a7f6ac4180815be23bcf83295f221af0f6433d824664caf8f1c10f4d81f0074630e66b3bf956c82472eecf9e4a2ea8
-  data.tar.gz: 86671d5ef0e7c213ae10721e9024f0dafc590f4b464b2311c549e666f87d2368838efa56e54ead37d16e17d1918ad465b611b3df25f3130c9f2675ed4d49dda5
+  metadata.gz: d7df4e7e6aaabe1460202b67c70cde28dc4f6a195afa09050302b4858f532576f380b3f73ed93baea5d15530a429779269583adb3ff32f4420a12abe6962b5ca
+  data.tar.gz: 9e811ec4b770efe3df29d2664fe0b9adfde3841d501ba1614458dcdf7e3839b5e4a15d14ca035d64cb5ce3cdb17847d07b15d8dc8c98c2a6698d6d6a09863556

data/lib/tasks/yiffspace_tasks.rake

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+namespace(:yiffspace) do
+  desc("Report and interactively remove duplicate/orphaned Logto users left behind by " \
+       "get_or_create_user races. Prompts for confirmation before deleting each one. " \
+       "Pass AUTH_CLIENT=name to use a registered auth client other than :default " \
+       "(e.g. AUTH_CLIENT=yiffyapi_manage).")
+  task(dedupe_users: :environment) do
+    client_name = (ENV["AUTH_CLIENT"] || YiffSpace::Auth::DEFAULT_CLIENT_NAME).to_sym
+    management = YiffSpace::Auth[client_name].logto_management
+
+    puts("Scanning users via auth client #{client_name.inspect}...")
+    result = YiffSpace::Utils::UserDeduper.scan(management)
+
+    puts("\n#{result[:conflicts].size} discord id(s) with more than one linked user (ambiguous - not handled by this task, review manually):")
+    result[:conflicts].each do |discord_id, group|
+      puts("  discordId=#{discord_id}: #{group.map { |u| "#{u.id} (#{u.name})" }.join(', ')}")
+    end
+
+    puts("\n#{result[:unresolved_orphans].size} orphaned user(s) with no matching linked account (not handled by this task, review manually):")
+    result[:unresolved_orphans].each do |user|
+      puts("  #{user.id} (name=#{user.name}, avatar=#{user.data.avatar})")
+    end
+
+    puts("\n#{result[:deletable_orphans].size} confirmed duplicate(s) - orphan left by a losing get_or_create_user race:")
+    if result[:deletable_orphans].empty?
+      puts("  none found")
+    else
+      result[:deletable_orphans].each do |orphan, keeper|
+        print("  delete #{orphan.id} (name=#{orphan.name}, avatar=#{orphan.data.avatar}), keeping #{keeper.id} (name=#{keeper.name}) for discordId=#{YiffSpace::Utils::UserDeduper.discord_id_for(keeper)}? [y/N] ")
+        answer = $stdin.gets&.strip&.downcase
+        if answer == "y"
+          management.delete_user(orphan.id)
+          puts("    deleted #{orphan.id}")
+        else
+          puts("    skipped")
+        end
+      end
+    end
+  end
+end

data/lib/yiffspace/core_ext/all.rb

@@ -4,4 +4,5 @@ require_relative("active_record/all")
 require_relative("arel/all")
 require_relative("enumerable/all")
 require_relative("hash/all")
+require_relative("object/all")
 require_relative("string/all")

data/lib/yiffspace/core_ext/object/all.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require_relative("to_b")
+require_relative("truthy_falsy")

data/lib/yiffspace/core_ext/object/to_b.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require_relative("../../extensions/object/to_b")
+
+class Object
+  include(YiffSpace::Extensions::Object::ToB)
+end

data/lib/yiffspace/core_ext/object/truthy_falsy.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require_relative("../../extensions/object/truthy_falsy")
+
+class Object
+  include(YiffSpace::Extensions::Object::TruthyFalsy)
+end

data/lib/yiffspace/core_ext/string/all.rb

@@ -1,5 +1,3 @@
 # frozen_string_literal: true
 
 require_relative("sql")
-require_relative("to_b")
-require_relative("truthy_falsy")

data/lib/yiffspace/extensions/object/to_b.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module YiffSpace
+  module Extensions
+    module Object
+      module ToB
+        def to_b
+          case self
+          when ::String
+            !match?(/\A(false|f|no|n|off|0)\z/i)
+          when ::TrueClass
+            true
+          when ::FalseClass
+            false
+          else
+            to_s.to_b
+          end
+        end
+      end
+    end
+  end
+end

data/lib/yiffspace/extensions/object/truthy_falsy.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module YiffSpace
+  module Extensions
+    module Object
+      module TruthyFalsy
+        def truthy?
+          case self
+          when ::String
+            match?(/\A(true|t|yes|y|on|1)\z/i)
+          when ::TrueClass
+            true
+          when ::FalseClass
+            false
+          else
+            to_s.truthy?
+          end
+        end
+
+        def falsy?
+          case self
+          when ::String
+            match?(/\A(false|f|no|n|off|0)\z/i)
+          when ::TrueClass
+            false
+          when ::FalseClass
+            true
+          else
+            to_s.falsy?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/yiffspace/logto_management_client.rb

@@ -75,6 +75,35 @@ module YiffSpace
       get_user(id) || create_user(id)
     end
 
+    # Pages through every user in the tenant. Used by maintenance tasks (e.g. the
+    # dedupe_users rake task) - there's no discordId to filter by when scanning the
+    # whole user base for duplicates/orphans.
+    def list_users(page_size: 100)
+      users = []
+      page = 1
+      loop do
+        response = HTTParty.get("#{auth.server_url}/api/users", {
+          headers: { "Authorization" => "Bearer #{get_token}" },
+          query:   { page: page, page_size: page_size },
+        })
+        raise("failed to list users: #{response.code} #{response.message}\n#{response.parsed_response.inspect}") if response.code != 200 || !response.parsed_response.is_a?(Array)
+
+        batch = response.parsed_response
+        users.concat(batch.map { |u| Auth::ApiUser.new(u) })
+        break if batch.length < page_size
+
+        page += 1
+      end
+      users
+    end
+
+    def delete_user(logto_id)
+      response = HTTParty.delete("#{auth.server_url}/api/users/#{logto_id}", { headers: { "Authorization" => "Bearer #{get_token}" } })
+      return true if [204, 404].include?(response.code)
+
+      raise("failed to delete user #{logto_id}: #{response.code} #{response.message}\n#{response.parsed_response.inspect}")
+    end
+
     def get_user_by_id(logto_id)
       response = HTTParty.get("#{auth.server_url}/api/users/#{logto_id}", { headers: { "Authorization" => "Bearer #{get_token}" } })
       return nil if response.code == 404

data/lib/yiffspace/utils/user_deduper.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module YiffSpace
+  module Utils
+    # get_or_create_user is check-then-act (query Logto, then create) with no locking
+    # of its own - two concurrent calls for a discord id that doesn't exist yet will
+    # both create a user, and the loser's discord-identity-attach step fails once the
+    # winner's identity claims it first. That leaves an identity-less "orphan" user
+    # behind in Logto. This scans the whole user base to find those orphans (and any
+    # other duplicate/ambiguous state) so they can be cleaned up.
+    module UserDeduper
+      # create_user sets a new user's avatar to the discord CDN URL for the discord id
+      # it was created for, before the identity-attach step runs - so even an orphan
+      # that never got its identity attached still reveals which discord id it was
+      # meant for.
+      AVATAR_ID_PATTERN = %r{cdn\.discordapp\.com/avatars/(\d+)/}
+
+      module_function
+
+      def discord_id_for(user)
+        user.data.identities&.discord&.userId || avatar_discord_id_for(user)
+      end
+
+      def avatar_discord_id_for(user)
+        match = user.data.avatar.to_s.match(AVATAR_ID_PATTERN)
+        match && match[1]
+      end
+
+      def linked?(user)
+        user.data.identities&.discord&.userId.present?
+      end
+
+      # Returns a hash with:
+      # - :conflicts - discord id => users, for ids where more than one user has the
+      #   identity actually attached. Ambiguous; always needs manual review, never
+      #   auto-deleted.
+      # - :deletable_orphans - [orphan, keeper] pairs, where orphan has no identity
+      #   attached but its avatar points at a discord id claimed by exactly one other
+      #   (linked) user. This is the confirmed race-loser case - safe to delete.
+      # - :unresolved_orphans - users with no identity attached and no corresponding
+      #   linked user (still mid-race, or the winner can't be identified). Reported
+      #   only, never auto-deleted.
+      def scan(management)
+        users = management.list_users
+        linked, unlinked = users.partition { |u| linked?(u) }
+
+        by_discord_id = linked.group_by { |u| u.data.identities.discord.userId }
+        conflicts = by_discord_id.select { |_id, group| group.length > 1 }
+
+        deletable_orphans = []
+        unresolved_orphans = []
+        unlinked.each do |user|
+          discord_id = avatar_discord_id_for(user)
+          keeper = discord_id && by_discord_id[discord_id]
+          if keeper&.length == 1
+            deletable_orphans << [user, keeper.first]
+          else
+            unresolved_orphans << user
+          end
+        end
+
+        { conflicts: conflicts, deletable_orphans: deletable_orphans, unresolved_orphans: unresolved_orphans }
+      end
+    end
+  end
+end

data/lib/yiffspace/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module YiffSpace
-  VERSION = "0.0.22"
+  VERSION = "0.0.24"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: yiffspace
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.24
 platform: ruby
 authors:
 - Donovan_DMC
 bindir: bin
 cert_chain: []
-date: 2026-07-03 00:00:00.000000000 Z
+date: 2026-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abbrev
@@ -117,7 +117,7 @@ files:
 - engines/auth/app/controllers/yiff_space/auth/webhook_controller.rb
 - engines/auth/app/views/yiff_space/auth/root/permissions.html.erb
 - engines/auth/config/routes.rb
-- lib/tasks/yiff_space_tasks.rake
+- lib/tasks/yiffspace_tasks.rake
 - lib/yiffspace.rb
 - lib/yiffspace/auth.rb
 - lib/yiffspace/auth/api_user.rb
@@ -159,10 +159,11 @@ files:
 - lib/yiffspace/core_ext/hash/all.rb
 - lib/yiffspace/core_ext/hash/to_open_hash.rb
 - lib/yiffspace/core_ext/logto/named_session_storage.rb
+- lib/yiffspace/core_ext/object/all.rb
+- lib/yiffspace/core_ext/object/to_b.rb
+- lib/yiffspace/core_ext/object/truthy_falsy.rb
 - lib/yiffspace/core_ext/string/all.rb
 - lib/yiffspace/core_ext/string/sql.rb
-- lib/yiffspace/core_ext/string/to_b.rb
-- lib/yiffspace/core_ext/string/truthy_falsy.rb
 - lib/yiffspace/extensions/action_dispatch/set_auth_client.rb
 - lib/yiffspace/extensions/action_dispatch/set_auth_client/scoped.rb
 - lib/yiffspace/extensions/active_record/where_chain.rb
@@ -175,9 +176,9 @@ files:
 - lib/yiffspace/extensions/enumerable/parallel.rb
 - lib/yiffspace/extensions/hash/to_open_hash.rb
 - lib/yiffspace/extensions/logto/named_session_storage.rb
+- lib/yiffspace/extensions/object/to_b.rb
+- lib/yiffspace/extensions/object/truthy_falsy.rb
 - lib/yiffspace/extensions/string/sql.rb
-- lib/yiffspace/extensions/string/to_b.rb
-- lib/yiffspace/extensions/string/truthy_falsy.rb
 - lib/yiffspace/images.rb
 - lib/yiffspace/images/avatar.rb
 - lib/yiffspace/images/avatar/base.rb
@@ -231,6 +232,7 @@ files:
 - lib/yiffspace/utils/table_builder.rb
 - lib/yiffspace/utils/trace_logger.rb
 - lib/yiffspace/utils/user_attribute.rb
+- lib/yiffspace/utils/user_deduper.rb
 - lib/yiffspace/utils/user_like.rb
 - lib/yiffspace/utils/user_resolvable.rb
 - lib/yiffspace/utils/user_to_id.rb

data/lib/tasks/yiff_space_tasks.rake

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-# desc "Explaining what the task does"
-# task :yiffspace do
-#   # Task goes here
-# end

data/lib/yiffspace/core_ext/string/to_b.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-require_relative("../../extensions/string/to_b")
-
-class String
-  include(YiffSpace::Extensions::String::ToB)
-end

data/lib/yiffspace/core_ext/string/truthy_falsy.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-require_relative("../../extensions/string/truthy_falsy")
-
-class String
-  include(YiffSpace::Extensions::String::TruthyFalsy)
-end

data/lib/yiffspace/extensions/string/to_b.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module YiffSpace
-  module Extensions
-    module String
-      module ToB
-        def to_b # rubocop:disable Naming/PredicateMethod
-          !match?(/\A(false|f|no|n|off|0)\z/i)
-        end
-      end
-    end
-  end
-end

data/lib/yiffspace/extensions/string/truthy_falsy.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module YiffSpace
-  module Extensions
-    module String
-      module TruthyFalsy
-        def truthy?
-          match?(/\A(true|t|yes|y|on|1)\z/i)
-        end
-
-        def falsy?
-          match?(/\A(false|f|no|n|off|0)\z/i)
-        end
-      end
-    end
-  end
-end