Merge branch 'development'

Author: norbusan

.circleci/config.yml

@@ -2,7 +2,9 @@ version: 2
 jobs:
   dependencies:
     docker:
-      - image: circleci/python:3.8.6-node
+      - image: eventyay/circleci-python:py3.9
+        environment:
+          PIP_EXTRA_INDEX_URL: https://pypi.fury.io/fossasia/
 
     working_directory: ~/code
 
@@ -12,16 +14,16 @@ jobs:
       # Download and cache dependencies
       - restore_cache:
           keys:
-            - v1.5-dependencies-{{ checksum "poetry.lock" }}-{{ checksum "package.json" }}
+            - v1.5.1-dependencies-{{ checksum "poetry.lock" }}-{{ checksum "package.json" }}
             # fallback to using the latest cache if no exact match is found
-            - v1.5-dependencies-
+            - v1.5.1-dependencies-
 
       - run:
           name: Install Python Dependencies
           command: |
             python3 -m venv venv
             . venv/bin/activate
-            poetry install
+            poetry export -f requirements.txt --without-hashes --with dev | pip install -r /dev/stdin
 
       - run:
           name: Install Node Dependencies
@@ -33,11 +35,11 @@ jobs:
             - ./node_modules
             - ~/.cache/yarn
             - ~/.yarn/bin
-          key: v1.5-dependencies-{{ checksum "poetry.lock" }}-{{ checksum "package.json" }}
+          key: v1.5.1-dependencies-{{ checksum "poetry.lock" }}-{{ checksum "package.json" }}
 
   dredd:
     docker:
-      - image: circleci/python:3.8.6-node
+      - image: eventyay/circleci-python:py3.9
         environment:
             APP_CONFIG: config.TestingConfig
             DATABASE_URL: postgresql://postgres@localhost/test
@@ -58,9 +60,9 @@ jobs:
       # Download and cache dependencies
       - restore_cache:
           keys:
-            - v1.5-dependencies-{{ checksum "poetry.lock" }}-{{ checksum "package.json" }}
+            - v1.5.1-dependencies-{{ checksum "poetry.lock" }}-{{ checksum "package.json" }}
             # fallback to using the latest cache if no exact match is found
-            - v1.5-dependencies-
+            - v1.5.1-dependencies-
 
       - run:
           name: Create API blueprint
@@ -80,7 +82,7 @@ jobs:
 
   pytype:
     docker:
-      - image: circleci/python:3.8.6-node
+      - image: eventyay/circleci-python:py3.9
 
     working_directory: ~/code
 
@@ -90,17 +92,17 @@ jobs:
       # Download and cache dependencies
       - restore_cache:
           keys:
-            - v1.5-dependencies-{{ checksum "poetry.lock" }}-{{ checksum "package.json" }}
+            - v1.5.1-dependencies-{{ checksum "poetry.lock" }}-{{ checksum "package.json" }}
             # fallback to using the latest cache if no exact match is found
-            - v1.5-dependencies-
+            - v1.5.1-dependencies-
 
       - restore_cache:
           keys:
             - v1-pytype
 
       - run:
           name: Test pytype
-          command: . venv/bin/activate && pytype
+          command: ./venv/bin/pytype
 
       - save_cache:
           paths:
@@ -109,7 +111,7 @@ jobs:
 
   test:
     docker:
-      - image: circleci/python:3.8.6-node
+      - image: eventyay/circleci-python:py3.9
         environment:
           APP_CONFIG: config.TestingConfig
           DATABASE_URL: postgresql://postgres@localhost/test
@@ -131,9 +133,9 @@ jobs:
       # Download and cache dependencies
       - restore_cache:
           keys:
-            - v1.5-dependencies-{{ checksum "poetry.lock" }}-{{ checksum "package.json" }}
+            - v1.5.1-dependencies-{{ checksum "poetry.lock" }}-{{ checksum "package.json" }}
             # fallback to using the latest cache if no exact match is found
-            - v1.5-dependencies-
+            - v1.5.1-dependencies-
 
       - run:
           name: Test
@@ -147,7 +149,7 @@ jobs:
           path: test-results
 
       - store_artifacts:
-          path: test-results  
+          path: test-results
 
       - run:
           name: Upload Coverage

.github/workflows/docker-hub.yml

@@ -13,29 +13,37 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       -
-        name: Login to DockerHub
-        # The job will terminate early if Docker Hub credentials is not set.
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       -
         name: Docker meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         id: meta
         with:
-          images: eventyay/open-event-server
+          images: |
+            eventyay/open-event-server
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
       -
-        name: Build
-        id: docker_build
-        uses: docker/build-push-action@v2
+        name: Login to Docker Hub
+        uses: docker/login-action@v2
         with:
-          push: true
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-      -
-        name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}

Dockerfile

@@ -10,9 +10,15 @@ RUN apk update && \
 # PDF Generation: weasyprint (libffi-dev jpeg-dev already included above)
 RUN apk add --virtual gdk-pixbuf-dev
 
+RUN apk --no-cache add postgresql-libs ca-certificates libxslt jpeg zlib file libxml2
+# PDF Generation: weasyprint
+RUN apk --no-cache add cairo-dev pango-dev ttf-opensans
+
+# Note: The custom PyPI repo is for AlpineOS only, where Python packages are compiled with musl libc. Don't use it on glibc Linux.
 ENV POETRY_HOME=/opt/poetry \
     POETRY_VIRTUALENVS_IN_PROJECT=true \
-    POETRY_NO_INTERACTION=1
+    POETRY_NO_INTERACTION=1 \
+    PIP_EXTRA_INDEX_URL=https://pypi.fury.io/fossasia/
 
 ENV PATH="$POETRY_HOME/bin:$PATH"
 
@@ -23,21 +29,21 @@ WORKDIR /opt/pysetup
 COPY pyproject.toml ./
 COPY poetry.lock ./
 
-RUN poetry install --no-root --no-dev
+RUN poetry export -f requirements.txt --without-hashes --only main | poetry run pip install -r /dev/stdin
 
 ####
 
 FROM base
 
+# these libs are necessary for operation
+RUN apk --no-cache add libmagic cairo pango ttf-opensans && \
+    apk --no-cache add postgresql-libs libxslt jpeg zlib libxml2 # those *might* be useful
+RUN fc-cache -f
+
 COPY --from=builder /opt/pysetup/.venv /opt/pysetup/.venv
 
 ENV PATH="/opt/pysetup/.venv/bin:$PATH"
 
-RUN apk --no-cache add postgresql-libs ca-certificates libxslt jpeg zlib file libxml2
-# PDF Generation: weasyprint
-RUN apk --no-cache add cairo-dev pango-dev ttf-opensans
-RUN fc-cache -f
-
 WORKDIR /data/app
 ADD . .
 RUN ["sh", "scripts/l10n.sh", "generate"]

app/api/helpers/calendar/ical.py

@@ -72,17 +72,17 @@ def to_ical(event, include_sessions=False, my_schedule=False, user_id=None):
                 else ""
             )
             session_link_heading = (
-                " Join using link: " + session_video_url + "<br/>"
+                " Join using link: " + session_video_url + " "
                 if session_video_url
                 else ""
             )
             session_description = (
                 " "
                 + "Room: "
                 + session.microlocation.name
-                + "<br/>"
+                + " "
                 + session_link_heading
-                + " <br/> "
+                + " "
                 + session.short_abstract
             )
             session_component = Event()

app/api/helpers/custom_forms.py

@@ -15,12 +15,14 @@ def get_schema(form_fields):
     attrs = {}
 
     for field in form_fields:
-        if field.type in ['text', 'checkbox', 'select', 'paragraph']:
+        if field.type in ['text', 'checkbox', 'select', 'paragraph', 'year', 'richtextlink']:
             field_type = marshmallow.fields.Str
         elif field.type == 'email':
             field_type = TrimmedEmail
         elif field.type == 'number':
             field_type = marshmallow.fields.Float
+        elif field.type == 'boolean':
+            field_type = marshmallow.fields.Boolean
         else:
             raise UnprocessableEntityError(
                 {'pointer': '/data/complex-field-values/' + field.identifier},
@@ -45,7 +47,10 @@ def validate_custom_form_constraints(form, obj, excluded):
             if not getattr(obj, field.identifier):
                 missing_required_fields.append(field.identifier)
         else:
-            if not (obj.complex_field_values or {}).get(field.identifier):
+            if obj.complex_field_values:
+                if obj.complex_field_values.get(field.identifier) is None:
+                    missing_required_fields.append(field.identifier)
+            else:
                 missing_required_fields.append(field.identifier)
 
     if len(missing_required_fields) > 0:

app/api/routes.py

@@ -284,6 +284,7 @@
     VideoRecordingRelationship,
 )
 from app.api.video_stream import (
+    ChatmosphereDetail,
     VideoStreamDetail,
     VideoStreamList,
     VideoStreamRelationship,
@@ -1863,6 +1864,11 @@
     '/video-stream-moderators/<int:video_stream_moderator_id>/video-stream',
     '/video-recordings/<int:video_recording_id>/video-stream',
 )
+api.route(
+    ChatmosphereDetail,
+    'chatmosphere_background',
+    '/events/<event_identifier>/chatmosphere'
+)
 api.route(
     VideoStreamRelationship,
     'video_stream_rooms',

app/api/schema/custom_forms.py

@@ -40,6 +40,9 @@ class Meta:
                 "email",
                 "number",
                 "paragraph",
+                "richtextlink",
+                "boolean",
+                "year",
             ]
         ),
     )

app/api/schema/settings.py

@@ -95,6 +95,7 @@ class Meta:
     stripe_publishable_key = fields.Str(dump_only=True)
     stripe_test_client_id = fields.Str(dump_only=True)
     stripe_test_publishable_key = fields.Str(dump_only=True)
+    stripe_mode = fields.Str(dump_only=True)
 
     # PayPal Credentials
     paypal_mode = fields.Str(dump_only=True)
@@ -239,6 +240,7 @@ class Meta:
     stripe_test_client_id = fields.Str(allow_none=True)
     stripe_test_secret_key = fields.Str(allow_none=True)
     stripe_test_publishable_key = fields.Str(allow_none=True)
+    stripe_mode = fields.Str(allow_none=True)
 
     # PayPal Credentials
     paypal_mode = fields.Str(allow_none=True)

app/api/schema/video_stream.py

@@ -21,10 +21,16 @@ class VideoStreamExtraOptionsSchema(JsonSchema):
     endCurrentMeeting = fields.Boolean(default=False)
 
 
+class VideoStreamJitsiOptionsSchema(JsonSchema):
+    muteOnStart = fields.Boolean(default=False)
+    hideCamOnStart = fields.Boolean(default=False)
+
+
 class VideoStreamExtraSchema(JsonSchema):
     autoplay = fields.Boolean(default=True)
     loop = fields.Boolean(default=False)
     bbb_options = fields.Nested(VideoStreamExtraOptionsSchema, allow_none=True)
+    jitsi_options = fields.Nested(VideoStreamJitsiOptionsSchema, allow_none=True)
 
 
 class VideoStreamSchema(Schema):
@@ -85,3 +91,16 @@ class Meta:
         schema='VideoStreamModeratorSchema',
         type_='video-stream-moderator',
     )
+
+
+class ChatmosphereSchema(Schema):
+    class Meta:
+        type_ = 'video-stream'
+        self_view = 'v1.video_stream_detail'
+        self_view_kwargs = {'id': '<id>'}
+        inflect = dasherize
+
+    id = fields.Str(dump_only=True)
+    name = fields.Str(required=True)
+    url = fields.Url(required=True)
+    bg_img_url = fields.Str(required=False, allow_none=True)