Merge branch 'master' into stage

Author: yvess

django/gsmap/models.py

@@ -14,6 +14,7 @@
 from django.conf import settings
 from django.core.files.base import ContentFile
 from django.core.files.storage import FileSystemStorage
+from django.utils.html import escape
 from sortedm2m.fields import SortedManyToManyField
 from sorl.thumbnail import ImageField, get_thumbnail
 from gsuser.models import User
@@ -202,7 +203,7 @@ def create_screenshot_file(self, is_thumbnail=False):
     def image_twitter(self):
         if bool(self.screenshot):
             return get_thumbnail(
-                self.screenshot, '1200x630',
+                self.screenshot, '1200x600',
                 crop='bottom', format='PNG'
             )
         return ''
@@ -265,12 +266,12 @@ def create_meta(self, storage):
         domain = Site.objects.get_current().domain
         proto = 'https' if settings.USE_HTTPS else 'http'
         meta = f'''
-<meta property="og:title" content="{self.title_data}">
-<meta property="og:description" content="{self.description_data}">
+<meta property="og:title" content="{ escape(self.title_data) }">
+<meta property="og:description" content="{ escape(self.description_data) }">
 <meta property="og:type" content="website">
-<meta property="og:url" content="{proto}://{domain}{self.get_absolute_url()}">
-<meta property="og:image" content="{proto}://{domain}/{self.image_facebook()}">
-<meta name="twitter:image" content="{proto}://{domain}/{self.image_twitter()}">
+<meta property="og:url" content="{ proto }://{ domain }{ self.get_absolute_url() }">
+<meta property="og:image" content="{ proto }://{ domain }/{ self.image_facebook() }">
+<meta name="twitter:image" content="{ proto }://{ domain }/{ self.image_twitter() }">
 '''
         storage.save(f'snapshot-meta/{self.id}.html', ContentFile(meta))
 

vue/Makefile

@@ -29,11 +29,9 @@ tests:
 
 build:
 	$(DOCKER_EXEC) yarn build --mode production
-	$(DOCKER_EXEC) rsync -av --delete dist /var/services/django/static/
 
 build-cron:
 	$(DOCKER_EXEC_CRON) yarn build --mode production
-	$(DOCKER_EXEC_CRON) rsync -av --delete dist /var/services/django/static/
 
 build-dev-watch:
 	$(DOCKER_EXEC) yarn build --mode development --watch

vue/screenshot-service/screenshot-server.js

@@ -78,7 +78,7 @@ app.get('*', async (req, res) => {
     waitLoad: true,
     waitNetworkIdle: true
   });
-  await page.waitForSelector('#map.loaded');
+  await page.waitForSelector('#mapstatus.loaded');
   await page.waitFor(500); // extra 500ms wait, for map tiles
   const screenshotBuffer = await page.screenshot({ encoding: 'binary' });
   // await browser.close();

vue/src/components/SnapshotMap.vue

@@ -11,7 +11,8 @@
       </v-slide-x-reverse-transition>
 
       <v-container fluid class="pa-0" ref="mapbox">
-        <div id="map" :class="{ loaded: isMapLoaded}"></div>
+        <div id="map"></div>
+        <span id="mapstatus" :class="{ loaded: isMapLoaded, waiting: !isMapLoaded }"></span>
       </v-container>
 
       <v-btn
@@ -60,6 +61,7 @@ body,
 #map {
   position: relative;
   width: 100%;
+  overflow: hidden;
 }
 
 #map .mapbox-improve-map {