[FIX] website: fix twitter image format and use it

Twitter image was wrongly computed, appending /300x300 after the unique
parameters.

Twitter image was always overwrite by `website_meta_og_img` or
`opengraph_meta['og:image']`

closes odoo#93953

X-original-commit: ffdfa26
Signed-off-by: Jérémy Kersten <[email protected]>

Author: JKE-be

addons/website/models/mixins.py

@@ -45,21 +45,22 @@ def _default_website_meta(self):
         title = (request.website or company).name
         if 'name' in self:
             title = '%s | %s' % (self.name, title)
+
         img_field = 'social_default_image' if request.website.has_social_default_image else 'logo'
-        img = request.website.image_url(request.website, img_field)
+
         # Default meta for OpenGraph
         default_opengraph = {
             'og:type': 'website',
             'og:title': title,
             'og:site_name': company.name,
             'og:url': url_join(request.httprequest.url_root, url_for(request.httprequest.path)),
-            'og:image': img,
+            'og:image': request.website.image_url(request.website, img_field),
         }
         # Default meta for Twitter
         default_twitter = {
             'twitter:card': 'summary_large_image',
             'twitter:title': title,
-            'twitter:image': img + '/300x300',
+            'twitter:image': request.website.image_url(request.website, img_field, size='300x300'),
         }
         if company.social_twitter:
             default_twitter['twitter:site'] = "@%s" % company.social_twitter.split('/')[-1]
@@ -87,11 +88,8 @@ def get_website_meta(self):
         if self.website_meta_description:
             opengraph_meta['og:description'] = self.website_meta_description
             twitter_meta['twitter:description'] = self.website_meta_description
-        meta_image = self.website_meta_og_img or opengraph_meta['og:image']
-        if meta_image.startswith('/'):
-            meta_image = "%s%s" % (root_url, meta_image)
-        opengraph_meta['og:image'] = meta_image
-        twitter_meta['twitter:image'] = meta_image
+        opengraph_meta['og:image'] = url_join(root_url, url_for(self.website_meta_og_img or opengraph_meta['og:image']))
+        twitter_meta['twitter:image'] = url_join(root_url, url_for(self.website_meta_og_img or twitter_meta['twitter:image']))
         return {
             'opengraph_meta': opengraph_meta,
             'twitter_meta': twitter_meta,