Merge branch 'develop'

Fix path traversal in manual installation steps

.env.template

@@ -68,6 +68,10 @@ SHOPPING_MIN_AUTOSYNC_INTERVAL=5
 # when unset: 1 (true) - this is temporary until an appropriate amount of time has passed for everyone to migrate
 GUNICORN_MEDIA=0
 
+# GUNICORN SERVER RELATED SETTINGS (see https://docs.gunicorn.org/en/stable/design.html#how-many-workers for recommended settings)
+# GUNICORN_WORKERS=1
+# GUNICORN_THREADS=1
+
 # S3 Media settings: store mediafiles in s3 or any compatible storage backend (e.g. minio)
 # as long as S3_ACCESS_KEY is not set S3 features are disabled
 # S3_ACCESS_KEY=
@@ -77,6 +81,7 @@ GUNICORN_MEDIA=0
 # S3_QUERYSTRING_AUTH=1 # default true, set to 0 to serve media from a public bucket without signed urls
 # S3_QUERYSTRING_EXPIRE=3600 # number of seconds querystring are valid for
 # S3_ENDPOINT_URL= # when using a custom endpoint like minio
+# S3_CUSTOM_DOMAIN= # when using a CDN/proxy to S3 (see https://github.com/TandoorRecipes/recipes/issues/1943)
 
 # Email Settings, see https://docs.djangoproject.com/en/3.2/ref/settings/#email-host
 # Required for email confirmation and password reset (automatically activates if host is set)
@@ -92,7 +97,7 @@ GUNICORN_MEDIA=0
 # ACCOUNT_EMAIL_SUBJECT_PREFIX=
 
 # allow authentication via reverse proxy (e.g. authelia), leave off if you dont know what you are doing
-# see docs for more information https://vabene1111.github.io/recipes/features/authentication/
+# see docs for more information https://docs.tandoor.dev/features/authentication/
 # when unset: 0 (false)
 REVERSE_PROXY_AUTH=0
 
@@ -121,7 +126,7 @@ REVERSE_PROXY_AUTH=0
 # ENABLE_METRICS=0
 
 # allows you to setup OAuth providers
-# see docs for more information https://vabene1111.github.io/recipes/features/authentication/
+# see docs for more information https://docs.tandoor.dev/features/authentication/
 # SOCIAL_PROVIDERS = allauth.socialaccount.providers.github, allauth.socialaccount.providers.nextcloud,
 
 # Should a newly created user from a social provider get assigned to the default space and given permission by default ?

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 name: Continuous Integration
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -14,13 +14,13 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python 3.10
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: '3.10'
     # Build Vue frontend
-    - uses: actions/setup-node@v2
+    - uses: actions/setup-node@v3
       with:
-        node-version: '14'
+        node-version: '16'
     - name: Install Vue dependencies
       working-directory: ./vue
       run: yarn install
@@ -30,7 +30,7 @@ jobs:
     - name: Install Django dependencies
       run: |
         sudo apt-get -y update
-        sudo apt-get install -y libsasl2-dev python-dev libldap2-dev libssl-dev
+        sudo apt-get install -y libsasl2-dev python3-dev libldap2-dev libssl-dev
         python -m pip install --upgrade pip
         pip install -r requirements.txt
         python3 manage.py collectstatic --noinput

.gitignore

@@ -84,3 +84,4 @@ cookbook/static/vue
 vue/webpack-stats.json
 cookbook/templates/sw.js
 .prettierignore
+vue/.yarn

.idea/recipes.iml

@@ -18,7 +18,7 @@
       <excludeFolder url="file://$MODULE_DIR$/staticfiles" />
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.9 (recipes)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.11 (recipes)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TemplatesService">

README.md

@@ -71,8 +71,7 @@ Because of that there are several ways you can support us
 - **Let us host for you** We are offering a [hosted version](https://app.tandoor.dev) where all profits support us and the development of tandoor (currently only available in germany).  
 
 ## Contributing
-
-You can help out with the ongoing development by looking for potential bugs in our code base, or by contributing new features. We are always welcoming new pull requests containing bug fixes, refactors and new features. We have a list of tasks and bugs on our issue tracker on Github. Please comment on issues if you want to contribute with, to avoid duplicating effort.
+Contributions are welcome but please read [this](https://docs.tandoor.dev/contribute/#contributing-code) **BEFORE** contributing anything!
 
 ## Your Feedback
 

SECURITY.md

@@ -6,5 +6,4 @@ Since this software is still considered beta/WIP support is always only given fo
 
 ## Reporting a Vulnerability
 
-Please open a normal public issue if you have any security related concerns. If you feel like the issue should not be discussed in 
-public just open a generic issue and we will discuss further communication there (since GitHub does not allow everyone to create a security advisory :/).
+Please use GitHub Security Advisories to report any kind of security vulnerabilities.

boot.sh

@@ -2,6 +2,8 @@
 source venv/bin/activate
 
 TANDOOR_PORT="${TANDOOR_PORT:-8080}"
+GUNICORN_WORKERS="${GUNICORN_WORKERS:-3}"
+GUNICORN_THREADS="${GUNICORN_THREADS:-2}"
 NGINX_CONF_FILE=/opt/recipes/nginx/conf.d/Recipes.conf
 
 display_warning() {
@@ -63,4 +65,4 @@ echo "Done"
 
 chmod -R 755 /opt/recipes/mediafiles
 
-exec gunicorn -b :$TANDOOR_PORT --access-logfile - --error-logfile - --log-level INFO recipes.wsgi
+exec gunicorn -b :$TANDOOR_PORT --workers $GUNICORN_WORKERS --threads $GUNICORN_THREADS --access-logfile - --error-logfile - --log-level INFO recipes.wsgi

cookbook/admin.py

@@ -15,7 +15,7 @@ from .models import (BookmarkletImport, Comment, CookLog, Food, FoodInheritField
                      Recipe, RecipeBook, RecipeBookEntry, RecipeImport, SearchPreference, ShareLink,
                      ShoppingList, ShoppingListEntry, ShoppingListRecipe, Space, Step, Storage,
                      Supermarket, SupermarketCategory, SupermarketCategoryRelation, Sync, SyncLog,
-                     TelegramBot, Unit, UserFile, UserPreference, ViewLog, Automation)
+                     TelegramBot, Unit, UserFile, UserPreference, ViewLog, Automation, UserSpace)
 
 
 class CustomUserAdmin(UserAdmin):
@@ -36,7 +36,7 @@ def delete_space_action(modeladmin, request, queryset):
 
 
 class SpaceAdmin(admin.ModelAdmin):
-    list_display = ('name', 'created_by', 'max_recipes', 'max_users', 'max_file_storage_mb', 'allow_sharing')
+    list_display = ('name', 'created_by', 'max_recipes', 'max_users', 'max_file_storage_mb', 'allow_sharing', 'use_plural')
     search_fields = ('name', 'created_by__username')
     list_filter = ('max_recipes', 'max_users', 'max_file_storage_mb', 'allow_sharing')
     date_hierarchy = 'created_at'
@@ -46,15 +46,23 @@ class SpaceAdmin(admin.ModelAdmin):
 admin.site.register(Space, SpaceAdmin)
 
 
+class UserSpaceAdmin(admin.ModelAdmin):
+    list_display = ('user', 'space',)
+    search_fields = ('user__username', 'space__name',)
+
+
+admin.site.register(UserSpace, UserSpaceAdmin)
+
+
 class UserPreferenceAdmin(admin.ModelAdmin):
-    list_display = ('name', 'theme', 'nav_color', 'default_page', 'search_style',)  # TODO add new fields
+    list_display = ('name', 'theme', 'nav_color', 'default_page',)
     search_fields = ('user__username',)
-    list_filter = ('theme', 'nav_color', 'default_page', 'search_style')
+    list_filter = ('theme', 'nav_color', 'default_page',)
     date_hierarchy = 'created_at'
 
     @staticmethod
     def name(obj):
-        return obj.user.get_user_name()
+        return obj.user.get_user_display_name()
 
 
 admin.site.register(UserPreference, UserPreferenceAdmin)
@@ -67,7 +75,7 @@ class SearchPreferenceAdmin(admin.ModelAdmin):
 
     @staticmethod
     def name(obj):
-        return obj.user.get_user_name()
+        return obj.user.get_user_display_name()
 
 
 admin.site.register(SearchPreference, SearchPreferenceAdmin)
@@ -169,7 +177,7 @@ class RecipeAdmin(admin.ModelAdmin):
 
     @staticmethod
     def created_by(obj):
-        return obj.created_by.get_user_name()
+        return obj.created_by.get_user_display_name()
 
     if settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2', 'django.db.backends.postgresql']:
         actions = [rebuild_index]
@@ -208,7 +216,7 @@ class CommentAdmin(admin.ModelAdmin):
 
     @staticmethod
     def name(obj):
-        return obj.created_by.get_user_name()
+        return obj.created_by.get_user_display_name()
 
 
 admin.site.register(Comment, CommentAdmin)
@@ -227,7 +235,7 @@ class RecipeBookAdmin(admin.ModelAdmin):
 
     @staticmethod
     def user_name(obj):
-        return obj.created_by.get_user_name()
+        return obj.created_by.get_user_display_name()
 
 
 admin.site.register(RecipeBook, RecipeBookAdmin)
@@ -245,7 +253,7 @@ class MealPlanAdmin(admin.ModelAdmin):
 
     @staticmethod
     def user(obj):
-        return obj.created_by.get_user_name()
+        return obj.created_by.get_user_display_name()
 
 
 admin.site.register(MealPlan, MealPlanAdmin)

cookbook/filters.py

@@ -1,62 +0,0 @@
-import django_filters
-from django.conf import settings
-from django.contrib.postgres.search import TrigramSimilarity
-from django.db.models import Q
-from django.utils.translation import gettext as _
-from django_scopes import scopes_disabled
-
-from cookbook.forms import MultiSelectWidget
-from cookbook.models import Food, Keyword, Recipe
-
-with scopes_disabled():
-    class RecipeFilter(django_filters.FilterSet):
-        name = django_filters.CharFilter(method='filter_name')
-        keywords = django_filters.ModelMultipleChoiceFilter(
-            queryset=Keyword.objects.none(),
-            widget=MultiSelectWidget,
-            method='filter_keywords'
-        )
-        foods = django_filters.ModelMultipleChoiceFilter(
-            queryset=Food.objects.none(),
-            widget=MultiSelectWidget,
-            method='filter_foods',
-            label=_('Ingredients')
-        )
-
-        def __init__(self, data=None, *args, **kwargs):
-            space = kwargs.pop('space')
-            super().__init__(data, *args, **kwargs)
-            self.filters['foods'].queryset = Food.objects.filter(space=space).all()
-            self.filters['keywords'].queryset = Keyword.objects.filter(space=space).all()
-
-        @staticmethod
-        def filter_keywords(queryset, name, value):
-            if not name == 'keywords':
-                return queryset
-            for x in value:
-                queryset = queryset.filter(keywords=x)
-            return queryset
-
-        @staticmethod
-        def filter_foods(queryset, name, value):
-            if not name == 'foods':
-                return queryset
-            for x in value:
-                queryset = queryset.filter(steps__ingredients__food__name=x).distinct()
-            return queryset
-
-        @staticmethod
-        def filter_name(queryset, name, value):
-            if not name == 'name':
-                return queryset
-            if settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2',
-                                                           'django.db.backends.postgresql']:
-                queryset = queryset.annotate(similarity=TrigramSimilarity('name', value), ).filter(
-                    Q(similarity__gt=0.1) | Q(name__unaccent__icontains=value)).order_by('-similarity')
-            else:
-                queryset = queryset.filter(name__icontains=value)
-            return queryset
-
-        class Meta:
-            model = Recipe
-            fields = ['name', 'keywords', 'foods', 'internal']

cookbook/forms.py

@@ -45,8 +45,7 @@ class UserPreferenceForm(forms.ModelForm):
         model = UserPreference
         fields = (
             'default_unit', 'use_fractions', 'use_kj', 'theme', 'nav_color',
-            'sticky_navbar', 'default_page', 'show_recent', 'search_style',
-            'plan_share', 'ingredient_decimals', 'comments', 'left_handed',
+            'sticky_navbar', 'default_page', 'plan_share', 'ingredient_decimals', 'comments', 'left_handed',
         )
 
         labels = {
@@ -57,8 +56,6 @@ class UserPreferenceForm(forms.ModelForm):
             'nav_color': _('Navbar color'),
             'sticky_navbar': _('Sticky navbar'),
             'default_page': _('Default page'),
-            'show_recent': _('Show recent recipes'),
-            'search_style': _('Search style'),
             'plan_share': _('Plan sharing'),
             'ingredient_decimals': _('Ingredient decimal places'),
             'shopping_auto_sync': _('Shopping list auto sync period'),
@@ -68,23 +65,21 @@ class UserPreferenceForm(forms.ModelForm):
 
         help_texts = {
             'nav_color': _('Color of the top navigation bar. Not all colors work with all themes, just try them out!'),
-            # noqa: E501
-            'default_unit': _('Default Unit to be used when inserting a new ingredient into a recipe.'),  # noqa: E501
+            
+            'default_unit': _('Default Unit to be used when inserting a new ingredient into a recipe.'),  
             'use_fractions': _(
                 'Enables support for fractions in ingredient amounts (e.g. convert decimals to fractions automatically)'),
-            # noqa: E501
-            'use_kj': _('Display nutritional energy amounts in joules instead of calories'),  # noqa: E501
+            
+            'use_kj': _('Display nutritional energy amounts in joules instead of calories'),  
             'plan_share': _('Users with whom newly created meal plans should be shared by default.'),
             'shopping_share': _('Users with whom to share shopping lists.'),
-            # noqa: E501
-            'show_recent': _('Show recently viewed recipes on search page.'),  # noqa: E501
-            'ingredient_decimals': _('Number of decimals to round ingredients.'),  # noqa: E501
-            'comments': _('If you want to be able to create and see comments underneath recipes.'),  # noqa: E501
+            'ingredient_decimals': _('Number of decimals to round ingredients.'),  
+            'comments': _('If you want to be able to create and see comments underneath recipes.'),  
             'shopping_auto_sync': _(
-                'Setting to 0 will disable auto sync. When viewing a shopping list the list is updated every set seconds to sync changes someone else might have made. Useful when shopping with multiple people but might use a little bit '  # noqa: E501
-                'of mobile data. If lower than instance limit it is reset when saving.'  # noqa: E501
+                'Setting to 0 will disable auto sync. When viewing a shopping list the list is updated every set seconds to sync changes someone else might have made. Useful when shopping with multiple people but might use a little bit '  
+                'of mobile data. If lower than instance limit it is reset when saving.'  
             ),
-            'sticky_navbar': _('Makes the navbar stick to the top of the page.'),  # noqa: E501
+            'sticky_navbar': _('Makes the navbar stick to the top of the page.'),  
             'mealplan_autoadd_shopping': _('Automatically add meal plan ingredients to shopping list.'),
             'mealplan_autoexclude_onhand': _('Exclude ingredients that are on hand.'),
             'left_handed': _('Will optimize the UI for use with your left hand.')
@@ -159,6 +154,7 @@ class ImportExportBase(forms.Form):
     COOKBOOKAPP = 'COOKBOOKAPP'
     COPYMETHAT = 'COPYMETHAT'
     COOKMATE = 'COOKMATE'
+    REZEPTSUITEDE = 'REZEPTSUITEDE'
     PDF = 'PDF'
 
     type = forms.ChoiceField(choices=(
@@ -167,7 +163,7 @@ class ImportExportBase(forms.Form):
         (PEPPERPLATE, 'Pepperplate'), (RECETTETEK, 'RecetteTek'), (RECIPESAGE, 'Recipe Sage'), (DOMESTICA, 'Domestica'),
         (MEALMASTER, 'MealMaster'), (REZKONV, 'RezKonv'), (OPENEATS, 'Openeats'), (RECIPEKEEPER, 'Recipe Keeper'),
         (PLANTOEAT, 'Plantoeat'), (COOKBOOKAPP, 'CookBookApp'), (COPYMETHAT, 'CopyMeThat'), (PDF, 'PDF'), (MELARECIPES, 'Melarecipes'),
-        (COOKMATE, 'Cookmate')
+        (COOKMATE, 'Cookmate'), (REZEPTSUITEDE, 'Recipesuite.de')
     ))
 
 
@@ -336,9 +332,9 @@ class MealPlanForm(forms.ModelForm):
         )
 
         help_texts = {
-            'shared': _('You can list default users to share recipes with in the settings.'),  # noqa: E501
+            'shared': _('You can list default users to share recipes with in the settings.'),  
             'note': _('You can use markdown to format this field. See the <a href="/docs/markdown/">docs here</a>')
-            # noqa: E501
+            
         }
 
         widgets = {
@@ -493,8 +489,8 @@ class ShoppingPreferenceForm(forms.ModelForm):
         help_texts = {
             'shopping_share': _('Users will see all items you add to your shopping list.  They must add you to see items on their list.'),
             'shopping_auto_sync': _(
-                'Setting to 0 will disable auto sync. When viewing a shopping list the list is updated every set seconds to sync changes someone else might have made. Useful when shopping with multiple people but might use a little bit '  # noqa: E501
-                'of mobile data. If lower than instance limit it is reset when saving.'  # noqa: E501
+                'Setting to 0 will disable auto sync. When viewing a shopping list the list is updated every set seconds to sync changes someone else might have made. Useful when shopping with multiple people but might use a little bit '  
+                'of mobile data. If lower than instance limit it is reset when saving.'  
             ),
             'mealplan_autoadd_shopping': _('Automatically add meal plan ingredients to shopping list.'),
             'mealplan_autoinclude_related': _('When adding a meal plan to the shopping list (manually or automatically), include all related recipes.'),
@@ -538,11 +534,13 @@ class SpacePreferenceForm(forms.ModelForm):
     class Meta:
         model = Space
 
-        fields = ('food_inherit', 'reset_food_inherit', 'show_facet_count')
+        fields = ('food_inherit', 'reset_food_inherit', 'show_facet_count', 'use_plural')
 
         help_texts = {
             'food_inherit': _('Fields on food that should be inherited by default.'),
-            'show_facet_count': _('Show recipe counts on search filters'), }
+            'show_facet_count': _('Show recipe counts on search filters'), 
+            'use_plural': _('Use the plural form for units and food inside this space.'),
+        }
 
         widgets = {
             'food_inherit': MultiSelectWidget

cookbook/helper/AllAuthCustomAdapter.py

@@ -14,7 +14,7 @@ class AllAuthCustomAdapter(DefaultAccountAdapter):
 
     def is_open_for_signup(self, request):
         """
-        Whether to allow sign ups.
+        Whether to allow sign-ups.
         """
         signup_token = False
         if 'signup_token' in request.session and InviteLink.objects.filter(valid_until__gte=datetime.datetime.today(), used_by=None, uuid=request.session['signup_token']).exists():
@@ -31,7 +31,10 @@ class AllAuthCustomAdapter(DefaultAccountAdapter):
             default = datetime.datetime.now()
             c = caches['default'].get_or_set(email, default, timeout=360)
             if c == default:
-                super(AllAuthCustomAdapter, self).send_mail(template_prefix, email, context)
+                try:
+                    super(AllAuthCustomAdapter, self).send_mail(template_prefix, email, context)
+                except Exception: # dont fail signup just because confirmation mail could not be send
+                    pass
             else:
                 messages.add_message(self.request, messages.ERROR, _('In order to prevent spam, the requested email was not send. Please wait a few minutes and try again.'))
         else:

cookbook/helper/context_processors.py

@@ -10,4 +10,5 @@ def context_settings(request):
         'TERMS_URL': settings.TERMS_URL,
         'PRIVACY_URL': settings.PRIVACY_URL,
         'IMPRINT_URL': settings.IMPRINT_URL,
+        'SHOPPING_MIN_AUTOSYNC_INTERVAL': settings.SHOPPING_MIN_AUTOSYNC_INTERVAL,
     }

cookbook/helper/ingredient_parser.py

@@ -28,7 +28,7 @@ class IngredientParser:
                 self.food_aliases = c
                 caches['default'].touch(FOOD_CACHE_KEY, 30)
             else:
-                for a in Automation.objects.filter(space=self.request.space, disabled=False, type=Automation.FOOD_ALIAS).only('param_1', 'param_2').all():
+                for a in Automation.objects.filter(space=self.request.space, disabled=False, type=Automation.FOOD_ALIAS).only('param_1', 'param_2').order_by('order').all():
                     self.food_aliases[a.param_1] = a.param_2
                 caches['default'].set(FOOD_CACHE_KEY, self.food_aliases, 30)
 
@@ -37,7 +37,7 @@ class IngredientParser:
                 self.unit_aliases = c
                 caches['default'].touch(UNIT_CACHE_KEY, 30)
             else:
-                for a in Automation.objects.filter(space=self.request.space, disabled=False, type=Automation.UNIT_ALIAS).only('param_1', 'param_2').all():
+                for a in Automation.objects.filter(space=self.request.space, disabled=False, type=Automation.UNIT_ALIAS).only('param_1', 'param_2').order_by('order').all():
                     self.unit_aliases[a.param_1] = a.param_2
                 caches['default'].set(UNIT_CACHE_KEY, self.unit_aliases, 30)
         else:
@@ -59,7 +59,7 @@ class IngredientParser:
                 except KeyError:
                     return food
             else:
-                if automation := Automation.objects.filter(space=self.request.space, type=Automation.FOOD_ALIAS, param_1=food, disabled=False).first():
+                if automation := Automation.objects.filter(space=self.request.space, type=Automation.FOOD_ALIAS, param_1=food, disabled=False).order_by('order').first():
                     return automation.param_2
         return food
 
@@ -78,7 +78,7 @@ class IngredientParser:
                 except KeyError:
                     return unit
             else:
-                if automation := Automation.objects.filter(space=self.request.space, type=Automation.UNIT_ALIAS, param_1=unit, disabled=False).first():
+                if automation := Automation.objects.filter(space=self.request.space, type=Automation.UNIT_ALIAS, param_1=unit, disabled=False).order_by('order').first():
                     return automation.param_2
         return unit
 
@@ -221,8 +221,8 @@ class IngredientParser:
 
         # some people/languages put amount and unit at the end of the ingredient string
         # if something like this is detected move it to the beginning so the parser can handle it
-        if len(ingredient) < 1000 and re.search(r'^([A-z])+(.)*[1-9](\d)*\s([A-z])+', ingredient):
-            match = re.search(r'[1-9](\d)*\s([A-z])+', ingredient)
+        if len(ingredient) < 1000 and re.search(r'^([^\W\d_])+(.)*[1-9](\d)*\s*([^\W\d_])+', ingredient):
+            match = re.search(r'[1-9](\d)*\s*([^\W\d_])+', ingredient)
             print(f'reording from {ingredient} to {ingredient[match.start():match.end()] + " " + ingredient.replace(ingredient[match.start():match.end()], "")}')
             ingredient = ingredient[match.start():match.end()] + ' ' + ingredient.replace(ingredient[match.start():match.end()], '')
 
@@ -235,6 +235,14 @@ class IngredientParser:
         # leading spaces before commas result in extra tokens, clean them out
         ingredient = ingredient.replace(' ,', ',')
 
+        # handle "(from) - (to)" amounts by using the minimum amount and adding the range to the description
+        # "10.5 - 200 g XYZ" => "100 g XYZ (10.5 - 200)"
+        ingredient = re.sub("^(\d+|\d+[\\.,]\d+) - (\d+|\d+[\\.,]\d+) (.*)", "\\1 \\3 (\\1 - \\2)", ingredient)
+
+        # if amount and unit are connected add space in between
+        if re.match('([0-9])+([A-z])+\s', ingredient):
+            ingredient = re.sub(r'(?<=([a-z])|\d)(?=(?(1)\d|[a-z]))', ' ', ingredient)
+
         tokens = ingredient.split()  # split at each space into tokens
         if len(tokens) == 1:
             # there only is one argument, that must be the food

cookbook/helper/mdx_urlize.py

@@ -35,6 +35,7 @@ Negative examples:
 u'<p>del.icio.us</p>'
 
 """
+from xml.etree.ElementTree import Element
 
 import markdown
 
@@ -64,7 +65,7 @@ class UrlizePattern(markdown.inlinepatterns.Pattern):
             else:
                 url = 'http://' + url
 
-        el = markdown.util.etree.Element("a")
+        el = Element("a")
         el.set('href', url)
         el.text = markdown.util.AtomicString(text)
         return el
@@ -73,9 +74,9 @@ class UrlizePattern(markdown.inlinepatterns.Pattern):
 class UrlizeExtension(markdown.Extension):
     """ Urlize Extension for Python-Markdown. """
 
-    def extendMarkdown(self, md, md_globals):
+    def extendMarkdown(self, md):
         """ Replace autolink with UrlizePattern """
-        md.inlinePatterns['autolink'] = UrlizePattern(URLIZE_RE, md)
+        md.inlinePatterns.register(UrlizePattern(URLIZE_RE, md), 'autolink', 120)
 
 
 def makeExtension(*args, **kwargs):

cookbook/helper/permission_helper.py

@@ -1,15 +1,19 @@
+import inspect
+
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import user_passes_test
-from django.core.cache import caches
+from django.core.cache import cache
 from django.core.exceptions import ValidationError, ObjectDoesNotExist
 from django.http import HttpResponseRedirect
 from django.urls import reverse, reverse_lazy
 from django.utils.translation import gettext as _
+from oauth2_provider.contrib.rest_framework import TokenHasScope, TokenHasReadWriteScope
+from oauth2_provider.models import AccessToken
 from rest_framework import permissions
 from rest_framework.permissions import SAFE_METHODS
 
-from cookbook.models import ShareLink, Recipe, UserPreference, UserSpace
+from cookbook.models import ShareLink, Recipe, UserSpace
 
 
 def get_allowed_groups(groups_required):
@@ -27,11 +31,12 @@ def get_allowed_groups(groups_required):
     return groups_allowed
 
 
-def has_group_permission(user, groups):
+def has_group_permission(user, groups, no_cache=False):
     """
     Tests if a given user is member of a certain group (or any higher group)
     Superusers always bypass permission checks.
     Unauthenticated users can't be member of any group thus always return false.
+    :param no_cache: (optional) do not return cached results, always check agains DB
     :param user: django auth user object
     :param groups: list or tuple of groups the user should be checked for
     :return: True if user is in allowed groups, false otherwise
@@ -39,13 +44,23 @@ def has_group_permission(user, groups):
     if not user.is_authenticated:
         return False
     groups_allowed = get_allowed_groups(groups)
+
+    CACHE_KEY = hash((inspect.stack()[0][3], (user.pk, user.username, user.email), groups_allowed))
+    if not no_cache:
+        cached_result = cache.get(CACHE_KEY, default=None)
+        if cached_result is not None:
+            return cached_result
+
+    result = False
     if user.is_authenticated:
         if user_space := user.userspace_set.filter(active=True):
             if len(user_space) != 1:
-                return False  # do not allow any group permission if more than one space is active, needs to be changed when simultaneous multi-space-tenancy is added
-            if bool(user_space.first().groups.filter(name__in=groups_allowed)):
-                return True
-    return False
+                result = False  # do not allow any group permission if more than one space is active, needs to be changed when simultaneous multi-space-tenancy is added
+            elif bool(user_space.first().groups.filter(name__in=groups_allowed)):
+                result = True
+
+    cache.set(CACHE_KEY, result, timeout=10)
+    return result
 
 
 def is_object_owner(user, obj):
@@ -104,7 +119,7 @@ def share_link_valid(recipe, share):
     """
     try:
         CACHE_KEY = f'recipe_share_{recipe.pk}_{share}'
-        if c := caches['default'].get(CACHE_KEY, False):
+        if c := cache.get(CACHE_KEY, False):
             return c
 
         if link := ShareLink.objects.filter(recipe=recipe, uuid=share, abuse_blocked=False).first():
@@ -112,7 +127,7 @@ def share_link_valid(recipe, share):
                 return False
             link.request_count += 1
             link.save()
-            caches['default'].set(CACHE_KEY, True, timeout=3)
+            cache.set(CACHE_KEY, True, timeout=3)
             return True
         return False
     except ValidationError:
@@ -299,6 +314,73 @@ class CustomIsShare(permissions.BasePermission):
         return False
 
 
+class CustomRecipePermission(permissions.BasePermission):
+    """
+    Custom permission class for recipe api endpoint
+    """
+    message = _('You do not have the required permissions to view this page!')
+
+    def has_permission(self, request, view):  # user is either at least a guest or a share link is given and the request is safe
+        share = request.query_params.get('share', None)
+        return has_group_permission(request.user, ['guest']) or (share and request.method in SAFE_METHODS and 'pk' in view.kwargs)
+
+    def has_object_permission(self, request, view, obj):
+        share = request.query_params.get('share', None)
+        if share:
+            return share_link_valid(obj, share)
+        else:
+            if obj.private:
+                return ((obj.created_by == request.user) or (request.user in obj.shared.all())) and obj.space == request.space
+            else:
+                return has_group_permission(request.user, ['guest']) and obj.space == request.space
+
+
+class CustomUserPermission(permissions.BasePermission):
+    """
+    Custom permission class for user api endpoint
+    """
+    message = _('You do not have the required permissions to view this page!')
+
+    def has_permission(self, request, view):  # a space filtered user list is visible for everyone
+        return has_group_permission(request.user, ['guest'])
+
+    def has_object_permission(self, request, view, obj):  # object write permissions are only available for user
+        if request.method in SAFE_METHODS and 'pk' in view.kwargs and has_group_permission(request.user, ['guest']) and request.space in obj.userspace_set.all():
+            return True
+        elif request.user == obj:
+            return True
+        else:
+            return False
+
+
+class CustomTokenHasScope(TokenHasScope):
+    """
+    Custom implementation of Django OAuth Toolkit TokenHasScope class
+    Only difference: if any other authentication method except OAuth2Authentication is used the scope check is ignored
+    IMPORTANT: do not use this class without any other permission class as it will not check anything besides token scopes
+    """
+
+    def has_permission(self, request, view):
+        if type(request.auth) == AccessToken:
+            return super().has_permission(request, view)
+        else:
+            return request.user.is_authenticated
+
+
+class CustomTokenHasReadWriteScope(TokenHasReadWriteScope):
+    """
+    Custom implementation of Django OAuth Toolkit TokenHasReadWriteScope class
+    Only difference: if any other authentication method except OAuth2Authentication is used the scope check is ignored
+    IMPORTANT: do not use this class without any other permission class as it will not check anything besides token scopes
+    """
+
+    def has_permission(self, request, view):
+        if type(request.auth) == AccessToken:
+            return super().has_permission(request, view)
+        else:
+            return True
+
+
 def above_space_limit(space):  # TODO add file storage limit
     """
     Test if the space has reached any limit (e.g. max recipes, users, ..)

cookbook/helper/recipe_html_import.py

@@ -1,189 +1,191 @@
-import json
-import re
-from json import JSONDecodeError
-from urllib.parse import unquote
+# import json
+# import re
+# from json import JSONDecodeError
+# from urllib.parse import unquote
 
-from bs4 import BeautifulSoup
-from bs4.element import Tag
-from recipe_scrapers import scrape_html, scrape_me
-from recipe_scrapers._exceptions import NoSchemaFoundInWildMode
-from recipe_scrapers._utils import get_host_name, normalize_string
+# from bs4 import BeautifulSoup
+# from bs4.element import Tag
+# from recipe_scrapers import scrape_html, scrape_me
+# from recipe_scrapers._exceptions import NoSchemaFoundInWildMode
+# from recipe_scrapers._utils import get_host_name, normalize_string
 
-from cookbook.helper import recipe_url_import as helper
-from cookbook.helper.scrapers.scrapers import text_scraper
+# from cookbook.helper import recipe_url_import as helper
+# from cookbook.helper.scrapers.scrapers import text_scraper
 
 
-def get_recipe_from_source(text, url, request):
-    def build_node(k, v):
-        if isinstance(v, dict):
-            node = {
-                'name': k,
-                'value': k,
-                'children': get_children_dict(v)
-            }
-        elif isinstance(v, list):
-            node = {
-                'name': k,
-                'value': k,
-                'children': get_children_list(v)
-            }
-        else:
-            node = {
-                'name': k + ": " + normalize_string(str(v)),
-                'value': normalize_string(str(v))
-            }
-        return node
+# def get_recipe_from_source(text, url, request):
+#     def build_node(k, v):
+#         if isinstance(v, dict):
+#             node = {
+#                 'name': k,
+#                 'value': k,
+#                 'children': get_children_dict(v)
+#             }
+#         elif isinstance(v, list):
+#             node = {
+#                 'name': k,
+#                 'value': k,
+#                 'children': get_children_list(v)
+#             }
+#         else:
+#             node = {
+#                 'name': k + ": " + normalize_string(str(v)),
+#                 'value': normalize_string(str(v))
+#             }
+#         return node
 
-    def get_children_dict(children):
-        kid_list = []
-        for k, v in children.items():
-            kid_list.append(build_node(k, v))
-        return kid_list
+#     def get_children_dict(children):
+#         kid_list = []
+#         for k, v in children.items():
+#             kid_list.append(build_node(k, v))
+#         return kid_list
 
-    def get_children_list(children):
-        kid_list = []
-        for kid in children:
-            if type(kid) == list:
-                node = {
-                    'name': "unknown list",
-                    'value': "unknown list",
-                    'children': get_children_list(kid)
-                }
-                kid_list.append(node)
-            elif type(kid) == dict:
-                for k, v in kid.items():
-                    kid_list.append(build_node(k, v))
-            else:
-                kid_list.append({
-                    'name': normalize_string(str(kid)),
-                    'value': normalize_string(str(kid))
-                })
-        return kid_list
+#     def get_children_list(children):
+#         kid_list = []
+#         for kid in children:
+#             if type(kid) == list:
+#                 node = {
+#                     'name': "unknown list",
+#                     'value': "unknown list",
+#                     'children': get_children_list(kid)
+#                 }
+#                 kid_list.append(node)
+#             elif type(kid) == dict:
+#                 for k, v in kid.items():
+#                     kid_list.append(build_node(k, v))
+#             else:
+#                 kid_list.append({
+#                     'name': normalize_string(str(kid)),
+#                     'value': normalize_string(str(kid))
+#                 })
+#         return kid_list
 
-    recipe_tree = []
-    parse_list = []
-    soup = BeautifulSoup(text, "html.parser")
-    html_data = get_from_html(soup)
-    images = get_images_from_source(soup, url)
-    text = unquote(text)
-    scrape = None
+#     recipe_tree = []
+#     parse_list = []
+#     soup = BeautifulSoup(text, "html.parser")
+#     html_data = get_from_html(soup)
+#     images = get_images_from_source(soup, url)
+#     text = unquote(text)
+#     scrape = None
 
-    if url:
-        try:
-            scrape = scrape_me(url_path=url, wild_mode=True)
-        except(NoSchemaFoundInWildMode):
-            pass
-    if not scrape:
-        try:
-            parse_list.append(remove_graph(json.loads(text)))
-            if not url and 'url' in parse_list[0]:
-                url = parse_list[0]['url']
-            scrape = text_scraper("<script type='application/ld+json'>" + text + "</script>", url=url)
+#     if url and not text:
+#         try:
+#             scrape = scrape_me(url_path=url, wild_mode=True)
+#         except(NoSchemaFoundInWildMode):
+#             pass
 
-        except JSONDecodeError:
-            for el in soup.find_all('script', type='application/ld+json'):
-                el = remove_graph(el)
-                if not url and 'url' in el:
-                    url = el['url']
-                if type(el) == list:
-                    for le in el:
-                        parse_list.append(le)
-                elif type(el) == dict:
-                    parse_list.append(el)
-            for el in soup.find_all(type='application/json'):
-                el = remove_graph(el)
-                if type(el) == list:
-                    for le in el:
-                        parse_list.append(le)
-                elif type(el) == dict:
-                    parse_list.append(el)
-            scrape = text_scraper(text, url=url)
+#     if not scrape:
+#         try:
+#             parse_list.append(remove_graph(json.loads(text)))
+#             if not url and 'url' in parse_list[0]:
+#                 url = parse_list[0]['url']
+#             scrape = text_scraper("<script type='application/ld+json'>" + text + "</script>", url=url)
 
-    recipe_json = helper.get_from_scraper(scrape, request)
+#         except JSONDecodeError:
+#             for el in soup.find_all('script', type='application/ld+json'):
+#                 el = remove_graph(el)
+#                 if not url and 'url' in el:
+#                     url = el['url']
+#                 if type(el) == list:
+#                     for le in el:
+#                         parse_list.append(le)
+#                 elif type(el) == dict:
+#                     parse_list.append(el)
+#             for el in soup.find_all(type='application/json'):
+#                 el = remove_graph(el)
+#                 if type(el) == list:
+#                     for le in el:
+#                         parse_list.append(le)
+#                 elif type(el) == dict:
+#                     parse_list.append(el)
+#             scrape = text_scraper(text, url=url)
 
-    for el in parse_list:
-        temp_tree = []
-        if isinstance(el, Tag):
-            try:
-                el = json.loads(el.string)
-            except TypeError:
-                continue
+#     recipe_json = helper.get_from_scraper(scrape, request)
 
-        for k, v in el.items():
-            if isinstance(v, dict):
-                node = {
-                    'name': k,
-                    'value': k,
-                    'children': get_children_dict(v)
-                }
-            elif isinstance(v, list):
-                node = {
-                    'name': k,
-                    'value': k,
-                    'children': get_children_list(v)
-                }
-            else:
-                node = {
-                    'name': k + ": " + normalize_string(str(v)),
-                    'value': normalize_string(str(v))
-                }
-            temp_tree.append(node)
+#     # TODO: DEPRECATE recipe_tree & html_data.  first validate it isn't used anywhere
+#     for el in parse_list:
+#         temp_tree = []
+#         if isinstance(el, Tag):
+#             try:
+#                 el = json.loads(el.string)
+#             except TypeError:
+#                 continue
 
-        if '@type' in el and el['@type'] == 'Recipe':
-            recipe_tree += [{'name': 'ld+json', 'children': temp_tree}]
-        else:
-            recipe_tree += [{'name': 'json', 'children': temp_tree}]
+#         for k, v in el.items():
+#             if isinstance(v, dict):
+#                 node = {
+#                     'name': k,
+#                     'value': k,
+#                     'children': get_children_dict(v)
+#                 }
+#             elif isinstance(v, list):
+#                 node = {
+#                     'name': k,
+#                     'value': k,
+#                     'children': get_children_list(v)
+#                 }
+#             else:
+#                 node = {
+#                     'name': k + ": " + normalize_string(str(v)),
+#                     'value': normalize_string(str(v))
+#                 }
+#             temp_tree.append(node)
 
-    return recipe_json, recipe_tree, html_data, images
+#         if '@type' in el and el['@type'] == 'Recipe':
+#             recipe_tree += [{'name': 'ld+json', 'children': temp_tree}]
+#         else:
+#             recipe_tree += [{'name': 'json', 'children': temp_tree}]
+
+#     return recipe_json, recipe_tree, html_data, images
 
 
-def get_from_html(soup):
-    INVISIBLE_ELEMS = ('style', 'script', 'head', 'title')
-    html = []
-    for s in soup.strings:
-        if ((s.parent.name not in INVISIBLE_ELEMS) and (len(s.strip()) > 0)):
-            html.append(s)
-    return html
+# def get_from_html(soup):
+#     INVISIBLE_ELEMS = ('style', 'script', 'head', 'title')
+#     html = []
+#     for s in soup.strings:
+#         if ((s.parent.name not in INVISIBLE_ELEMS) and (len(s.strip()) > 0)):
+#             html.append(s)
+#     return html
 
 
-def get_images_from_source(soup, url):
-    sources = ['src', 'srcset', 'data-src']
-    images = []
-    img_tags = soup.find_all('img')
-    if url:
-        site = get_host_name(url)
-        prot = url.split(':')[0]
+# def get_images_from_source(soup, url):
+#     sources = ['src', 'srcset', 'data-src']
+#     images = []
+#     img_tags = soup.find_all('img')
+#     if url:
+#         site = get_host_name(url)
+#         prot = url.split(':')[0]
 
-    urls = []
-    for img in img_tags:
-        for src in sources:
-            try:
-                urls.append(img[src])
-            except KeyError:
-                pass
+#     urls = []
+#     for img in img_tags:
+#         for src in sources:
+#             try:
+#                 urls.append(img[src])
+#             except KeyError:
+#                 pass
 
-    for u in urls:
-        u = u.split('?')[0]
-        filename = re.search(r'/([\w_-]+[.](jpg|jpeg|gif|png))$', u)
-        if filename:
-            if (('http' not in u) and (url)):
-                # sometimes an image source can be relative
-                # if it is provide the base url
-                u = '{}://{}{}'.format(prot, site, u)
-            if 'http' in u:
-                images.append(u)
-    return images
+#     for u in urls:
+#         u = u.split('?')[0]
+#         filename = re.search(r'/([\w_-]+[.](jpg|jpeg|gif|png))$', u)
+#         if filename:
+#             if (('http' not in u) and (url)):
+#                 # sometimes an image source can be relative
+#                 # if it is provide the base url
+#                 u = '{}://{}{}'.format(prot, site, u)
+#             if 'http' in u:
+#                 images.append(u)
+#     return images
 
 
-def remove_graph(el):
-    # recipes type might be wrapped in @graph type
-    if isinstance(el, Tag):
-        try:
-            el = json.loads(el.string)
-            if '@graph' in el:
-                for x in el['@graph']:
-                    if '@type' in x and x['@type'] == 'Recipe':
-                        el = x
-        except (TypeError, JSONDecodeError):
-            pass
-    return el
+# def remove_graph(el):
+#     # recipes type might be wrapped in @graph type
+#     if isinstance(el, Tag):
+#         try:
+#             el = json.loads(el.string)
+#             if '@graph' in el:
+#                 for x in el['@graph']:
+#                     if '@type' in x and x['@type'] == 'Recipe':
+#                         el = x
+#         except (TypeError, JSONDecodeError):
+#             pass
+#     return el

cookbook/helper/recipe_search.py

@@ -3,18 +3,16 @@ from collections import Counter
 from datetime import date, timedelta
 
 from django.contrib.postgres.search import SearchQuery, SearchRank, SearchVector, TrigramSimilarity
+from django.core.cache import cache
 from django.core.cache import caches
-from django.db.models import (Avg, Case, Count, Exists, F, Func, Max, OuterRef, Q, Subquery, Sum,
-                              Value, When)
+from django.db.models import (Avg, Case, Count, Exists, F, Func, Max, OuterRef, Q, Subquery, Value, When, FilteredRelation)
 from django.db.models.functions import Coalesce, Lower, Substr
 from django.utils import timezone, translation
 from django.utils.translation import gettext as _
 
-from cookbook.filters import RecipeFilter
 from cookbook.helper.HelperFunctions import Round, str2bool
-from cookbook.helper.permission_helper import has_group_permission
 from cookbook.managers import DICTIONARY
-from cookbook.models import (CookLog, CustomFilter, Food, Keyword, Recipe, RecipeBook, SearchFields,
+from cookbook.models import (CookLog, CustomFilter, Food, Keyword, Recipe, SearchFields,
                              SearchPreference, ViewLog)
 from recipes import settings
 
@@ -24,7 +22,7 @@ from recipes import settings
 class RecipeSearch():
     _postgres = settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2', 'django.db.backends.postgresql']
 
-    def __init__(self, request,  **params):
+    def __init__(self, request, **params):
         self._request = request
         self._queryset = None
         if f := params.get('filter', None):
@@ -38,7 +36,13 @@ class RecipeSearch():
         else:
             self._params = {**(params or {})}
         if self._request.user.is_authenticated:
-            self._search_prefs = request.user.searchpreference
+            CACHE_KEY = f'search_pref_{request.user.id}'
+            cached_result = cache.get(CACHE_KEY, default=None)
+            if cached_result is not None:
+                self._search_prefs = cached_result
+            else:
+                self._search_prefs = request.user.searchpreference
+            cache.set(CACHE_KEY, self._search_prefs, timeout=10)
         else:
             self._search_prefs = SearchPreference()
         self._string = self._params.get('query').strip() if self._params.get('query', None) else None
@@ -113,19 +117,20 @@ class RecipeSearch():
             )
             self.search_rank = None
         self.orderby = []
-        self._default_sort = ['-favorite']  # TODO add user setting
         self._filters = None
         self._fuzzy_match = None
 
     def get_queryset(self, queryset):
         self._queryset = queryset
+        self._queryset = self._queryset.prefetch_related('keywords')
+
         self._build_sort_order()
         self._recently_viewed(num_recent=self._num_recent)
         self._cooked_on_filter(cooked_date=self._cookedon)
         self._created_on_filter(created_date=self._createdon)
         self._updated_on_filter(updated_date=self._updatedon)
         self._viewed_on_filter(viewed_date=self._viewedon)
-        self._favorite_recipes(timescooked=self._timescooked)
+        self._favorite_recipes(times_cooked=self._timescooked)
         self._new_recipes()
         self.keyword_filters(**self._keywords)
         self.food_filters(**self._foods)
@@ -152,7 +157,7 @@ class RecipeSearch():
         else:
             order = []
             # TODO add userpreference for default sort order and replace '-favorite'
-            default_order = ['-favorite']
+            default_order = ['-name']
             # recent and new_recipe are always first; they float a few recipes to the top
             if self._num_recent:
                 order += ['-recent']
@@ -209,7 +214,7 @@ class RecipeSearch():
                 else:
                     self._queryset = self._queryset.annotate(simularity=Coalesce(Subquery(simularity), 0.0))
             if self._sort_includes('score') and self._fulltext_include and self._fuzzy_match is not None:
-                self._queryset = self._queryset.annotate(score=F('rank')+F('simularity'))
+                self._queryset = self._queryset.annotate(score=F('rank') + F('simularity'))
         else:
             query_filter = Q()
             for f in [x + '__unaccent__iexact' if x in self._unaccent_include else x + '__iexact' for x in SearchFields.objects.all().values_list('field', flat=True)]:
@@ -290,25 +295,25 @@ class RecipeSearch():
             'recipe').annotate(recent=Max('created_at')).order_by('-recent')[:num_recent]
         self._queryset = self._queryset.annotate(recent=Coalesce(Max(Case(When(pk__in=num_recent_recipes.values('recipe'), then='viewlog__pk'))), Value(0)))
 
-    def _favorite_recipes(self, timescooked=None):
-        if self._sort_includes('favorite') or timescooked:
-            lessthan = '-' in (timescooked or []) or not self._sort_includes('-favorite')
-            if lessthan:
+    def _favorite_recipes(self, times_cooked=None):
+        if self._sort_includes('favorite') or times_cooked:
+            less_than = '-' in (times_cooked or []) or not self._sort_includes('-favorite')
+            if less_than:
                 default = 1000
             else:
                 default = 0
             favorite_recipes = CookLog.objects.filter(created_by=self._request.user, space=self._request.space, recipe=OuterRef('pk')
                                                       ).values('recipe').annotate(count=Count('pk', distinct=True)).values('count')
             self._queryset = self._queryset.annotate(favorite=Coalesce(Subquery(favorite_recipes), default))
-        if timescooked is None:
+        if times_cooked is None:
             return
 
-        if timescooked == '0':
+        if times_cooked == '0':
             self._queryset = self._queryset.filter(favorite=0)
-        elif lessthan:
-            self._queryset = self._queryset.filter(favorite__lte=int(timescooked[1:])).exclude(favorite=0)
+        elif less_than:
+            self._queryset = self._queryset.filter(favorite__lte=int(times_cooked[1:])).exclude(favorite=0)
         else:
-            self._queryset = self._queryset.filter(favorite__gte=int(timescooked))
+            self._queryset = self._queryset.filter(favorite__gte=int(times_cooked))
 
     def keyword_filters(self, **kwargs):
         if all([kwargs[x] is None for x in kwargs]):
@@ -508,10 +513,10 @@ class RecipeSearch():
         shopping_users = [*self._request.user.get_shopping_share(), self._request.user]
 
         onhand_filter = (
-            Q(steps__ingredients__food__onhand_users__in=shopping_users)  # food onhand
-            | Q(steps__ingredients__food__substitute__onhand_users__in=shopping_users)  # or substitute food onhand
-            | Q(steps__ingredients__food__in=self.__children_substitute_filter(shopping_users))
-            | Q(steps__ingredients__food__in=self.__sibling_substitute_filter(shopping_users))
+                Q(steps__ingredients__food__onhand_users__in=shopping_users)  # food onhand
+                | Q(steps__ingredients__food__substitute__onhand_users__in=shopping_users)  # or substitute food onhand
+                | Q(steps__ingredients__food__in=self.__children_substitute_filter(shopping_users))
+                | Q(steps__ingredients__food__in=self.__sibling_substitute_filter(shopping_users))
         )
         makenow_recipes = Recipe.objects.annotate(
             count_food=Count('steps__ingredients__food__pk', filter=Q(steps__ingredients__food__isnull=False), distinct=True),
@@ -520,10 +525,10 @@ class RecipeSearch():
                                                                                  steps__ingredients__food__recipe__isnull=True), distinct=True),
             has_child_sub=Case(When(steps__ingredients__food__in=self.__children_substitute_filter(shopping_users), then=Value(1)), default=Value(0)),
             has_sibling_sub=Case(When(steps__ingredients__food__in=self.__sibling_substitute_filter(shopping_users), then=Value(1)), default=Value(0))
-        ).annotate(missingfood=F('count_food')-F('count_onhand')-F('count_ignore_shopping')).filter(missingfood=missing)
+        ).annotate(missingfood=F('count_food') - F('count_onhand') - F('count_ignore_shopping')).filter(missingfood=missing)
         self._queryset = self._queryset.distinct().filter(id__in=makenow_recipes.values('id'))
 
-    @ staticmethod
+    @staticmethod
     def __children_substitute_filter(shopping_users=None):
         children_onhand_subquery = Food.objects.filter(
             path__startswith=OuterRef('path'),
@@ -539,10 +544,10 @@ class RecipeSearch():
                            ).annotate(child_onhand_count=Exists(children_onhand_subquery)
                                       ).filter(child_onhand_count=True)
 
-    @ staticmethod
+    @staticmethod
     def __sibling_substitute_filter(shopping_users=None):
         sibling_onhand_subquery = Food.objects.filter(
-            path__startswith=Substr(OuterRef('path'), 1, Food.steplen*(OuterRef('depth')-1)),
+            path__startswith=Substr(OuterRef('path'), 1, Food.steplen * (OuterRef('depth') - 1)),
             depth=OuterRef('depth'),
             onhand_users__in=shopping_users
         )
@@ -566,7 +571,7 @@ class RecipeFacet():
 
         self._request = request
         self._queryset = queryset
-        self.hash_key = hash_key or str(hash(frozenset(self._queryset.values_list('pk'))))
+        self.hash_key = hash_key or str(hash(self._queryset.query))
         self._SEARCH_CACHE_KEY = f"recipes_filter_{self.hash_key}"
         self._cache_timeout = cache_timeout
         self._cache = caches['default'].get(self._SEARCH_CACHE_KEY, {})
@@ -746,7 +751,7 @@ class RecipeFacet():
                                      ).filter(depth=depth, count__gt=0
                                               ).values('id', 'name', 'count', 'numchild').order_by(Lower('name').asc())[:200]
         else:
-            return queryset.filter(depth=depth).values('id', 'name',  'numchild').order_by(Lower('name').asc())
+            return queryset.filter(depth=depth).values('id', 'name', 'numchild').order_by(Lower('name').asc())
 
     def _food_queryset(self, queryset, food=None):
         depth = getattr(food, 'depth', 0) + 1
@@ -758,13 +763,3 @@ class RecipeFacet():
                                               ).values('id', 'name', 'count', 'numchild').order_by(Lower('name').asc())[:200]
         else:
             return queryset.filter(depth__lte=depth).values('id', 'name', 'numchild').order_by(Lower('name').asc())
-
-
-def old_search(request):
-    if has_group_permission(request.user, ('guest',)):
-        params = dict(request.GET)
-        params['internal'] = None
-        f = RecipeFilter(params,
-                         queryset=Recipe.objects.filter(space=request.space).all().order_by(Lower('name').asc()),
-                         space=request.space)
-        return f.qs

cookbook/helper/recipe_url_import.py

@@ -1,19 +1,18 @@
 import random
 import re
 from html import unescape
-
-from pytube import YouTube
 from unicodedata import decomposition
 
 from django.utils.dateparse import parse_duration
 from django.utils.translation import gettext as _
 from isodate import parse_duration as iso_parse_duration
 from isodate.isoerror import ISO8601Error
-from recipe_scrapers._utils import get_minutes
+from pytube import YouTube
+from recipe_scrapers._utils import get_host_name, get_minutes
 
 from cookbook.helper import recipe_url_import as helper
 from cookbook.helper.ingredient_parser import IngredientParser
-from cookbook.models import Keyword
+from cookbook.models import Keyword, Automation
 
 
 # from recipe_scrapers._utils import get_minutes  ## temporary until/unless upstream incorporates get_minutes() PR
@@ -23,7 +22,7 @@ def get_from_scraper(scrape, request):
     # converting the scrape_me object to the existing json format based on ld+json
     recipe_json = {}
     try:
-        recipe_json['name'] = parse_name(scrape.title() or None)
+        recipe_json['name'] = parse_name(scrape.title()[:128] or None)
     except Exception:
         recipe_json['name'] = None
     if not recipe_json['name']:
@@ -123,7 +122,13 @@ def get_from_scraper(scrape, request):
         try:
             keywords.append(source_url.replace('http://', '').replace('https://', '').split('/')[0])
         except Exception:
-            pass
+            recipe_json['source_url'] = ''
+
+    try:
+        if scrape.author():
+            keywords.append(scrape.author())
+    except:
+        pass
 
     try:
         recipe_json['keywords'] = parse_keywords(list(set(map(str.casefold, keywords))), request.space)
@@ -141,42 +146,58 @@ def get_from_scraper(scrape, request):
     if len(recipe_json['steps']) == 0:
         recipe_json['steps'].append({'instruction': '', 'ingredients': [], })
 
-    if len(parse_description(description)) > 256:  # split at 256 as long descriptions dont look good on recipe cards
-        recipe_json['steps'][0]['instruction'] = f'*{parse_description(description)}*  \n\n' + recipe_json['steps'][0]['instruction']
+    parsed_description = parse_description(description)
+    # TODO notify user about limit if reached
+    # limits exist to limit the attack surface for dos style attacks
+    automations = Automation.objects.filter(type=Automation.DESCRIPTION_REPLACE, space=request.space, disabled=False).only('param_1', 'param_2', 'param_3').all().order_by('order')[:512]
+    for a in automations:
+        if re.match(a.param_1, (recipe_json['source_url'])[:512]):
+            parsed_description = re.sub(a.param_2, a.param_3, parsed_description, count=1)
+
+    if len(parsed_description) > 256:  # split at 256 as long descriptions don't look good on recipe cards
+        recipe_json['steps'][0]['instruction'] = f'*{parsed_description}*  \n\n' + recipe_json['steps'][0]['instruction']
     else:
-        recipe_json['description'] = parse_description(description)[:512]
+        recipe_json['description'] = parsed_description[:512]
 
     try:
         for x in scrape.ingredients():
-            try:
-                amount, unit, ingredient, note = ingredient_parser.parse(x)
-                ingredient = {
-                    'amount': amount,
-                    'food': {
-                        'name': ingredient,
-                    },
-                    'unit': None,
-                    'note': note,
-                    'original_text': x
-                }
-                if unit:
-                    ingredient['unit'] = {'name': unit, }
-                recipe_json['steps'][0]['ingredients'].append(ingredient)
-            except Exception:
-                recipe_json['steps'][0]['ingredients'].append(
-                    {
-                        'amount': 0,
-                        'unit': None,
+            if x.strip() != '':
+                try:
+                    amount, unit, ingredient, note = ingredient_parser.parse(x)
+                    ingredient = {
+                        'amount': amount,
                         'food': {
-                            'name': x,
+                            'name': ingredient,
                         },
-                        'note': '',
+                        'unit': None,
+                        'note': note,
                         'original_text': x
                     }
-                )
+                    if unit:
+                        ingredient['unit'] = {'name': unit, }
+                    recipe_json['steps'][0]['ingredients'].append(ingredient)
+                except Exception:
+                    recipe_json['steps'][0]['ingredients'].append(
+                        {
+                            'amount': 0,
+                            'unit': None,
+                            'food': {
+                                'name': x,
+                            },
+                            'note': '',
+                            'original_text': x
+                        }
+                    )
     except Exception:
         pass
 
+    if recipe_json['source_url']:
+        automations = Automation.objects.filter(type=Automation.INSTRUCTION_REPLACE, space=request.space, disabled=False).only('param_1', 'param_2', 'param_3').order_by('order').all()[:512]
+        for a in automations:
+            if re.match(a.param_1, (recipe_json['source_url'])[:512]):
+                for s in recipe_json['steps']:
+                    s['instruction'] = re.sub(a.param_2, a.param_3, s['instruction'])
+
     return recipe_json
 
 
@@ -369,3 +390,32 @@ def iso_duration_to_minutes(string):
         string
     ).groupdict()
     return int(match['days'] or 0) * 24 * 60 + int(match['hours'] or 0) * 60 + int(match['minutes'] or 0)
+
+
+def get_images_from_soup(soup, url):
+    sources = ['src', 'srcset', 'data-src']
+    images = []
+    img_tags = soup.find_all('img')
+    if url:
+        site = get_host_name(url)
+        prot = url.split(':')[0]
+
+    urls = []
+    for img in img_tags:
+        for src in sources:
+            try:
+                urls.append(img[src])
+            except KeyError:
+                pass
+
+    for u in urls:
+        u = u.split('?')[0]
+        filename = re.search(r'/([\w_-]+[.](jpg|jpeg|gif|png))$', u)
+        if filename:
+            if (('http' not in u) and (url)):
+                # sometimes an image source can be relative
+                # if it is provide the base url
+                u = '{}://{}{}'.format(prot, site, u)
+            if 'http' in u:
+                images.append(u)
+    return images

cookbook/helper/scope_middleware.py

@@ -1,5 +1,6 @@
 from django.urls import reverse
 from django_scopes import scope, scopes_disabled
+from oauth2_provider.contrib.rest_framework import OAuth2Authentication
 from rest_framework.authentication import TokenAuthentication
 from rest_framework.authtoken.models import Token
 from rest_framework.exceptions import AuthenticationFailed
@@ -55,7 +56,7 @@ class ScopeMiddleware:
         else:
             if request.path.startswith(prefix + '/api/'):
                 try:
-                    if auth := TokenAuthentication().authenticate(request):
+                    if auth := OAuth2Authentication().authenticate(request):
                         user_space = auth[0].userspace_set.filter(active=True).first()
                         if user_space:
                             request.space = user_space.space

cookbook/helper/scrapers/scrapers.py

@@ -1,6 +1,7 @@
-from bs4 import BeautifulSoup
 from json import JSONDecodeError
-from recipe_scrapers import SCRAPERS 
+
+from bs4 import BeautifulSoup
+from recipe_scrapers import SCRAPERS, get_host_name
 from recipe_scrapers._factory import SchemaScraperFactory
 from recipe_scrapers._schemaorg import SchemaOrg
 
@@ -15,22 +16,28 @@ SCRAPERS.update(CUSTOM_SCRAPERS)
 
 
 def text_scraper(text, url=None):
-    scraper_class = SchemaScraperFactory.SchemaScraper
+    domain = None
+    if url:
+        domain = get_host_name(url)
+    if domain in SCRAPERS:
+        scraper_class = SCRAPERS[domain]
+    else:
+        scraper_class = SchemaScraperFactory.SchemaScraper
 
     class TextScraper(scraper_class):
         def __init__(
             self,
-            page_data,
-            url=None
+            html=None,
+            url=None,
         ):
             self.wild_mode = False
             self.meta_http_equiv = False
-            self.soup = BeautifulSoup(page_data, "html.parser")
+            self.soup = BeautifulSoup(html, "html.parser")
             self.url = url
             self.recipe = None
             try:
-                self.schema = SchemaOrg(page_data)
+                self.schema = SchemaOrg(html)
             except (JSONDecodeError, AttributeError):
                 pass
 
-    return TextScraper(text, url)
+    return TextScraper(url=url, html=text)

cookbook/helper/template_helper.py

@@ -22,10 +22,25 @@ class IngredientObject(object):
         else:
             self.amount = f"<scalable-number v-bind:number='{bleach.clean(str(ingredient.amount))}' v-bind:factor='ingredient_factor'></scalable-number>"
         if ingredient.unit:
-            self.unit = bleach.clean(str(ingredient.unit))
+            if ingredient.unit.plural_name in (None, ""):
+                self.unit = bleach.clean(str(ingredient.unit))
+            else:
+                if ingredient.always_use_plural_unit or ingredient.amount > 1 and not ingredient.no_amount:
+                    self.unit = bleach.clean(ingredient.unit.plural_name)
+                else:
+                    self.unit = bleach.clean(str(ingredient.unit))
         else:
             self.unit = ""
-        self.food = bleach.clean(str(ingredient.food))
+        if ingredient.food:
+            if ingredient.food.plural_name in (None, ""):
+                self.food = bleach.clean(str(ingredient.food))
+            else:
+                if ingredient.always_use_plural_food or ingredient.amount > 1 and not ingredient.no_amount:
+                    self.food = bleach.clean(str(ingredient.food.plural_name))
+                else:
+                    self.food = bleach.clean(str(ingredient.food))
+        else:
+            self.food = ""
         self.note = bleach.clean(str(ingredient.note))
 
     def __str__(self):

cookbook/integration/cookbookapp.py

@@ -10,8 +10,9 @@ import validators
 import yaml
 
 from cookbook.helper.ingredient_parser import IngredientParser
-from cookbook.helper.recipe_html_import import get_recipe_from_source
-from cookbook.helper.recipe_url_import import iso_duration_to_minutes
+from cookbook.helper.recipe_url_import import (get_from_scraper, get_images_from_soup,
+                                               iso_duration_to_minutes)
+from cookbook.helper.scrapers.scrapers import text_scraper
 from cookbook.integration.integration import Integration
 from cookbook.models import Ingredient, Keyword, Recipe, Step
 
@@ -24,7 +25,10 @@ class CookBookApp(Integration):
     def get_recipe_from_file(self, file):
         recipe_html = file.getvalue().decode("utf-8")
 
-        recipe_json, recipe_tree, html_data, images = get_recipe_from_source(recipe_html, 'CookBookApp', self.request)
+        # recipe_json, recipe_tree, html_data, images = get_recipe_from_source(recipe_html, 'CookBookApp', self.request)
+        scrape = text_scraper(text=recipe_html)
+        recipe_json = get_from_scraper(scrape, self.request)
+        images = list(dict.fromkeys(get_images_from_soup(scrape.soup, None)))
 
         recipe = Recipe.objects.create(
             name=recipe_json['name'].strip(),
@@ -42,7 +46,8 @@ class CookBookApp(Integration):
         except Exception:
             pass
 
-        step = Step.objects.create(instruction=recipe_json['recipeInstructions'], space=self.request.space, )
+        # assuming import files only contain single step
+        step = Step.objects.create(instruction=recipe_json['steps'][0]['instruction'], space=self.request.space, )
 
         if 'nutrition' in recipe_json:
             step.instruction = step.instruction + '\n\n' + recipe_json['nutrition']
@@ -51,11 +56,13 @@ class CookBookApp(Integration):
         recipe.steps.add(step)
 
         ingredient_parser = IngredientParser(self.request, True)
-        for ingredient in recipe_json['recipeIngredient']:
-            f = ingredient_parser.get_food(ingredient['ingredient']['text'])
-            u = ingredient_parser.get_unit(ingredient['unit']['text'])
+        for ingredient in recipe_json['steps'][0]['ingredients']:
+            f = ingredient_parser.get_food(ingredient['food']['name'])
+            u = None
+            if unit := ingredient.get('unit', None):
+                u = ingredient_parser.get_unit(unit.get('name', None))
             step.ingredients.add(Ingredient.objects.create(
-                food=f, unit=u, amount=ingredient['amount'], note=ingredient['note'],  space=self.request.space,
+                food=f, unit=u, amount=ingredient.get('amount', None), note=ingredient.get('note', None),  original_text=ingredient.get('original_text', None), space=self.request.space,
             ))
 
         if len(images) > 0:

cookbook/integration/copymethat.py

@@ -2,11 +2,10 @@ import re
 from io import BytesIO
 from zipfile import ZipFile
 
-from bs4 import BeautifulSoup
-
+from bs4 import BeautifulSoup, Tag
 from django.utils.translation import gettext as _
+
 from cookbook.helper.ingredient_parser import IngredientParser
-from cookbook.helper.recipe_html_import import get_recipe_from_source
 from cookbook.helper.recipe_url_import import iso_duration_to_minutes, parse_servings
 from cookbook.integration.integration import Integration
 from cookbook.models import Ingredient, Keyword, Recipe, Step
@@ -22,18 +21,21 @@ class CopyMeThat(Integration):
 
     def get_recipe_from_file(self, file):
         # 'file' comes is as a beautifulsoup object
-        recipe = Recipe.objects.create(name=file.find("div", {"id": "name"}).text.strip(), created_by=self.request.user, internal=True, space=self.request.space, )
+        try:
+            source = file.find("a", {"id": "original_link"}).text
+        except AttributeError:
+            source = None
+
+        recipe = Recipe.objects.create(name=file.find("div", {"id": "name"}).text.strip()[:128], source_url=source, created_by=self.request.user, internal=True, space=self.request.space, )
 
         for category in file.find_all("span", {"class": "recipeCategory"}):
             keyword, created = Keyword.objects.get_or_create(name=category.text, space=self.request.space)
             recipe.keywords.add(keyword)
-
+        
         try:
             recipe.servings = parse_servings(file.find("a", {"id": "recipeYield"}).text.strip())
             recipe.working_time = iso_duration_to_minutes(file.find("span", {"meta": "prepTime"}).text.strip())
             recipe.waiting_time = iso_duration_to_minutes(file.find("span", {"meta": "cookTime"}).text.strip())
-            recipe.description = (file.find("div ", {"id": "description"}).text.strip())[:512]
-
         except AttributeError:
             pass
 
@@ -43,36 +45,65 @@ class CopyMeThat(Integration):
         except AttributeError:
             pass
 
-        step = Step.objects.create(instruction='', space=self.request.space, )
-
-        ingredient_parser = IngredientParser(self.request, True)
-        for ingredient in file.find_all("li", {"class": "recipeIngredient"}):
-            if ingredient.text == "":
-                continue
-            amount, unit, food, note = ingredient_parser.parse(ingredient.text.strip())
-            f = ingredient_parser.get_food(food)
-            u = ingredient_parser.get_unit(unit)
-            step.ingredients.add(Ingredient.objects.create(
-                food=f, unit=u, amount=amount, note=note, original_text=ingredient.text.strip(), space=self.request.space,
-            ))
-
-        for s in file.find_all("li", {"class": "instruction"}):
-            if s.text == "":
-                continue
-            step.instruction += s.text.strip() + ' \n\n'
-
-        for s in file.find_all("li", {"class": "recipeNote"}):
-            if s.text == "":
-                continue
-            step.instruction += s.text.strip() + ' \n\n'
-
         try:
-            if file.find("a", {"id": "original_link"}).text != '':
-                step.instruction += "\n\n" + _("Imported from") + ": " + file.find("a", {"id": "original_link"}).text
-                step.save()
+            if len(file.find("span", {"id": "made_this"}).text.strip()) > 0:
+                recipe.keywords.add(Keyword.objects.get_or_create(space=self.request.space, name=_('I made this'))[0])
         except AttributeError:
             pass
 
+        step = Step.objects.create(instruction='', space=self.request.space, )
+
+        ingredient_parser = IngredientParser(self.request, True)
+
+        ingredients = file.find("ul", {"id": "recipeIngredients"})
+        if isinstance(ingredients, Tag):
+            for ingredient in ingredients.children:
+                if not isinstance(ingredient, Tag) or not ingredient.text.strip() or "recipeIngredient_spacer" in ingredient['class']:
+                    continue
+                if any(x in ingredient['class'] for x in ["recipeIngredient_subheader", "recipeIngredient_note"]):
+                    step.ingredients.add(Ingredient.objects.create(is_header=True, note=ingredient.text.strip()[:256], original_text=ingredient.text.strip(), space=self.request.space, ))
+                else:
+                    amount, unit, food, note = ingredient_parser.parse(ingredient.text.strip())
+                    f = ingredient_parser.get_food(food)
+                    u = ingredient_parser.get_unit(unit)
+                    step.ingredients.add(Ingredient.objects.create(food=f, unit=u, amount=amount, note=note, original_text=ingredient.text.strip(), space=self.request.space, ))
+
+        instructions = file.find("ol", {"id": "recipeInstructions"})
+        if isinstance(instructions, Tag):
+            for instruction in instructions.children:
+                if not isinstance(instruction, Tag) or instruction.text == "":
+                    continue
+                if "instruction_subheader" in instruction['class']:
+                    if step.instruction:
+                        step.save()
+                        recipe.steps.add(step)
+                        step = Step.objects.create(instruction='', space=self.request.space, )
+                    
+                    step.name = instruction.text.strip()[:128]
+                else:
+                    step.instruction += instruction.text.strip() + ' \n\n'
+
+        notes = file.find_all("li", {"class": "recipeNote"})
+        if notes:
+            step.instruction += '*Notes:* \n\n'
+
+            for n in notes:
+                if n.text == "":
+                    continue
+                step.instruction += '*' + n.text.strip() + '* \n\n'
+
+        description = ''
+        try:
+            description = file.find("div", {"id": "description"}).text.strip()
+        except AttributeError:
+            pass
+        if len(description) <= 512:
+            recipe.description = description
+        else:
+            recipe.description = description[:480] + ' ... (full description below)'
+            step.instruction += '*Description:* \n\n*' + description + '* \n\n'
+
+        step.save()
         recipe.steps.add(step)
 
         # import the Primary recipe image that is stored in the Zip

cookbook/integration/integration.py

@@ -1,16 +1,12 @@
-import time
+import traceback
 import datetime
-import json
 import traceback
 import uuid
-from io import BytesIO, StringIO
+from io import BytesIO
 from zipfile import BadZipFile, ZipFile
 
-import lxml
-from django.core.cache import cache
-import datetime
-
 from bs4 import Tag
+from django.core.cache import cache
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.files import File
 from django.db import IntegrityError
@@ -20,8 +16,7 @@ from django.utils.translation import gettext as _
 from django_scopes import scope
 from lxml import etree
 
-from cookbook.forms import ImportExportBase
-from cookbook.helper.image_processing import get_filetype, handle_image
+from cookbook.helper.image_processing import handle_image
 from cookbook.models import Keyword, Recipe
 from recipes.settings import DEBUG
 from recipes.settings import EXPORT_FILE_CACHE_DURATION
@@ -43,7 +38,7 @@ class Integration:
         self.export_type = export_type
         self.ignored_recipes = []
 
-        description = f'Imported by {request.user.get_user_name()} at {date_format(datetime.datetime.now(), "DATETIME_FORMAT")}. Type: {export_type}'
+        description = f'Imported by {request.user.get_user_display_name()} at {date_format(datetime.datetime.now(), "DATETIME_FORMAT")}. Type: {export_type}'
         icon = '📥'
 
         try:
@@ -169,7 +164,7 @@ class Integration:
 
                         for z in file_list:
                             try:
-                                if not hasattr(z, 'filename'):
+                                if not hasattr(z, 'filename') or type(z) == Tag:
                                     recipe = self.get_recipe_from_file(z)
                                 else:
                                     recipe = self.get_recipe_from_file(BytesIO(import_zip.read(z.filename)))
@@ -182,7 +177,7 @@ class Integration:
                                 traceback.print_exc()
                                 self.handle_exception(e, log=il, message=f'-------------------- \nERROR \n{e}\n--------------------\n')
                         import_zip.close()
-                    elif '.json' in f['name'] or '.txt' in f['name'] or '.mmf' in f['name'] or '.rk' in f['name'] or '.melarecipe' in f['name']:
+                    elif '.json' in f['name'] or '.xml' in f['name'] or '.txt' in f['name'] or '.mmf' in f['name'] or '.rk' in f['name'] or '.melarecipe' in f['name']:
                         data_list = self.split_recipe_file(f['file'])
                         il.total_recipes += len(data_list)
                         for d in data_list:

cookbook/integration/nextcloud_cookbook.py

@@ -1,13 +1,14 @@
 import json
 import re
-from io import BytesIO
+from io import BytesIO, StringIO
 from zipfile import ZipFile
+from PIL import Image
 
 from cookbook.helper.image_processing import get_filetype
 from cookbook.helper.ingredient_parser import IngredientParser
 from cookbook.helper.recipe_url_import import iso_duration_to_minutes
 from cookbook.integration.integration import Integration
-from cookbook.models import Ingredient, Keyword, Recipe, Step
+from cookbook.models import Ingredient, Keyword, Recipe, Step, NutritionInformation
 
 
 class NextcloudCookbook(Integration):
@@ -70,12 +71,21 @@ class NextcloudCookbook(Integration):
             recipe.steps.add(step)
 
         if 'nutrition' in recipe_json:
+            nutrition = {}
             try:
-                recipe.nutrition.calories = recipe_json['nutrition']['calories'].replace(' kcal', '').replace(' ', '')
-                recipe.nutrition.proteins = recipe_json['nutrition']['calories'].replace(' g', '').replace(',', '.').replace(' ', '')
-                recipe.nutrition.fats = recipe_json['nutrition']['calories'].replace(' g', '').replace(',', '.').replace(' ', '')
-                recipe.nutrition.carbohydrates = recipe_json['nutrition']['calories'].replace(' g', '').replace(',', '.').replace(' ', '')
-            except Exception:
+                if 'calories' in recipe_json['nutrition']:
+                    nutrition['calories'] = int(re.search(r'\d+', recipe_json['nutrition']['calories']).group())
+                if 'proteinContent' in recipe_json['nutrition']:
+                    nutrition['proteins'] = int(re.search(r'\d+', recipe_json['nutrition']['proteinContent']).group())
+                if 'fatContent' in recipe_json['nutrition']:
+                    nutrition['fats'] = int(re.search(r'\d+', recipe_json['nutrition']['fatContent']).group())
+                if 'carbohydrateContent' in recipe_json['nutrition']:
+                    nutrition['carbohydrates'] = int(re.search(r'\d+', recipe_json['nutrition']['carbohydrateContent']).group())
+
+                if nutrition != {}:
+                    recipe.nutrition = NutritionInformation.objects.create(**nutrition, space=self.request.space)
+                    recipe.save()
+            except Exception as e:
                 pass
 
         for f in self.files:
@@ -87,5 +97,92 @@ class NextcloudCookbook(Integration):
 
         return recipe
 
+    def formatTime(self, min):
+        h = min//60
+        m = min % 60
+        return f'PT{h}H{m}M0S'
+
+
     def get_file_from_recipe(self, recipe):
-        raise NotImplementedError('Method not implemented in storage integration')
+
+        export = {}
+        export['name'] = recipe.name
+        export['description'] = recipe.description
+        export['url'] = recipe.source_url
+        export['prepTime'] = self.formatTime(recipe.working_time)
+        export['cookTime'] = self.formatTime(recipe.waiting_time)
+        export['totalTime'] = self.formatTime(recipe.working_time+recipe.waiting_time)
+        export['recipeYield'] = recipe.servings
+        export['image'] = f'/Recipes/{recipe.name}/full.jpg'
+        export['imageUrl'] = f'/Recipes/{recipe.name}/full.jpg'
+
+        recipeKeyword = []
+        for k in recipe.keywords.all():
+            recipeKeyword.append(k.name)
+
+        export['keywords'] = recipeKeyword
+
+        recipeInstructions = []
+        recipeIngredient = []
+        for s in recipe.steps.all():
+            recipeInstructions.append(s.instruction)
+
+            for i in s.ingredients.all():
+                recipeIngredient.append(f'{float(i.amount)} {i.unit} {i.food}')
+
+        export['recipeIngredient'] = recipeIngredient
+        export['recipeInstructions'] = recipeInstructions
+
+
+        return "recipe.json", json.dumps(export)
+
+    def get_files_from_recipes(self, recipes, el, cookie):
+        export_zip_stream = BytesIO()
+        export_zip_obj = ZipFile(export_zip_stream, 'w')
+
+        for recipe in recipes:
+            if recipe.internal and recipe.space == self.request.space:
+
+                recipe_stream = StringIO()
+                filename, data = self.get_file_from_recipe(recipe)
+                recipe_stream.write(data)
+                export_zip_obj.writestr(f'{recipe.name}/{filename}', recipe_stream.getvalue())
+                recipe_stream.close()
+
+                try:
+                    imageByte = recipe.image.file.read()
+                    export_zip_obj.writestr(f'{recipe.name}/full.jpg', self.getJPEG(imageByte))
+                    export_zip_obj.writestr(f'{recipe.name}/thumb.jpg', self.getThumb(171, imageByte))
+                    export_zip_obj.writestr(f'{recipe.name}/thumb16.jpg', self.getThumb(16, imageByte))
+                except ValueError:
+                    pass
+
+            el.exported_recipes += 1
+            el.msg += self.get_recipe_processed_msg(recipe)
+            el.save()
+
+        export_zip_obj.close()
+
+        return [[ self.get_export_file_name(), export_zip_stream.getvalue() ]]
+
+    def getJPEG(self, imageByte):
+        image = Image.open(BytesIO(imageByte))
+        image = image.convert('RGB')
+
+        bytes = BytesIO()
+        image.save(bytes, "JPEG")
+        return bytes.getvalue()
+    
+    def getThumb(self, size, imageByte):
+        image = Image.open(BytesIO(imageByte))
+
+        w, h = image.size
+        m = min(w, h) 
+
+        image = image.crop(((w-m)//2, (h-m)//2, (w+m)//2, (h+m)//2))
+        image = image.resize([size, size], Image.Resampling.LANCZOS)
+        image = image.convert('RGB')
+
+        bytes = BytesIO()
+        image.save(bytes, "JPEG")
+        return bytes.getvalue()

cookbook/integration/recettetek.py

@@ -61,7 +61,7 @@ class RecetteTek(Integration):
             ingredient_parser = IngredientParser(self.request, True)
             for ingredient in file['ingredients'].split('\n'):
                 if len(ingredient.strip()) > 0:
-                    amount, unit, food, note = ingredient_parser.parse(food)
+                    amount, unit, food, note = ingredient_parser.parse(ingredient.strip())
                     f = ingredient_parser.get_food(ingredient)
                     u = ingredient_parser.get_unit(unit)
                     step.ingredients.add(Ingredient.objects.create(

cookbook/integration/recipekeeper.py

@@ -41,7 +41,7 @@ class RecipeKeeper(Integration):
         except AttributeError:
             pass
 
-        step = Step.objects.create(instruction='', space=self.request.space,)
+        step = Step.objects.create(instruction='', space=self.request.space, )
 
         ingredient_parser = IngredientParser(self.request, True)
         for ingredient in file.find("div", {"itemprop": "recipeIngredients"}).findChildren("p"):
@@ -51,13 +51,20 @@ class RecipeKeeper(Integration):
             f = ingredient_parser.get_food(food)
             u = ingredient_parser.get_unit(unit)
             step.ingredients.add(Ingredient.objects.create(
-                food=f, unit=u, amount=amount, note=note, original_text=ingredient, space=self.request.space,
+                food=f, unit=u, amount=amount, note=note, original_text=str(ingredient).replace('<p>', '').replace('</p>', ''), space=self.request.space,
             ))
 
         for s in file.find("div", {"itemprop": "recipeDirections"}).find_all("p"):
             if s.text == "":
                 continue
             step.instruction += s.text + ' \n'
+            step.save()
+
+        for s in file.find("div", {"itemprop": "recipeNotes"}).find_all("p"):
+            if s.text == "":
+                continue
+            step.instruction += s.text + ' \n'
+            step.save()
 
         if file.find("span", {"itemprop": "recipeSource"}).text != '':
             step.instruction += "\n\n" + _("Imported from") + ": " + file.find("span", {"itemprop": "recipeSource"}).text

cookbook/integration/rezeptsuitede.py

@@ -0,0 +1,59 @@
+from xml import etree
+
+from lxml import etree
+
+from cookbook.helper.ingredient_parser import IngredientParser
+from cookbook.helper.recipe_url_import import parse_time, parse_servings, parse_servings_text
+from cookbook.integration.integration import Integration
+from cookbook.models import Ingredient, Recipe, Step
+
+
+class Rezeptsuitede(Integration):
+
+    def split_recipe_file(self, file):
+        xml_file = etree.parse(file).getroot().getchildren()
+        recipe_list = xml_file.find('recipe')
+        return recipe_list
+
+    def get_recipe_from_file(self, file):
+        recipe_xml = file
+
+        recipe = Recipe.objects.create(
+            name=recipe_xml.find('title').text.strip(),
+            created_by=self.request.user, internal=True, space=self.request.space)
+
+        if recipe_xml.find('servingtype') is not None and recipe_xml.find('servingtype').text is not None:
+            recipe.servings = parse_servings(recipe_xml.find('servingtype').text.strip())
+            recipe.servings_text = parse_servings_text(recipe_xml.find('servingtype').text.strip())
+
+        if recipe_xml.find('description') is not None:  # description is a list of <li>'s with text
+            if len(recipe_xml.find('description')) > 0:
+                recipe.description = recipe_xml.find('description')[0].text[:512]
+
+        for step in recipe_xml.find('step'):
+            if step.text:
+                step = Step.objects.create(
+                    instruction=step.text.strip(), space=self.request.space,
+                )
+                recipe.steps.add(step)
+
+        ingredient_parser = IngredientParser(self.request, True)
+
+        if recipe_xml.find('ingredient'):
+            ingredient_step = recipe.steps.first()
+            if ingredient_step is None:
+                ingredient_step = Step.objects.create(space=self.request.space, instruction='')
+
+            for ingredient in recipe_xml.find('ingredient'):
+                f = ingredient_parser.get_food(ingredient.attrib['item'])
+                u = ingredient_parser.get_unit(ingredient.attrib['unit'])
+                ingredient_step.ingredients.add(Ingredient.objects.create(
+                    food=f, unit=u, amount=ingredient.attrib['qty'], original_text=ingredient.text.strip(), space=self.request.space,
+                ))
+
+        recipe.save()
+
+        return recipe
+
+    def get_file_from_recipe(self, recipe):
+        raise NotImplementedError('Method not implemented in storage integration')

cookbook/locale/cs/LC_MESSAGES/django.po

@@ -6,20 +6,22 @@
 # Translators:
 # Pavel Solař <pavelsolar86@gmail.com>, 2021
 # 
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-09 18:01+0100\n"
-"PO-Revision-Date: 2020-06-02 19:28+0000\n"
-"Last-Translator: Pavel Solař <pavelsolar86@gmail.com>, 2021\n"
-"Language-Team: Czech (https://www.transifex.com/django-recipes/teams/110507/cs/)\n"
+"PO-Revision-Date: 2023-01-08 17:55+0000\n"
+"Last-Translator: Joachim Weber <joachim.weber@gmx.de>\n"
+"Language-Team: Czech <http://translate.tandoor.dev/projects/tandoor/"
+"recipes-backend/cs/>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n "
+"<= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"X-Generator: Weblate 4.15\n"
 
 #: .\cookbook\filters.py:22 .\cookbook\templates\base.html:87
 #: .\cookbook\templates\forms\edit_internal_recipe.html:219
@@ -173,7 +175,7 @@ msgstr "Potravina, která by měla být nahrazena."
 
 #: .\cookbook\forms.py:198
 msgid "Add your comment: "
-msgstr "Přidat  vlastní komentář:"
+msgstr "Přidat vlastní komentář: "
 
 #: .\cookbook\forms.py:229
 msgid "Leave empty for dropbox and enter app password for nextcloud."

cookbook/locale/da/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-04-29 18:42+0200\n"
-"PO-Revision-Date: 2022-05-10 15:32+0000\n"
+"PO-Revision-Date: 2022-08-18 14:32+0000\n"
 "Last-Translator: Mathias Rasmussen <math625f@gmail.com>\n"
 "Language-Team: Danish <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/da/>\n"
@@ -2377,9 +2377,9 @@ msgid ""
 "        "
 msgstr ""
 "At servere mediefiler direkte med gunicorn/python er <b>ikke anbefalet</b>!\n"
-"        Følg venligst trinne beskrevet\n"
+"        Følg venligst trinnene beskrevet\n"
 "        <a href=\"https://github.com/vabene1111/recipes/releases/tag/0.8.1\""
-">here</a> for at opdtere\n"
+">her</a> for at opdatere\n"
 "        din installation.\n"
 "        "
 

cookbook/locale/hy/LC_MESSAGES/django.po

@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-09 18:01+0100\n"
-"PO-Revision-Date: 2021-10-13 12:50+0000\n"
-"Last-Translator: Hrachya Kocharyan <hkocharyan@ctemplar.com>\n"
+"PO-Revision-Date: 2023-01-08 17:55+0000\n"
+"Last-Translator: Joachim Weber <joachim.weber@gmx.de>\n"
 "Language-Team: Armenian <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/hy/>\n"
 "Language: hy\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Weblate 4.8\n"
+"X-Generator: Weblate 4.15\n"
 
 #: .\cookbook\filters.py:22 .\cookbook\templates\base.html:87
 #: .\cookbook\templates\forms\edit_internal_recipe.html:219
@@ -410,7 +410,7 @@ msgstr "Դուրս գալ"
 
 #: .\cookbook\templates\account\logout.html:11
 msgid "Are you sure you want to sign out?"
-msgstr "Համոզվա՞ծ եք, որ ցանկանում եք դուրս գալ:"
+msgstr "Համոզվա՞ծ եք, որ ցանկանում եք դուրս գալ՞"
 
 #: .\cookbook\templates\account\password_reset.html:5
 #: .\cookbook\templates\account\password_reset_done.html:5

cookbook/locale/ru/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-09-13 22:40+0200\n"
-"PO-Revision-Date: 2022-04-07 19:32+0000\n"
-"Last-Translator: Artem Aksenov <artemmillerr@gmail.com>\n"
+"PO-Revision-Date: 2022-11-30 19:09+0000\n"
+"Last-Translator: Alex <kovsharoff@gmail.com>\n"
 "Language-Team: Russian <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/ru/>\n"
 "Language: ru\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.10.1\n"
+"X-Generator: Weblate 4.14.1\n"
 
 #: .\cookbook\filters.py:23 .\cookbook\templates\base.html:125
 #: .\cookbook\templates\forms\ingredients.html:34
@@ -396,8 +396,9 @@ msgstr ""
 #: .\cookbook\templates\include\log_cooking.html:16
 #: .\cookbook\templates\url_import.html:224
 #: .\cookbook\templates\url_import.html:455
+#, fuzzy
 msgid "Servings"
-msgstr ""
+msgstr "Порции"
 
 #: .\cookbook\integration\safron.py:25
 msgid "Waiting time"
@@ -468,7 +469,7 @@ msgstr ""
 
 #: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
 msgid "Books"
-msgstr ""
+msgstr "Книги"
 
 #: .\cookbook\models.py:206
 msgid "Small"

cookbook/migrations/0178_remove_userpreference_search_style_and_more.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.0.6 on 2022-07-12 18:04
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0177_recipe_show_ingredient_overview'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='userpreference',
+            name='search_style',
+        ),
+        migrations.RemoveField(
+            model_name='userpreference',
+            name='show_recent',
+        ),
+    ]

cookbook/migrations/0179_recipe_private_recipe_shared.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.0.6 on 2022-07-13 10:53
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('cookbook', '0178_remove_userpreference_search_style_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='recipe',
+            name='private',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='recipe',
+            name='shared',
+            field=models.ManyToManyField(blank=True, related_name='recipe_shared_with', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

cookbook/migrations/0180_invitelink_reusable.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.0.6 on 2022-07-14 09:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0179_recipe_private_recipe_shared'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='invitelink',
+            name='reusable',
+            field=models.BooleanField(default=False),
+        ),
+    ]

cookbook/migrations/0181_space_image.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.0.6 on 2022-07-14 11:14
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0180_invitelink_reusable'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='space',
+            name='image',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='space_image', to='cookbook.userfile'),
+        ),
+    ]

cookbook/migrations/0182_userpreference_image.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.0.6 on 2022-07-14 13:32
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0181_space_image'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userpreference',
+            name='image',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='user_image', to='cookbook.userfile'),
+        ),
+    ]

cookbook/migrations/0183_alter_space_image.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.0.6 on 2022-08-04 16:46
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0182_userpreference_image'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='space',
+            name='image',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='space_image', to='cookbook.userfile'),
+        ),
+    ]

cookbook/migrations/0184_alter_userpreference_image.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.0.7 on 2022-09-12 10:29
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0183_alter_space_image'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userpreference',
+            name='image',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='user_image', to='cookbook.userfile'),
+        ),
+    ]

cookbook/migrations/0185_food_plural_name_ingredient_always_use_plural_food_and_more.py

@@ -0,0 +1,38 @@
+# Generated by Django 4.0.8 on 2022-11-22 06:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0184_alter_userpreference_image'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='food',
+            name='plural_name',
+            field=models.CharField(blank=True, default=None, max_length=128, null=True),
+        ),
+        migrations.AddField(
+            model_name='ingredient',
+            name='always_use_plural_food',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='ingredient',
+            name='always_use_plural_unit',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='space',
+            name='use_plural',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='unit',
+            name='plural_name',
+            field=models.CharField(blank=True, default=None, max_length=128, null=True),
+        ),
+    ]

cookbook/migrations/0186_automation_order_alter_automation_type.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.1.4 on 2023-01-03 21:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0185_food_plural_name_ingredient_always_use_plural_food_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='automation',
+            name='order',
+            field=models.IntegerField(default=1000),
+        ),
+        migrations.AlterField(
+            model_name='automation',
+            name='type',
+            field=models.CharField(choices=[('FOOD_ALIAS', 'Food Alias'), ('UNIT_ALIAS', 'Unit Alias'), ('KEYWORD_ALIAS', 'Keyword Alias'), ('DESCRIPTION_REPLACE', 'Description Replace'), ('INSTRUCTION_REPLACE', 'Instruction Replace')], max_length=128),
+        ),
+    ]

cookbook/migrations/0187_alter_space_use_plural.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.4 on 2023-01-20 09:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0186_automation_order_alter_automation_type'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='space',
+            name='use_plural',
+            field=models.BooleanField(default=True),
+        ),
+    ]

cookbook/models.py

@@ -4,6 +4,8 @@ import re
 import uuid
 from datetime import date, timedelta
 
+import oauth2_provider.models
+from PIL import Image
 from annoying.fields import AutoOneToOneField
 from django.contrib import auth
 from django.contrib.auth.models import Group, User
@@ -12,7 +14,7 @@ from django.contrib.postgres.search import SearchVectorField
 from django.core.files.uploadedfile import InMemoryUploadedFile, UploadedFile
 from django.core.validators import MinLengthValidator
 from django.db import IntegrityError, models
-from django.db.models import Index, ProtectedError, Q
+from django.db.models import Index, ProtectedError, Q, Avg, Max
 from django.db.models.fields.related import ManyToManyField
 from django.db.models.functions import Substr
 from django.utils import timezone
@@ -25,7 +27,7 @@ from recipes.settings import (COMMENT_PREF_DEFAULT, FRACTION_PREF_DEFAULT, KJ_PR
                               SORT_TREE_BY_NAME, STICKY_NAV_PREF_DEFAULT)
 
 
-def get_user_name(self):
+def get_user_display_name(self):
     if not (name := f"{self.first_name} {self.last_name}") == " ":
         return name
     else:
@@ -57,11 +59,18 @@ def get_shopping_share(self):
     ]))
 
 
-auth.models.User.add_to_class('get_user_name', get_user_name)
+auth.models.User.add_to_class('get_user_display_name', get_user_display_name)
 auth.models.User.add_to_class('get_shopping_share', get_shopping_share)
 auth.models.User.add_to_class('get_active_space', get_active_space)
 
 
+def oauth_token_get_owner(self):
+    return self.user
+
+
+oauth2_provider.models.AccessToken.add_to_class('get_owner', oauth_token_get_owner)
+
+
 def get_model_name(model):
     return ('_'.join(re.findall('[A-Z][^A-Z]*', model.__name__))).lower()
 
@@ -244,12 +253,14 @@ class FoodInheritField(models.Model, PermissionModelMixin):
 
 class Space(ExportModelOperationsMixin('space'), models.Model):
     name = models.CharField(max_length=128, default='Default')
+    image = models.ForeignKey("UserFile", on_delete=models.SET_NULL, null=True, blank=True, related_name='space_image')
     created_by = models.ForeignKey(User, on_delete=models.PROTECT, null=True)
     created_at = models.DateTimeField(auto_now_add=True)
     message = models.CharField(max_length=512, default='', blank=True)
     max_recipes = models.IntegerField(default=0)
     max_file_storage_mb = models.IntegerField(default=0, help_text=_('Maximum file storage for space in MB. 0 for unlimited, -1 to disable file upload.'))
     max_users = models.IntegerField(default=0)
+    use_plural = models.BooleanField(default=True)
     allow_sharing = models.BooleanField(default=True)
     demo = models.BooleanField(default=False)
     food_inherit = models.ManyToManyField(FoodInheritField, blank=True)
@@ -355,34 +366,16 @@ class UserPreference(models.Model, PermissionModelMixin):
         (BOOKS, _('Books')),
     )
 
-    # Search Style
-    SMALL = 'SMALL'
-    LARGE = 'LARGE'
-    NEW = 'NEW'
-
-    SEARCH_STYLE = ((SMALL, _('Small')), (LARGE, _('Large')), (NEW, _('New')))
-
     user = AutoOneToOneField(User, on_delete=models.CASCADE, primary_key=True)
+    image = models.ForeignKey("UserFile", on_delete=models.SET_NULL, null=True, blank=True, related_name='user_image')
     theme = models.CharField(choices=THEMES, max_length=128, default=TANDOOR)
-    nav_color = models.CharField(
-        choices=COLORS, max_length=128, default=PRIMARY
-    )
+    nav_color = models.CharField(choices=COLORS, max_length=128, default=PRIMARY)
     default_unit = models.CharField(max_length=32, default='g')
     use_fractions = models.BooleanField(default=FRACTION_PREF_DEFAULT)
     use_kj = models.BooleanField(default=KJ_PREF_DEFAULT)
-    default_page = models.CharField(
-        choices=PAGES, max_length=64, default=SEARCH
-    )
-    search_style = models.CharField(
-        choices=SEARCH_STYLE, max_length=64, default=NEW
-    )
-    show_recent = models.BooleanField(default=True)
-    plan_share = models.ManyToManyField(
-        User, blank=True, related_name='plan_share_default'
-    )
-    shopping_share = models.ManyToManyField(
-        User, blank=True, related_name='shopping_share'
-    )
+    default_page = models.CharField(choices=PAGES, max_length=64, default=SEARCH)
+    plan_share = models.ManyToManyField(User, blank=True, related_name='plan_share_default')
+    shopping_share = models.ManyToManyField(User, blank=True, related_name='shopping_share')
     ingredient_decimals = models.IntegerField(default=2)
     comments = models.BooleanField(default=COMMENT_PREF_DEFAULT)
     shopping_auto_sync = models.IntegerField(default=5)
@@ -538,6 +531,7 @@ class Keyword(ExportModelOperationsMixin('keyword'), TreeModel, PermissionModelM
 
 class Unit(ExportModelOperationsMixin('unit'), models.Model, PermissionModelMixin):
     name = models.CharField(max_length=128, validators=[MinLengthValidator(1)])
+    plural_name = models.CharField(max_length=128, null=True, blank=True, default=None)
     description = models.TextField(blank=True, null=True)
 
     space = models.ForeignKey(Space, on_delete=models.CASCADE)
@@ -562,6 +556,7 @@ class Food(ExportModelOperationsMixin('food'), TreeModel, PermissionModelMixin):
     if SORT_TREE_BY_NAME:
         node_order_by = ['name']
     name = models.CharField(max_length=128, validators=[MinLengthValidator(1)])
+    plural_name = models.CharField(max_length=128, null=True, blank=True, default=None)
     recipe = models.ForeignKey('Recipe', null=True, blank=True, on_delete=models.SET_NULL)
     supermarket_category = models.ForeignKey(SupermarketCategory, null=True, blank=True, on_delete=models.SET_NULL)  # inherited field
     ignore_shopping = models.BooleanField(default=False)  # inherited field
@@ -612,7 +607,7 @@ class Food(ExportModelOperationsMixin('food'), TreeModel, PermissionModelMixin):
         # remove all inherited fields from food
         trough = Food.inherit_fields.through
         trough.objects.all().delete()
-        
+
         # food is going to inherit attributes
         if len(inherit) > 0:
             # ManyToMany cannot be updated through an UPDATE operation
@@ -662,6 +657,8 @@ class Ingredient(ExportModelOperationsMixin('ingredient'), models.Model, Permiss
     note = models.CharField(max_length=256, null=True, blank=True)
     is_header = models.BooleanField(default=False)
     no_amount = models.BooleanField(default=False)
+    always_use_plural_unit = models.BooleanField(default=False)
+    always_use_plural_food = models.BooleanField(default=False)
     order = models.IntegerField(default=0)
     original_text = models.CharField(max_length=512, null=True, blank=True, default=None)
 
@@ -671,7 +668,23 @@ class Ingredient(ExportModelOperationsMixin('ingredient'), models.Model, Permiss
     objects = ScopedManager(space='space')
 
     def __str__(self):
-        return str(self.amount) + ' ' + str(self.unit) + ' ' + str(self.food)
+        food = ""
+        unit = ""
+        if self.always_use_plural_food and self.food.plural_name not in (None, "") and not self.no_amount:
+            food = self.food.plural_name
+        else:
+            if self.amount > 1 and self.food.plural_name not in (None, "") and not self.no_amount:
+                food = self.food.plural_name
+            else:
+                food = str(self.food)
+        if self.always_use_plural_unit and self.unit.plural_name not in (None, "") and not self.no_amount:
+            unit = self.unit.plural_name
+        else:
+            if self.amount > 1 and self.unit.plural_name not in (None, "") and not self.no_amount:
+                unit = self.unit.plural_name
+            else:
+                unit = str(self.unit)
+        return str(self.amount) + ' ' + str(unit) + ' ' + str(food)
 
     class Meta:
         ordering = ['order', 'pk']
@@ -730,6 +743,10 @@ class NutritionInformation(models.Model, PermissionModelMixin):
 #     space = models.ForeignKey(Space, on_delete=models.CASCADE)
 #     objects = ScopedManager(space='space')
 
+class RecipeManager(models.Manager.from_queryset(models.QuerySet)):
+    def get_queryset(self):
+        return super(RecipeManager, self).get_queryset().annotate(rating=Avg('cooklog__rating')).annotate(last_cooked=Max('cooklog__created_at'))
+
 
 class Recipe(ExportModelOperationsMixin('recipe'), models.Model, PermissionModelMixin):
     name = models.CharField(max_length=128)
@@ -749,6 +766,8 @@ class Recipe(ExportModelOperationsMixin('recipe'), models.Model, PermissionModel
     internal = models.BooleanField(default=False)
     nutrition = models.ForeignKey(NutritionInformation, blank=True, null=True, on_delete=models.CASCADE)
     show_ingredient_overview = models.BooleanField(default=True)
+    private = models.BooleanField(default=False)
+    shared = models.ManyToManyField(User, blank=True, related_name='recipe_shared_with')
 
     source_url = models.CharField(max_length=1024, default=None, blank=True, null=True)
     created_by = models.ForeignKey(User, on_delete=models.PROTECT)
@@ -759,7 +778,7 @@ class Recipe(ExportModelOperationsMixin('recipe'), models.Model, PermissionModel
     desc_search_vector = SearchVectorField(null=True)
     space = models.ForeignKey(Space, on_delete=models.CASCADE)
 
-    objects = ScopedManager(space='space')
+    objects = ScopedManager(space='space', _manager_class=RecipeManager)
 
     def __str__(self):
         return self.name
@@ -1017,9 +1036,8 @@ class InviteLink(ExportModelOperationsMixin('invite_link'), models.Model, Permis
     email = models.EmailField(blank=True)
     group = models.ForeignKey(Group, on_delete=models.CASCADE)
     valid_until = models.DateField(default=default_valid_until)
-    used_by = models.ForeignKey(
-        User, null=True, on_delete=models.CASCADE, related_name='used_by'
-    )
+    used_by = models.ForeignKey(User, null=True, on_delete=models.CASCADE, related_name='used_by')
+    reusable = models.BooleanField(default=False)
     created_by = models.ForeignKey(User, on_delete=models.CASCADE)
     created_at = models.DateTimeField(auto_now_add=True)
 
@@ -1187,6 +1205,13 @@ class UserFile(ExportModelOperationsMixin('user_files'), models.Model, Permissio
     objects = ScopedManager(space='space')
     space = models.ForeignKey(Space, on_delete=models.CASCADE)
 
+    def is_image(self):
+        try:
+            img = Image.open(self.file.file.file)
+            return True
+        except Exception:
+            return False
+
     def save(self, *args, **kwargs):
         if hasattr(self.file, 'file') and isinstance(self.file.file, UploadedFile) or isinstance(self.file.file, InMemoryUploadedFile):
             self.file.name = f'{uuid.uuid4()}' + pathlib.Path(self.file.name).suffix
@@ -1198,9 +1223,12 @@ class Automation(ExportModelOperationsMixin('automations'), models.Model, Permis
     FOOD_ALIAS = 'FOOD_ALIAS'
     UNIT_ALIAS = 'UNIT_ALIAS'
     KEYWORD_ALIAS = 'KEYWORD_ALIAS'
+    DESCRIPTION_REPLACE = 'DESCRIPTION_REPLACE'
+    INSTRUCTION_REPLACE = 'INSTRUCTION_REPLACE'
 
     type = models.CharField(max_length=128,
-                            choices=((FOOD_ALIAS, _('Food Alias')), (UNIT_ALIAS, _('Unit Alias')), (KEYWORD_ALIAS, _('Keyword Alias')),))
+                            choices=((FOOD_ALIAS, _('Food Alias')), (UNIT_ALIAS, _('Unit Alias')), (KEYWORD_ALIAS, _('Keyword Alias')),
+                                     (DESCRIPTION_REPLACE, _('Description Replace')), (INSTRUCTION_REPLACE, _('Instruction Replace')),))
     name = models.CharField(max_length=128, default='')
     description = models.TextField(blank=True, null=True)
 
@@ -1208,6 +1236,8 @@ class Automation(ExportModelOperationsMixin('automations'), models.Model, Permis
     param_2 = models.CharField(max_length=128, blank=True, null=True)
     param_3 = models.CharField(max_length=128, blank=True, null=True)
 
+    order = models.IntegerField(default=1000)
+
     disabled = models.BooleanField(default=False)
 
     updated_at = models.DateTimeField(auto_now=True)

cookbook/serializer.py

@@ -1,12 +1,12 @@
 import traceback
-from datetime import timedelta, datetime
+import uuid
+from datetime import datetime, timedelta
 from decimal import Decimal
 from gettext import gettext as _
 from html import escape
 from smtplib import SMTPException
 
-from PIL import Image
-from django.contrib.auth.models import User, Group
+from django.contrib.auth.models import Group, User, AnonymousUser
 from django.core.mail import send_mail
 from django.db.models import Avg, Q, QuerySet, Sum
 from django.http import BadHeaderError
@@ -14,6 +14,8 @@ from django.urls import reverse
 from django.utils import timezone
 from django_scopes import scopes_disabled
 from drf_writable_nested import UniqueFieldsMixin, WritableNestedModelSerializer
+from PIL import Image
+from oauth2_provider.models import AccessToken
 from rest_framework import serializers
 from rest_framework.exceptions import NotFound, ValidationError
 
@@ -22,14 +24,14 @@ from cookbook.helper.HelperFunctions import str2bool
 from cookbook.helper.permission_helper import above_space_limit
 from cookbook.helper.shopping_helper import RecipeShoppingEditor
 from cookbook.models import (Automation, BookmarkletImport, Comment, CookLog, CustomFilter,
-                             ExportLog, Food, FoodInheritField, ImportLog, Ingredient, Keyword,
-                             MealPlan, MealType, NutritionInformation, Recipe, RecipeBook,
+                             ExportLog, Food, FoodInheritField, ImportLog, Ingredient, InviteLink,
+                             Keyword, MealPlan, MealType, NutritionInformation, Recipe, RecipeBook,
                              RecipeBookEntry, RecipeImport, ShareLink, ShoppingList,
-                             ShoppingListEntry, ShoppingListRecipe, Step, Storage, Supermarket,
-                             SupermarketCategory, SupermarketCategoryRelation, Sync, SyncLog, Unit,
-                             UserFile, UserPreference, ViewLog, Space, UserSpace, InviteLink)
+                             ShoppingListEntry, ShoppingListRecipe, Space, Step, Storage,
+                             Supermarket, SupermarketCategory, SupermarketCategoryRelation, Sync,
+                             SyncLog, Unit, UserFile, UserPreference, UserSpace, ViewLog)
 from cookbook.templatetags.custom_tags import markdown
-from recipes.settings import MEDIA_URL, AWS_ENABLED
+from recipes.settings import AWS_ENABLED, MEDIA_URL
 
 
 class ExtendedRecipeMixin(serializers.ModelSerializer):
@@ -124,22 +126,26 @@ class SpaceFilterSerializer(serializers.ListSerializer):
             # if query is sliced it came from api request not nested serializer
             return super().to_representation(data)
         if self.child.Meta.model == User:
-            data = data.filter(userspace__space=self.context['request'].user.get_active_space()).all()
+            if type(self.context['request'].user) == AnonymousUser:
+                data = []
+            else:
+                data = data.filter(userspace__space=self.context['request'].user.get_active_space()).all()
         else:
             data = data.filter(**{'__'.join(data.model.get_space_key()): self.context['request'].space})
         return super().to_representation(data)
 
 
-class UserNameSerializer(WritableNestedModelSerializer):
-    username = serializers.SerializerMethodField('get_user_label')
+class UserSerializer(WritableNestedModelSerializer):
+    display_name = serializers.SerializerMethodField('get_user_label')
 
     def get_user_label(self, obj):
-        return obj.get_user_name()
+        return obj.get_user_display_name()
 
     class Meta:
         list_serializer_class = SpaceFilterSerializer
         model = User
-        fields = ('id', 'username')
+        fields = ('id', 'username', 'first_name', 'last_name', 'display_name')
+        read_only_fields = ('username',)
 
 
 class GroupSerializer(UniqueFieldsMixin, WritableNestedModelSerializer):
@@ -170,103 +176,6 @@ class FoodInheritFieldSerializer(UniqueFieldsMixin, WritableNestedModelSerialize
         read_only_fields = ['id']
 
 
-class SpaceSerializer(WritableNestedModelSerializer):
-    user_count = serializers.SerializerMethodField('get_user_count')
-    recipe_count = serializers.SerializerMethodField('get_recipe_count')
-    file_size_mb = serializers.SerializerMethodField('get_file_size_mb')
-    food_inherit = FoodInheritFieldSerializer(many=True)
-
-    def get_user_count(self, obj):
-        return UserSpace.objects.filter(space=obj).count()
-
-    def get_recipe_count(self, obj):
-        return Recipe.objects.filter(space=obj).count()
-
-    def get_file_size_mb(self, obj):
-        try:
-            return UserFile.objects.filter(space=obj).aggregate(Sum('file_size_kb'))['file_size_kb__sum'] / 1000
-        except TypeError:
-            return 0
-
-    def create(self, validated_data):
-        raise ValidationError('Cannot create using this endpoint')
-
-    class Meta:
-        model = Space
-        fields = ('id', 'name', 'created_by', 'created_at', 'message', 'max_recipes', 'max_file_storage_mb', 'max_users', 'allow_sharing', 'demo', 'food_inherit', 'show_facet_count', 'user_count', 'recipe_count', 'file_size_mb',)
-        read_only_fields = ('id', 'created_by', 'created_at', 'max_recipes', 'max_file_storage_mb', 'max_users', 'allow_sharing', 'demo',)
-
-
-class UserSpaceSerializer(WritableNestedModelSerializer):
-    user = UserNameSerializer(read_only=True)
-    groups = GroupSerializer(many=True)
-
-    def validate(self, data):
-        if self.instance.user == self.context['request'].space.created_by:  # can't change space owner permission
-            raise serializers.ValidationError(_('Cannot modify Space owner permission.'))
-        return super().validate(data)
-
-    def create(self, validated_data):
-        raise ValidationError('Cannot create using this endpoint')
-
-    class Meta:
-        model = UserSpace
-        fields = ('id', 'user', 'space', 'groups', 'active', 'created_at', 'updated_at',)
-        read_only_fields = ('id', 'created_at', 'updated_at', 'space')
-
-
-class SpacedModelSerializer(serializers.ModelSerializer):
-    def create(self, validated_data):
-        validated_data['space'] = self.context['request'].space
-        return super().create(validated_data)
-
-
-class MealTypeSerializer(SpacedModelSerializer, WritableNestedModelSerializer):
-
-    def create(self, validated_data):
-        validated_data['created_by'] = self.context['request'].user
-        return super().create(validated_data)
-
-    class Meta:
-        list_serializer_class = SpaceFilterSerializer
-        model = MealType
-        fields = ('id', 'name', 'order', 'icon', 'color', 'default', 'created_by')
-        read_only_fields = ('created_by',)
-
-
-class UserPreferenceSerializer(WritableNestedModelSerializer):
-    food_inherit_default = serializers.SerializerMethodField('get_food_inherit_defaults')
-    plan_share = UserNameSerializer(many=True, allow_null=True, required=False)
-    shopping_share = UserNameSerializer(many=True, allow_null=True, required=False)
-    food_children_exist = serializers.SerializerMethodField('get_food_children_exist')
-
-    def get_food_inherit_defaults(self, obj):
-        return FoodInheritFieldSerializer(obj.user.get_active_space().food_inherit.all(), many=True).data
-
-    def get_food_children_exist(self, obj):
-        space = getattr(self.context.get('request', None), 'space', None)
-        return Food.objects.filter(depth__gt=0, space=space).exists()
-
-    def update(self, instance, validated_data):
-        with scopes_disabled():
-            return super().update(instance, validated_data)
-
-    def create(self, validated_data):
-        raise ValidationError('Cannot create using this endpoint')
-
-    class Meta:
-        model = UserPreference
-        fields = (
-            'user', 'theme', 'nav_color', 'default_unit', 'default_page', 'use_fractions', 'use_kj', 'search_style',
-            'show_recent', 'plan_share',
-            'ingredient_decimals', 'comments', 'shopping_auto_sync', 'mealplan_autoadd_shopping',
-            'food_inherit_default', 'default_delay',
-            'mealplan_autoinclude_related', 'mealplan_autoexclude_onhand', 'shopping_share', 'shopping_recent_days',
-            'csv_delim', 'csv_prefix',
-            'filter_to_supermarket', 'shopping_add_onhand', 'left_handed', 'food_children_exist'
-        )
-
-
 class UserFileSerializer(serializers.ModelSerializer):
     file = serializers.FileField(write_only=True)
     file_download = serializers.SerializerMethodField('get_download_link')
@@ -343,6 +252,107 @@ class UserFileViewSerializer(serializers.ModelSerializer):
         read_only_fields = ('id', 'file')
 
 
+class SpaceSerializer(WritableNestedModelSerializer):
+    user_count = serializers.SerializerMethodField('get_user_count')
+    recipe_count = serializers.SerializerMethodField('get_recipe_count')
+    file_size_mb = serializers.SerializerMethodField('get_file_size_mb')
+    food_inherit = FoodInheritFieldSerializer(many=True)
+    image = UserFileViewSerializer(required=False, many=False, allow_null=True)
+
+    def get_user_count(self, obj):
+        return UserSpace.objects.filter(space=obj).count()
+
+    def get_recipe_count(self, obj):
+        return Recipe.objects.filter(space=obj).count()
+
+    def get_file_size_mb(self, obj):
+        try:
+            return UserFile.objects.filter(space=obj).aggregate(Sum('file_size_kb'))['file_size_kb__sum'] / 1000
+        except TypeError:
+            return 0
+
+    def create(self, validated_data):
+        raise ValidationError('Cannot create using this endpoint')
+
+    class Meta:
+        model = Space
+        fields = ('id', 'name', 'created_by', 'created_at', 'message', 'max_recipes', 'max_file_storage_mb', 'max_users',
+                  'allow_sharing', 'demo', 'food_inherit', 'show_facet_count', 'user_count', 'recipe_count', 'file_size_mb',
+                  'image', 'use_plural',)
+        read_only_fields = ('id', 'created_by', 'created_at', 'max_recipes', 'max_file_storage_mb', 'max_users', 'allow_sharing', 'demo',)
+
+
+class UserSpaceSerializer(WritableNestedModelSerializer):
+    user = UserSerializer(read_only=True)
+    groups = GroupSerializer(many=True)
+
+    def validate(self, data):
+        if self.instance.user == self.context['request'].space.created_by:  # can't change space owner permission
+            raise serializers.ValidationError(_('Cannot modify Space owner permission.'))
+        return super().validate(data)
+
+    def create(self, validated_data):
+        raise ValidationError('Cannot create using this endpoint')
+
+    class Meta:
+        model = UserSpace
+        fields = ('id', 'user', 'space', 'groups', 'active', 'created_at', 'updated_at',)
+        read_only_fields = ('id', 'created_at', 'updated_at', 'space')
+
+
+class SpacedModelSerializer(serializers.ModelSerializer):
+    def create(self, validated_data):
+        validated_data['space'] = self.context['request'].space
+        return super().create(validated_data)
+
+
+class MealTypeSerializer(SpacedModelSerializer, WritableNestedModelSerializer):
+
+    def create(self, validated_data):
+        validated_data['created_by'] = self.context['request'].user
+        return super().create(validated_data)
+
+    class Meta:
+        list_serializer_class = SpaceFilterSerializer
+        model = MealType
+        fields = ('id', 'name', 'order', 'icon', 'color', 'default', 'created_by')
+        read_only_fields = ('created_by',)
+
+
+class UserPreferenceSerializer(WritableNestedModelSerializer):
+    food_inherit_default = serializers.SerializerMethodField('get_food_inherit_defaults')
+    plan_share = UserSerializer(many=True, allow_null=True, required=False)
+    shopping_share = UserSerializer(many=True, allow_null=True, required=False)
+    food_children_exist = serializers.SerializerMethodField('get_food_children_exist')
+    image = UserFileViewSerializer(required=False, allow_null=True, many=False)
+
+    def get_food_inherit_defaults(self, obj):
+        return FoodInheritFieldSerializer(obj.user.get_active_space().food_inherit.all(), many=True).data
+
+    def get_food_children_exist(self, obj):
+        space = getattr(self.context.get('request', None), 'space', None)
+        return Food.objects.filter(depth__gt=0, space=space).exists()
+
+    def update(self, instance, validated_data):
+        with scopes_disabled():
+            return super().update(instance, validated_data)
+
+    def create(self, validated_data):
+        raise ValidationError('Cannot create using this endpoint')
+
+    class Meta:
+        model = UserPreference
+        fields = (
+            'user', 'image', 'theme', 'nav_color', 'default_unit', 'default_page', 'use_fractions', 'use_kj',
+            'plan_share', 'sticky_navbar',
+            'ingredient_decimals', 'comments', 'shopping_auto_sync', 'mealplan_autoadd_shopping',
+            'food_inherit_default', 'default_delay',
+            'mealplan_autoinclude_related', 'mealplan_autoexclude_onhand', 'shopping_share', 'shopping_recent_days',
+            'csv_delim', 'csv_prefix',
+            'filter_to_supermarket', 'shopping_add_onhand', 'left_handed', 'food_children_exist'
+        )
+
+
 class StorageSerializer(SpacedModelSerializer):
 
     def create(self, validated_data):
@@ -422,17 +432,22 @@ class UnitSerializer(UniqueFieldsMixin, ExtendedRecipeMixin):
 
     def create(self, validated_data):
         name = validated_data.pop('name').strip()
+        plural_name = validated_data.pop('plural_name', None)
+        if plural_name:
+            plural_name = plural_name.strip()
         space = validated_data.pop('space', self.context['request'].space)
-        obj, created = Unit.objects.get_or_create(name=name, space=space, defaults=validated_data)
+        obj, created = Unit.objects.get_or_create(name=name, plural_name=plural_name, space=space, defaults=validated_data)
         return obj
 
     def update(self, instance, validated_data):
         validated_data['name'] = validated_data['name'].strip()
+        if plural_name := validated_data.get('plural_name', None):
+            validated_data['plural_name'] = plural_name.strip()
         return super(UnitSerializer, self).update(instance, validated_data)
 
     class Meta:
         model = Unit
-        fields = ('id', 'name', 'description', 'numrecipe', 'image')
+        fields = ('id', 'name', 'plural_name', 'description', 'numrecipe', 'image')
         read_only_fields = ('id', 'numrecipe', 'image')
 
 
@@ -490,7 +505,7 @@ class RecipeSimpleSerializer(WritableNestedModelSerializer):
 class FoodSimpleSerializer(serializers.ModelSerializer):
     class Meta:
         model = Food
-        fields = ('id', 'name')
+        fields = ('id', 'name', 'plural_name')
 
 
 class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedRecipeMixin):
@@ -529,6 +544,9 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedR
 
     def create(self, validated_data):
         name = validated_data.pop('name').strip()
+        plural_name = validated_data.pop('plural_name', None)
+        if plural_name:
+            plural_name = plural_name.strip()
         space = validated_data.pop('space', self.context['request'].space)
         # supermarket category needs to be handled manually as food.get or create does not create nested serializers unlike a super.create of serializer
         if 'supermarket_category' in validated_data and validated_data['supermarket_category']:
@@ -553,12 +571,14 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedR
             else:
                 validated_data['onhand_users'] = list(set(onhand_users) - set(shared_users))
 
-        obj, created = Food.objects.get_or_create(name=name, space=space, defaults=validated_data)
+        obj, created = Food.objects.get_or_create(name=name, plural_name=plural_name, space=space, defaults=validated_data)
         return obj
 
     def update(self, instance, validated_data):
         if name := validated_data.get('name', None):
             validated_data['name'] = name.strip()
+        if plural_name := validated_data.get('plural_name', None):
+            validated_data['plural_name'] = plural_name.strip()
         # assuming if on hand for user also onhand for shopping_share users
         onhand = validated_data.get('food_onhand', None)
         reset_inherit = self.initial_data.get('reset_inherit', False)
@@ -578,7 +598,7 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedR
     class Meta:
         model = Food
         fields = (
-            'id', 'name', 'description', 'shopping', 'recipe', 'food_onhand', 'supermarket_category',
+            'id', 'name', 'plural_name', 'description', 'shopping', 'recipe', 'food_onhand', 'supermarket_category',
             'image', 'parent', 'numchild', 'numrecipe', 'inherit_fields', 'full_name', 'ignore_shopping',
             'substitute', 'substitute_siblings', 'substitute_children', 'substitute_onhand', 'child_inherit_fields'
         )
@@ -607,6 +627,7 @@ class IngredientSimpleSerializer(WritableNestedModelSerializer):
         fields = (
             'id', 'food', 'unit', 'amount', 'note', 'order',
             'is_header', 'no_amount', 'original_text', 'used_in_recipes',
+            'always_use_plural_unit', 'always_use_plural_food',
         )
 
 
@@ -675,25 +696,6 @@ class NutritionInformationSerializer(serializers.ModelSerializer):
 
 
 class RecipeBaseSerializer(WritableNestedModelSerializer):
-    def get_recipe_rating(self, obj):
-        try:
-            rating = obj.cooklog_set.filter(created_by=self.context['request'].user, rating__gt=0).aggregate(
-                Avg('rating'))
-            if rating['rating__avg']:
-                return rating['rating__avg']
-        except TypeError:
-            pass
-        return 0
-
-    def get_recipe_last_cooked(self, obj):
-        try:
-            last = obj.cooklog_set.filter(created_by=self.context['request'].user).order_by('created_at').last()
-            if last:
-                return last.created_at
-        except TypeError:
-            pass
-        return None
-
     # TODO make days of new recipe a setting
     def is_recipe_new(self, obj):
         if getattr(obj, 'new_recipe', None) or obj.created_at > (timezone.now() - timedelta(days=7)):
@@ -704,11 +706,12 @@ class RecipeBaseSerializer(WritableNestedModelSerializer):
 
 class RecipeOverviewSerializer(RecipeBaseSerializer):
     keywords = KeywordLabelSerializer(many=True)
-    rating = serializers.SerializerMethodField('get_recipe_rating')
-    last_cooked = serializers.SerializerMethodField('get_recipe_last_cooked')
     new = serializers.SerializerMethodField('is_recipe_new')
     recent = serializers.ReadOnlyField()
 
+    rating = CustomDecimalField(required=False, allow_null=True)
+    last_cooked = serializers.DateTimeField(required=False, allow_null=True)
+
     def create(self, validated_data):
         pass
 
@@ -729,8 +732,9 @@ class RecipeSerializer(RecipeBaseSerializer):
     nutrition = NutritionInformationSerializer(allow_null=True, required=False)
     steps = StepSerializer(many=True)
     keywords = KeywordSerializer(many=True)
-    rating = serializers.SerializerMethodField('get_recipe_rating')
-    last_cooked = serializers.SerializerMethodField('get_recipe_last_cooked')
+    shared = UserSerializer(many=True, required=False)
+    rating = CustomDecimalField(required=False, allow_null=True, read_only=True)
+    last_cooked = serializers.DateTimeField(required=False, allow_null=True, read_only=True)
 
     class Meta:
         model = Recipe
@@ -738,6 +742,7 @@ class RecipeSerializer(RecipeBaseSerializer):
             'id', 'name', 'description', 'image', 'keywords', 'steps', 'working_time',
             'waiting_time', 'created_by', 'created_at', 'updated_at', 'source_url',
             'internal', 'show_ingredient_overview', 'nutrition', 'servings', 'file_path', 'servings_text', 'rating', 'last_cooked',
+            'private', 'shared',
         )
         read_only_fields = ['image', 'created_by', 'created_at']
 
@@ -775,7 +780,7 @@ class CommentSerializer(serializers.ModelSerializer):
 
 
 class CustomFilterSerializer(SpacedModelSerializer, WritableNestedModelSerializer):
-    shared = UserNameSerializer(many=True, required=False)
+    shared = UserSerializer(many=True, required=False)
 
     def create(self, validated_data):
         validated_data['created_by'] = self.context['request'].user
@@ -788,7 +793,7 @@ class CustomFilterSerializer(SpacedModelSerializer, WritableNestedModelSerialize
 
 
 class RecipeBookSerializer(SpacedModelSerializer, WritableNestedModelSerializer):
-    shared = UserNameSerializer(many=True)
+    shared = UserSerializer(many=True)
     filter = CustomFilterSerializer(allow_null=True, required=False)
 
     def create(self, validated_data):
@@ -832,7 +837,7 @@ class MealPlanSerializer(SpacedModelSerializer, WritableNestedModelSerializer):
     meal_type_name = serializers.ReadOnlyField(source='meal_type.name')  # TODO deprecate once old meal plan was removed
     note_markdown = serializers.SerializerMethodField('get_note_markdown')
     servings = CustomDecimalField()
-    shared = UserNameSerializer(many=True, required=False, allow_null=True)
+    shared = UserSerializer(many=True, required=False, allow_null=True)
     shopping = serializers.SerializerMethodField('in_shopping')
 
     def get_note_markdown(self, obj):
@@ -871,11 +876,11 @@ class ShoppingListRecipeSerializer(serializers.ModelSerializer):
         value = value.quantize(
             Decimal(1)) if value == value.to_integral() else value.normalize()  # strips trailing zero
         return (
-                       obj.name
-                       or getattr(obj.mealplan, 'title', None)
-                       or (d := getattr(obj.mealplan, 'date', None)) and ': '.join([obj.mealplan.recipe.name, str(d)])
-                       or obj.recipe.name
-               ) + f' ({value:.2g})'
+                obj.name
+                or getattr(obj.mealplan, 'title', None)
+                or (d := getattr(obj.mealplan, 'date', None)) and ': '.join([obj.mealplan.recipe.name, str(d)])
+                or obj.recipe.name
+        ) + f' ({value:.2g})'
 
     def update(self, instance, validated_data):
         # TODO remove once old shopping list
@@ -896,7 +901,7 @@ class ShoppingListEntrySerializer(WritableNestedModelSerializer):
     ingredient_note = serializers.ReadOnlyField(source='ingredient.note')
     recipe_mealplan = ShoppingListRecipeSerializer(source='list_recipe', read_only=True)
     amount = CustomDecimalField()
-    created_by = UserNameSerializer(read_only=True)
+    created_by = UserSerializer(read_only=True)
     completed_at = serializers.DateTimeField(allow_null=True, required=False)
 
     def get_fields(self, *args, **kwargs):
@@ -964,7 +969,7 @@ class ShoppingListEntryCheckedSerializer(serializers.ModelSerializer):
 class ShoppingListSerializer(WritableNestedModelSerializer):
     recipes = ShoppingListRecipeSerializer(many=True, allow_null=True)
     entries = ShoppingListEntrySerializer(many=True, allow_null=True)
-    shared = UserNameSerializer(many=True)
+    shared = UserSerializer(many=True)
     supermarket = SupermarketSerializer(allow_null=True)
 
     def create(self, validated_data):
@@ -1062,7 +1067,7 @@ class AutomationSerializer(serializers.ModelSerializer):
     class Meta:
         model = Automation
         fields = (
-            'id', 'type', 'name', 'description', 'param_1', 'param_2', 'param_3', 'disabled', 'created_by',)
+            'id', 'type', 'name', 'description', 'param_1', 'param_2', 'param_3', 'order', 'disabled', 'created_by',)
         read_only_fields = ('created_by',)
 
 
@@ -1077,7 +1082,7 @@ class InviteLinkSerializer(WritableNestedModelSerializer):
         if obj.email:
             try:
                 if InviteLink.objects.filter(space=self.context['request'].space, created_at__gte=datetime.now() - timedelta(hours=4)).count() < 20:
-                    message = _('Hello') + '!\n\n' + _('You have been invited by ') + escape(self.context['request'].user.username)
+                    message = _('Hello') + '!\n\n' + _('You have been invited by ') + escape(self.context['request'].user.get_user_display_name())
                     message += _(' to join their Tandoor Recipes space ') + escape(self.context['request'].space.name) + '.\n\n'
                     message += _('Click the following link to activate your account: ') + self.context['request'].build_absolute_uri(reverse('view_invite', args=[str(obj.uuid)])) + '\n\n'
                     message += _('If the link does not work use the following code to manually join the space: ') + str(obj.uuid) + '\n\n'
@@ -1099,7 +1104,7 @@ class InviteLinkSerializer(WritableNestedModelSerializer):
     class Meta:
         model = InviteLink
         fields = (
-            'id', 'uuid', 'email', 'group', 'valid_until', 'used_by', 'created_by', 'created_at',)
+            'id', 'uuid', 'email', 'group', 'valid_until', 'used_by', 'reusable', 'created_by', 'created_at',)
         read_only_fields = ('id', 'uuid', 'created_by', 'created_at',)
 
 
@@ -1125,6 +1130,27 @@ class BookmarkletImportSerializer(BookmarkletImportListSerializer):
         read_only_fields = ('created_by', 'space')
 
 
+# OAuth / Auth Token related Serializers
+
+class AccessTokenSerializer(serializers.ModelSerializer):
+    token = serializers.SerializerMethodField('get_token')
+
+    def create(self, validated_data):
+        validated_data['token'] = f'tda_{str(uuid.uuid4()).replace("-", "_")}'
+        validated_data['user'] = self.context['request'].user
+        return super().create(validated_data)
+
+    def get_token(self, obj):
+        if (timezone.now() - obj.created).seconds < 15:
+            return obj.token
+        return f'tda_************_******_***********{obj.token[len(obj.token) - 4:]}'
+
+    class Meta:
+        model = AccessToken
+        fields = ('id', 'token', 'expires', 'scope', 'created', 'updated')
+        read_only_fields = ('id', 'token',)
+
+
 # Export/Import Serializers
 
 class KeywordExportSerializer(KeywordSerializer):
@@ -1148,7 +1174,7 @@ class SupermarketCategoryExportSerializer(SupermarketCategorySerializer):
 class UnitExportSerializer(UnitSerializer):
     class Meta:
         model = Unit
-        fields = ('name', 'description')
+        fields = ('name', 'plural_name', 'description')
 
 
 class FoodExportSerializer(FoodSerializer):
@@ -1156,7 +1182,7 @@ class FoodExportSerializer(FoodSerializer):
 
     class Meta:
         model = Food
-        fields = ('name', 'ignore_shopping', 'supermarket_category',)
+        fields = ('name', 'plural_name', 'ignore_shopping', 'supermarket_category',)
 
 
 class IngredientExportSerializer(WritableNestedModelSerializer):
@@ -1170,7 +1196,7 @@ class IngredientExportSerializer(WritableNestedModelSerializer):
 
     class Meta:
         model = Ingredient
-        fields = ('food', 'unit', 'amount', 'note', 'order', 'is_header', 'no_amount')
+        fields = ('food', 'unit', 'amount', 'note', 'order', 'is_header', 'no_amount', 'always_use_plural_unit', 'always_use_plural_food')
 
 
 class StepExportSerializer(WritableNestedModelSerializer):
@@ -1232,6 +1258,6 @@ class FoodShoppingUpdateSerializer(serializers.ModelSerializer):
 # non model serializers
 
 class RecipeFromSourceSerializer(serializers.Serializer):
-    url = serializers.CharField(max_length=4096, required=False, allow_null=True)
+    url = serializers.CharField(max_length=4096, required=False, allow_null=True, allow_blank=True)
     data = serializers.CharField(required=False, allow_null=True, allow_blank=True)
     bookmarklet = serializers.IntegerField(required=False, allow_null=True, )

cookbook/static/js/bookmarklet_v3.js

@@ -28,7 +28,7 @@
             const xhr = new XMLHttpRequest();
             xhr.open('POST', url, true);
             xhr.setRequestHeader('Content-Type', 'application/json');
-            xhr.setRequestHeader('Authorization', 'Token ' + token);
+            xhr.setRequestHeader('Authorization', 'Bearer ' + token);
 
             // listen for `onload` event
             xhr.onload = () => {

cookbook/static/js/frac.js

@@ -1,43 +0,0 @@
-/* frac.js (C) 2012-present SheetJS -- http://sheetjs.com */
-/*https://developer.aliyun.com/mirror/npm/package/frac/v/0.3.0 Apache license*/
-var frac = function frac(x, D, mixed) {
-  var n1 = Math.floor(x), d1 = 1;
-  var n2 = n1+1, d2 = 1;
-  if(x !== n1) while(d1 <= D && d2 <= D) {
-    var m = (n1 + n2) / (d1 + d2);
-    if(x === m) {
-      if(d1 + d2 <= D) { d1+=d2; n1+=n2; d2=D+1; }
-      else if(d1 > d2) d2=D+1;
-      else d1=D+1;
-      break;
-    }
-    else if(x < m) { n2 = n1+n2; d2 = d1+d2; }
-    else { n1 = n1+n2; d1 = d1+d2; }
-  }
-  if(d1 > D) { d1 = d2; n1 = n2; }
-  if(!mixed) return [0, n1, d1];
-  var q = Math.floor(n1/d1);
-  return [q, n1 - q*d1, d1];
-};
-frac.cont = function cont(x, D, mixed) {
-  var sgn = x < 0 ? -1 : 1;
-  var B = x * sgn;
-  var P_2 = 0, P_1 = 1, P = 0;
-  var Q_2 = 1, Q_1 = 0, Q = 0;
-  var A = Math.floor(B);
-  while(Q_1 < D) {
-    A = Math.floor(B);
-    P = A * P_1 + P_2;
-    Q = A * Q_1 + Q_2;
-    if((B - A) < 0.00000005) break;
-    B = 1 / (B - A);
-    P_2 = P_1; P_1 = P;
-    Q_2 = Q_1; Q_1 = Q;
-  }
-  if(Q > D) { if(Q_1 > D) { Q = Q_2; P = P_2; } else { Q = Q_1; P = P_1; } }
-  if(!mixed) return [0, sgn * P, Q];
-  var q = Math.floor(sgn * P/Q);
-  return [q, sgn*P - q*Q, Q];
-};
-// eslint-disable-next-line no-undef
-if(typeof module !== 'undefined' && typeof DO_NOT_EXPORT_FRAC === 'undefined') module.exports = frac;

cookbook/static/themes/tandoor.min.css

@@ -2815,6 +2815,323 @@ input[type=button].btn-block, input[type=reset].btn-block, input[type=submit].bt
     width: 100%
 }
 
+
+
+.btn {
+    font-size: .875rem;
+    font-family: Poppins, sans-serif;
+    padding: .625rem 1.25rem;
+    outline: none;
+    line-height: 1.5;
+}
+
+.btn.btn-rounded {
+    border-radius: 50px
+}
+
+.btn.btn-white {
+    background: #fff;
+    transition: all .5s ease-in-out
+}
+
+.btn.btn-white:hover {
+    background: #a7240e;
+    color: #fff
+}
+
+.btn:focus {
+    box-shadow: none
+}
+
+.btn-primary {
+    transition: all .5s ease-in-out;
+    color: #fff
+}
+
+.btn-primary:hover {
+    background: transparent;
+    color: #b98766;
+    border: 1px solid #b98766
+}
+
+.btn-secondary {
+    transition: all .5s ease-in-out;
+    color: #fff
+}
+
+.btn-secondary:hover {
+    background: transparent;
+    color: #b55e4f;
+    border: 1px solid #b55e4f
+}
+
+.btn-success {
+    transition: all .5s ease-in-out;
+    color: #fff
+}
+
+.btn-success:hover {
+    background: transparent;
+    color: #82aa8b;
+    border: 1px solid #82aa8b
+}
+
+.btn-info {
+    transition: all .5s ease-in-out;
+    color: #fff
+}
+
+.btn-info:hover {
+    background: transparent;
+    color: #385f84;
+    border: 1px solid #385f84
+}
+
+.btn-warning {
+    transition: all .5s ease-in-out;
+    color: #fff
+}
+
+.btn-warning:hover {
+    background: transparent;
+    color: #eaaa21;
+    border: 1px solid #eaaa21
+}
+
+.btn-danger {
+    transition: all .5s ease-in-out;
+    color: #fff
+}
+
+.btn-danger:hover {
+    background: transparent;
+    color: #a7240e;
+    border: 1px solid #a7240e
+}
+
+.btn-light {
+    transition: all .5s ease-in-out;
+    color: #fff
+}
+
+.btn-light:hover {
+    background-color: hsla(0, 0%, 18%, .5);
+    color: #cfd5cd;
+    border: 1px solid hsla(0, 0%, 18%, .5)
+}
+
+.btn-dark {
+    transition: all .5s ease-in-out;
+    color: #fff
+}
+
+.btn-dark:hover {
+    background: transparent;
+    color: #221e1e;
+    border: 1px solid #221e1e
+}
+
+.btn-opacity-primary {
+    color: #b98766;
+    background-color: #0012a7;
+    border: 2px solid transparent;
+    transition: all .5s ease-in-out
+}
+
+.btn-opacity-primary:hover {
+    color: #b98766;
+    background-color: #fff;
+    border: 2px solid #b98766
+}
+
+.btn-opacity-secondary {
+    color: #b55e4f;
+    background-color: #fff;
+    border: 2px solid transparent;
+    transition: all .5s ease-in-out
+}
+
+.btn-opacity-secondary:hover {
+    color: #b55e4f;
+    background-color: #fff;
+    border: 2px solid #b55e4f
+}
+
+.btn-opacity-success {
+    color: #82aa8b;
+    background-color: #b7eddd;
+    border: 2px solid transparent;
+    transition: all .5s ease-in-out
+}
+
+.btn-opacity-success:hover {
+    color: #82aa8b;
+    background-color: #fff;
+    border: 2px solid #82aa8b
+}
+
+.btn-opacity-info {
+    color: #385f84;
+    background-color: #89caff;
+    border: 2px solid transparent;
+    transition: all .5s ease-in-out
+}
+
+.btn-opacity-info:hover {
+    color: #385f84;
+    background-color: #fff;
+    border: 2px solid #385f84
+}
+
+.btn-opacity-warning {
+    color: #eaaa21;
+    background-color: #ffd170;
+    border: 2px solid transparent;
+    transition: all .5s ease-in-out
+}
+
+.btn-opacity-warning:hover {
+    color: #eaaa21;
+    background-color: #fff;
+    border: 2px solid #eaaa21
+}
+
+.btn-opacity-danger {
+    color: #a7240e;
+    background-color: #ff7070;
+    border: 2px solid transparent;
+    transition: all .5s ease-in-out
+}
+
+.btn-opacity-danger:hover {
+    color: #a7240e;
+    background-color: #fff;
+    border: 2px solid #a7240e
+}
+
+.btn-opacity-light {
+    color: #cfd5cd;
+    background-color: #fec4af;
+    border: 2px solid transparent;
+    transition: all .5s ease-in-out
+}
+
+.btn-opacity-light:hover {
+    color: #cfd5cd;
+    background-color: #fff;
+    border: 2px solid #cfd5cd
+}
+
+.btn-opacity-dark {
+    color: #221e1e;
+    background-color: #5e5353;
+    border: 2px solid transparent;
+    transition: all .5s ease-in-out
+}
+
+.btn-opacity-dark:hover {
+    color: #221e1e;
+    background-color: #fff;
+    border: 2px solid #221e1e
+}
+
+.btn-outline-primary {
+    color: #b98766;
+    background-color: #fff;
+    border: 2px solid #b98766;
+    transition: all .5s ease-in-out
+}
+
+.btn-outline-primary:hover {
+    color: #fff;
+    background-color: #b98766
+}
+
+.btn-outline-secondary {
+    color: #b55e4f;
+    background-color: #fff;
+    border: 2px solid #b55e4f;
+    transition: all .5s ease-in-out
+}
+
+.btn-outline-secondary:hover {
+    color: #fff;
+    background-color: #b55e4f
+}
+
+.btn-outline-success {
+    color: #82aa8b;
+    background-color: #fff;
+    border: 2px solid #82aa8b;
+    transition: all .5s ease-in-out
+}
+
+.btn-outline-success:hover {
+    color: #fff;
+    background-color: #82aa8b
+}
+
+.btn-outline-info {
+    color: #385f84;
+    background-color: #fff;
+    border: 2px solid #385f84;
+    transition: all .5s ease-in-out
+}
+
+.btn-outline-info:hover {
+    color: #fff;
+    background-color: #385f84
+}
+
+.btn-outline-warning {
+    color: #eaaa21;
+    background-color: #fff;
+    border: 2px solid #eaaa21;
+    transition: all .5s ease-in-out
+}
+
+.btn-outline-warning:hover {
+    color: #fff;
+    background-color: #eaaa21
+}
+
+.btn-outline-danger {
+    color: #a7240e;
+    background-color: #fff;
+    border: 2px solid #a7240e;
+    transition: all .5s ease-in-out
+}
+
+.btn-outline-danger:hover {
+    color: #fff;
+    background-color: #a7240e
+}
+
+.btn-outline-light {
+    color: #cfd5cd;
+    background-color: #fff;
+    border: 2px solid #cfd5cd;
+    transition: all .5s ease-in-out
+}
+
+.btn-outline-light:hover {
+    color: #fff;
+    background-color: #cfd5cd
+}
+
+.btn-outline-dark {
+    color: #221e1e;
+    background-color: #fff;
+    border: 2px solid #221e1e;
+    transition: all .5s ease-in-out
+}
+
+.btn-outline-dark:hover {
+    color: #fff;
+    background-color: #221e1e
+}
+
+
 .fade {
     transition: opacity .15s linear
 }
@@ -3148,6 +3465,13 @@ input[type=button].btn-block, input[type=reset].btn-block, input[type=submit].bt
     margin-right: 0
 }
 
+.btn-sm, .btn-group-sm > .btn {
+    padding: 0.25rem 0.5rem;
+    font-size: 0.8203125rem;
+    line-height: 1.5;
+    border-radius: 0.2rem
+}
+
 .btn-group-sm > .btn + .dropdown-toggle-split, .btn-sm + .dropdown-toggle-split {
     padding-right: .375rem;
     padding-left: .375rem
@@ -4611,7 +4935,7 @@ a.badge:focus, a.badge:hover {
 
 a.badge-primary:focus, a.badge-primary:hover {
     color: #fff;
-    background-color: #000004
+    background-color: var(--primary);
 }
 
 a.badge-primary.focus, a.badge-primary:focus {
@@ -6114,8 +6438,11 @@ a.close.disabled {
     vertical-align: text-top !important
 }
 
+/*!
+ * technically the wrong color but not used anywhere besides nav and this way changing nav color is supported
+ */
 .bg-primary {
-    background-color: #b98766 !important
+    background-color: rgb(221, 191, 134) !important;
 }
 
 a.bg-primary:focus, a.bg-primary:hover, button.bg-primary:focus, button.bg-primary:hover {
@@ -10063,319 +10390,6 @@ footer a:hover {
     min-width: 100%
 }
 
-.btn {
-    font-size: .875rem;
-    font-family: Poppins, sans-serif;
-    padding: .625rem 1.25rem;
-    outline: none
-}
-
-.btn.btn-rounded {
-    border-radius: 50px
-}
-
-.btn.btn-white {
-    background: #fff;
-    transition: all .5s ease-in-out
-}
-
-.btn.btn-white:hover {
-    background: #a7240e;
-    color: #fff
-}
-
-.btn:focus {
-    box-shadow: none
-}
-
-.btn-primary {
-    transition: all .5s ease-in-out;
-    color: #fff
-}
-
-.btn-primary:hover {
-    background: transparent;
-    color: #b98766;
-    border: 1px solid #b98766
-}
-
-.btn-secondary {
-    transition: all .5s ease-in-out;
-    color: #fff
-}
-
-.btn-secondary:hover {
-    background: transparent;
-    color: #b55e4f;
-    border: 1px solid #b55e4f
-}
-
-.btn-success {
-    transition: all .5s ease-in-out;
-    color: #fff
-}
-
-.btn-success:hover {
-    background: transparent;
-    color: #82aa8b;
-    border: 1px solid #82aa8b
-}
-
-.btn-info {
-    transition: all .5s ease-in-out;
-    color: #fff
-}
-
-.btn-info:hover {
-    background: transparent;
-    color: #385f84;
-    border: 1px solid #385f84
-}
-
-.btn-warning {
-    transition: all .5s ease-in-out;
-    color: #fff
-}
-
-.btn-warning:hover {
-    background: transparent;
-    color: #eaaa21;
-    border: 1px solid #eaaa21
-}
-
-.btn-danger {
-    transition: all .5s ease-in-out;
-    color: #fff
-}
-
-.btn-danger:hover {
-    background: transparent;
-    color: #a7240e;
-    border: 1px solid #a7240e
-}
-
-.btn-light {
-    transition: all .5s ease-in-out;
-    color: #fff
-}
-
-.btn-light:hover {
-    background-color: hsla(0, 0%, 18%, .5);
-    color: #cfd5cd;
-    border: 1px solid hsla(0, 0%, 18%, .5)
-}
-
-.btn-dark {
-    transition: all .5s ease-in-out;
-    color: #fff
-}
-
-.btn-dark:hover {
-    background: transparent;
-    color: #221e1e;
-    border: 1px solid #221e1e
-}
-
-.btn-opacity-primary {
-    color: #b98766;
-    background-color: #0012a7;
-    border: 2px solid transparent;
-    transition: all .5s ease-in-out
-}
-
-.btn-opacity-primary:hover {
-    color: #b98766;
-    background-color: #fff;
-    border: 2px solid #b98766
-}
-
-.btn-opacity-secondary {
-    color: #b55e4f;
-    background-color: #fff;
-    border: 2px solid transparent;
-    transition: all .5s ease-in-out
-}
-
-.btn-opacity-secondary:hover {
-    color: #b55e4f;
-    background-color: #fff;
-    border: 2px solid #b55e4f
-}
-
-.btn-opacity-success {
-    color: #82aa8b;
-    background-color: #b7eddd;
-    border: 2px solid transparent;
-    transition: all .5s ease-in-out
-}
-
-.btn-opacity-success:hover {
-    color: #82aa8b;
-    background-color: #fff;
-    border: 2px solid #82aa8b
-}
-
-.btn-opacity-info {
-    color: #385f84;
-    background-color: #89caff;
-    border: 2px solid transparent;
-    transition: all .5s ease-in-out
-}
-
-.btn-opacity-info:hover {
-    color: #385f84;
-    background-color: #fff;
-    border: 2px solid #385f84
-}
-
-.btn-opacity-warning {
-    color: #eaaa21;
-    background-color: #ffd170;
-    border: 2px solid transparent;
-    transition: all .5s ease-in-out
-}
-
-.btn-opacity-warning:hover {
-    color: #eaaa21;
-    background-color: #fff;
-    border: 2px solid #eaaa21
-}
-
-.btn-opacity-danger {
-    color: #a7240e;
-    background-color: #ff7070;
-    border: 2px solid transparent;
-    transition: all .5s ease-in-out
-}
-
-.btn-opacity-danger:hover {
-    color: #a7240e;
-    background-color: #fff;
-    border: 2px solid #a7240e
-}
-
-.btn-opacity-light {
-    color: #cfd5cd;
-    background-color: #fec4af;
-    border: 2px solid transparent;
-    transition: all .5s ease-in-out
-}
-
-.btn-opacity-light:hover {
-    color: #cfd5cd;
-    background-color: #fff;
-    border: 2px solid #cfd5cd
-}
-
-.btn-opacity-dark {
-    color: #221e1e;
-    background-color: #5e5353;
-    border: 2px solid transparent;
-    transition: all .5s ease-in-out
-}
-
-.btn-opacity-dark:hover {
-    color: #221e1e;
-    background-color: #fff;
-    border: 2px solid #221e1e
-}
-
-.btn-outline-primary {
-    color: #b98766;
-    background-color: #fff;
-    border: 2px solid #b98766;
-    transition: all .5s ease-in-out
-}
-
-.btn-outline-primary:hover {
-    color: #fff;
-    background-color: #b98766
-}
-
-.btn-outline-secondary {
-    color: #b55e4f;
-    background-color: #fff;
-    border: 2px solid #b55e4f;
-    transition: all .5s ease-in-out
-}
-
-.btn-outline-secondary:hover {
-    color: #fff;
-    background-color: #b55e4f
-}
-
-.btn-outline-success {
-    color: #82aa8b;
-    background-color: #fff;
-    border: 2px solid #82aa8b;
-    transition: all .5s ease-in-out
-}
-
-.btn-outline-success:hover {
-    color: #fff;
-    background-color: #82aa8b
-}
-
-.btn-outline-info {
-    color: #385f84;
-    background-color: #fff;
-    border: 2px solid #385f84;
-    transition: all .5s ease-in-out
-}
-
-.btn-outline-info:hover {
-    color: #fff;
-    background-color: #385f84
-}
-
-.btn-outline-warning {
-    color: #eaaa21;
-    background-color: #fff;
-    border: 2px solid #eaaa21;
-    transition: all .5s ease-in-out
-}
-
-.btn-outline-warning:hover {
-    color: #fff;
-    background-color: #eaaa21
-}
-
-.btn-outline-danger {
-    color: #a7240e;
-    background-color: #fff;
-    border: 2px solid #a7240e;
-    transition: all .5s ease-in-out
-}
-
-.btn-outline-danger:hover {
-    color: #fff;
-    background-color: #a7240e
-}
-
-.btn-outline-light {
-    color: #cfd5cd;
-    background-color: #fff;
-    border: 2px solid #cfd5cd;
-    transition: all .5s ease-in-out
-}
-
-.btn-outline-light:hover {
-    color: #fff;
-    background-color: #cfd5cd
-}
-
-.btn-outline-dark {
-    color: #221e1e;
-    background-color: #fff;
-    border: 2px solid #221e1e;
-    transition: all .5s ease-in-out
-}
-
-.btn-outline-dark:hover {
-    color: #fff;
-    background-color: #221e1e
-}
-
 .card {
     border: none;
     border-radius: 6px
@@ -10424,8 +10438,6 @@ footer a:hover {
     padding: 5px 0 20px 39px
 }
 
-/*# sourceMappingURL=maps/style.min.css.map */
-
 .bg-header {
     background-color: rgb(221, 191, 134) !important;
 }
@@ -10441,7 +10453,7 @@ footer a:hover {
     background-color: transparent !important;
 }
 
-textarea, input:not([type="submit"]):not([class="multiselect__input"]):not([class="select2-search__field"]):not([class="vue-treeselect__input"]), select  {
+textarea, input:not([type="submit"]):not([class="multiselect__input"]):not([class="select2-search__field"]):not([class="vue-treeselect__input"]), select {
     background-color: white !important;
     border-radius: .25rem !important;
     border: 1px solid #ced4da !important;
@@ -10465,6 +10477,6 @@ textarea, input:not([type="submit"]):not([class="multiselect__input"]):not([clas
 }
 
 .ghost {
-  opacity: 0.5 !important;
-  background: #b98766 !important;
+    opacity: 0.5 !important;
+    background: #b98766 !important;
 }

cookbook/tables.py

@@ -1,4 +1,3 @@
-
 import django_tables2 as tables
 from django.utils.html import format_html
 from django.utils.translation import gettext as _
@@ -8,60 +7,6 @@ from .models import (CookLog, InviteLink, Recipe, RecipeImport,
                      Storage, Sync, SyncLog, ViewLog)
 
 
-class ImageUrlColumn(tables.Column):
-    def render(self, value):
-        if value.url:
-            return value.url
-        return None
-
-
-class RecipeTableSmall(tables.Table):
-    id = tables.LinkColumn('edit_recipe', args=[A('id')])
-    name = tables.LinkColumn('view_recipe', args=[A('id')])
-    all_tags = tables.Column(
-        attrs={
-            'td': {'class': 'd-none d-lg-table-cell'},
-            'th': {'class': 'd-none d-lg-table-cell'}
-        }
-    )
-
-    class Meta:
-        model = Recipe
-        template_name = 'generic/table_template.html'
-        fields = ('id', 'name', 'all_tags')
-
-
-class RecipeTable(tables.Table):
-    edit = tables.TemplateColumn(
-        "<a style='color: inherit' href='{% url 'edit_recipe' record.id %}' >" + _('Edit') + "</a>"  # noqa: E501
-    )
-    name = tables.LinkColumn('view_recipe', args=[A('id')])
-    all_tags = tables.Column(
-        attrs={
-            'td': {'class': 'd-none d-lg-table-cell'},
-            'th': {'class': 'd-none d-lg-table-cell'}
-        }
-    )
-    image = ImageUrlColumn()
-
-    class Meta:
-        model = Recipe
-        template_name = 'recipes_table.html'
-        fields = (
-            'id', 'name', 'all_tags', 'description', 'image', 'instructions',
-            'working_time', 'waiting_time', 'internal'
-        )
-
-
-# class IngredientTable(tables.Table):
-#     id = tables.LinkColumn('edit_food', args=[A('id')])
-
-#     class Meta:
-#         model = Keyword
-#         template_name = 'generic/table_template.html'
-#         fields = ('id', 'name')
-
-
 class StorageTable(tables.Table):
     id = tables.LinkColumn('edit_storage', args=[A('id')])
 
@@ -122,7 +67,6 @@ class RecipeImportTable(tables.Table):
         fields = ('id', 'name', 'file_path')
 
 
-
 class InviteLinkTable(tables.Table):
     link = tables.TemplateColumn(
         "<input value='{{ request.scheme }}://{{ request.get_host }}{% url 'view_invite' record.uuid %}' class='form-control' />"

cookbook/templates/account/login.html

@@ -35,9 +35,7 @@
                 {% endif %}
 
                 {% if EMAIL_ENABLED %}
-                    <a class="btn btn-warning float-right d-none d-xl-block d-lg-block"
-                       href="{% url 'account_reset_password' %}">{% trans "Reset My Password" %}</a>
-                    <p class="d-xl-none d-lg-none">{% trans 'Lost your password?' %} <a
+                    <p>{% trans 'Lost your password?' %} <a
                             href="{% url 'account_reset_password' %}">{% trans "Reset My Password" %}</a></p>
                 {% endif %}
             </form>

cookbook/templates/base.html

@@ -19,7 +19,7 @@
     <link rel="mask-icon" href="{% static 'assets/safari-pinned-tab.svg' %}" color="#161616">
     <link rel="apple-touch-icon" href="{% static 'assets/apple-touch-icon.png' %}" sizes="180x180">
 
-    <link rel="manifest" href="{% url 'web_manifest' %}">
+    <link rel="manifest" crossorigin="use-credentials" href="{% url 'web_manifest' %}">
     <meta name="msapplication-TileColor" content="#ffffff">
     <meta name="msapplication-TileImage" content="/mstile-144x144.png">
 
@@ -48,6 +48,9 @@
 
     <script type="text/javascript">
         $.fn.select2.defaults.set("theme", "bootstrap");
+        {% if request.user.is_authenticated %}
+        window.ACTIVE_SPACE_ID = '{{request.space.id}}';
+        {% endif %}
     </script>
 
     <!-- Fontawesome icons -->
@@ -69,7 +72,7 @@
 </head>
 <body>
 
-<nav class="navbar navbar-expand-lg navbar-dark bg-{% nav_color request %} bg-header"
+<nav class="navbar navbar-expand-lg navbar-dark bg-{% nav_color request %}"
      id="id_main_nav"
      style="{% sticky_nav request %}">
 
@@ -285,7 +288,7 @@
                 <li class="nav-item dropdown {% if request.resolver_match.url_name in 'view_space,view_settings,view_history,view_system,docs_markdown' %}active{% endif %}">
                     <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown"
                        aria-haspopup="true" aria-expanded="false"><i
-                            class="fas fa-fw fa-user-alt"></i> {{ user.get_user_name }}
+                            class="fas fa-fw fa-user-alt"></i> {{ user.get_user_display_name }}
                     </a>
 
                     <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownMenuLink">
@@ -408,6 +411,8 @@
     localStorage.setItem('BASE_PATH', "{% base_path request 'base' %}")
     localStorage.setItem('STATIC_URL', "{% base_path request 'static_base' %}")
     localStorage.setItem('DEBUG', "{% is_debug %}")
+    localStorage.setItem('USER_ID', "{{request.user.pk}}")
+    
     window.addEventListener("load", () => {
         if ("serviceWorker" in navigator) {
             navigator.serviceWorker.register("{% url 'service_worker' %}", {scope: "{% base_path request 'base' %}" + '/'}).then(function (reg) {

cookbook/templates/forms/ingredients.html

@@ -1,43 +0,0 @@
-{% extends "base.html" %}
-{% load django_tables2 %}
-{% load crispy_forms_tags %}
-{% load static %}
-{% load i18n %}
-
-{% block title %}{% trans "Cookbook" %}{% endblock %}
-
-{% block extra_head %}
-    {{ units_form.media }}
-{% endblock %}
-
-{% block content %}
-
-    <h2><i class="fas fa-shopping-cart"></i> {% trans 'Edit Ingredients' %}</h2>
-    {% blocktrans %}
-        The following form can be used if, accidentally, two (or more) units or ingredients where created that should be
-        the same.
-        It merges two units or ingredients and updates all recipes using them.
-    {% endblocktrans %}
-    <br/>
-    <br/>
-
-    <h4>{% trans 'Units' %}</h4>
-    <form action="{% url 'edit_food' %}" method="post"
-          onsubmit="return confirm('{% trans 'Are you sure that you want to merge these two units?' %}')">
-        {% csrf_token %}
-        {{ units_form|crispy }}
-        <button class="btn btn-danger" type="submit"
-        ><i
-                class="fas fa-sync-alt"></i> {% trans 'Merge' %}</button>
-    </form>
-
-    <h4>{% trans 'Ingredients' %}</h4>
-    <form action="{% url 'edit_food' %}" method="post"
-          onsubmit="return confirm('{% trans 'Are you sure that you want to merge these two ingredients?' %}')">
-        {% csrf_token %}
-        {{ food_form|crispy }}
-        <button class="btn btn-danger" type="submit">
-            <i class="fas fa-sync-alt"></i> {% trans 'Merge' %}</button>
-    </form>
-
-{% endblock %}