Skip to content

Commit b15ed99

Browse files
committed
[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#94053 X-original-commit: b02bd28 Signed-off-by: Jérémy Kersten <[email protected]>
1 parent 5b11c02 commit b15ed99

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

addons/website/models/mixins.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,22 @@ def _default_website_meta(self):
4848
title = (request.website or company).name
4949
if 'name' in self:
5050
title = '%s | %s' % (self.name, title)
51+
5152
img_field = 'social_default_image' if request.website.has_social_default_image else 'logo'
52-
img = request.website.image_url(request.website, img_field)
53+
5354
# Default meta for OpenGraph
5455
default_opengraph = {
5556
'og:type': 'website',
5657
'og:title': title,
5758
'og:site_name': company.name,
5859
'og:url': url_join(request.httprequest.url_root, url_for(request.httprequest.path)),
59-
'og:image': img,
60+
'og:image': request.website.image_url(request.website, img_field),
6061
}
6162
# Default meta for Twitter
6263
default_twitter = {
6364
'twitter:card': 'summary_large_image',
6465
'twitter:title': title,
65-
'twitter:image': img + '/300x300',
66+
'twitter:image': request.website.image_url(request.website, img_field, size='300x300'),
6667
}
6768
if company.social_twitter:
6869
default_twitter['twitter:site'] = "@%s" % company.social_twitter.split('/')[-1]
@@ -90,11 +91,8 @@ def get_website_meta(self):
9091
if self.website_meta_description:
9192
opengraph_meta['og:description'] = self.website_meta_description
9293
twitter_meta['twitter:description'] = self.website_meta_description
93-
meta_image = self.website_meta_og_img or opengraph_meta['og:image']
94-
if meta_image.startswith('/'):
95-
meta_image = "%s%s" % (root_url, meta_image)
96-
opengraph_meta['og:image'] = meta_image
97-
twitter_meta['twitter:image'] = meta_image
94+
opengraph_meta['og:image'] = url_join(root_url, url_for(self.website_meta_og_img or opengraph_meta['og:image']))
95+
twitter_meta['twitter:image'] = url_join(root_url, url_for(self.website_meta_og_img or twitter_meta['twitter:image']))
9896
return {
9997
'opengraph_meta': opengraph_meta,
10098
'twitter_meta': twitter_meta,

0 commit comments

Comments
 (0)