An open source, non-profit web search engine
Merge remote-tracking branch 'origin/main' into claude/busy-cori-7qqkcu
Claudeb8da7fcdcfc6
diff --cc mwmbl/migrations/0044_mwmbluser_combined_search_enabled.pyindex 8590425,0000000..e63e91cmode 100644,000000..100644--- a/mwmbl/migrations/0044_mwmbluser_combined_search_enabled.py+++ b/mwmbl/migrations/0044_mwmbluser_combined_search_enabled.py@@@ -1,22 -1,0 +1,22 @@@+from django.db import migrations, models+++class Migration(migrations.Migration):+ dependencies = [- ("mwmbl", "0041_usagebucket_combined_search"),++ ("mwmbl", "0043_seed_domains"),+ ]++ # Existing users get False, so nobody already registered has Combined Search switched on for them;+ # the second step makes it on for accounts created from now on.+ operations = [+ migrations.AddField(+ model_name="mwmbluser",+ name="combined_search_enabled",+ field=models.BooleanField(default=False),+ ),+ migrations.AlterField(+ model_name="mwmbluser",+ name="combined_search_enabled",+ field=models.BooleanField(default=True),+ ),+ ]diff --cc mwmbl/models.pyindex 7c24b32,bfd12b1..b0ac450--- a/mwmbl/models.py+++ b/mwmbl/models.py@@@ -11,9 -11,11 +11,14 @@@ from mwmbl.utils import bare_hosclass MwmblUser(AbstractUser):+ # Pages the user's seed crawls (Combined Search with crawl=true) have added to the index,+ # all time. A total on the user rather than a UserStats column, because a UserStats row+ # created for it would enter the crawl leaderboards with no crawl results behind it.+ seed_search_pages_indexed = models.IntegerField(default=0)++ # On for new accounts. Accounts created before this field existed start off (see the migration).+ combined_search_enabled = models.BooleanField(default=True)+class UserCuration(models.Model):"""