diff --git a/app/services/oauth2.js b/app/services/oauth2.js index d5d14d4..0985d3e 100644 --- a/app/services/oauth2.js +++ b/app/services/oauth2.js @@ -100,14 +100,14 @@ class OAuth2Service extends SiteService { this.log.alert('OAuth2 client not found', { clientID }); return done(null, false); } - if (client.redirectUri !== redirectUri) { + if (client.callbackUrl !== redirectUri) { this.log.alert('OAuth2 client redirect URI mismatch', { redirectUri, - officialUri: client.redirectUri, + officialUri: client.callbackUrl, }); return done(null, false); } - return done(null, client, client.redirectUri); + return done(null, client, client.callbackUrl); } catch (error) { this.log.error('failed to process OAuth2 authorize', { error }); return done(error); diff --git a/app/views/components/gab-share-button.pug b/app/views/components/gab-share-button.pug index fdbf624..71c43d7 100644 --- a/app/views/components/gab-share-button.pug +++ b/app/views/components/gab-share-button.pug @@ -1,5 +1,5 @@ mixin renderGabShareButton (shareUrl, shareMsg) - a(href=`https://gab.com/compose?url=${shareUrl}&text=${shareMsg}`, target="_frenshare").fren-button + a(href=`https://gab.com/compose?url=${shareUrl}&text=${shareMsg}`, target="_frenshare", rel="noopener noreferrer").fren-button span(style="color: white;") diff --git a/client/img/icon/dtp-core.svg b/client/img/icon/dtp-core.svg index eff7e5b..bf76ef7 100644 --- a/client/img/icon/dtp-core.svg +++ b/client/img/icon/dtp-core.svg @@ -36,14 +36,14 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1920" - inkscape:window-height="1055" + inkscape:window-height="1019" id="namedview218" showgrid="false" - inkscape:zoom="1.0114286" - inkscape:cx="262.35238" - inkscape:cy="321.94185" - inkscape:window-x="1920" - inkscape:window-y="0" + inkscape:zoom="0.178797" + inkscape:cx="-105.42657" + inkscape:cy="572.35887" + inkscape:window-x="0" + inkscape:window-y="36" inkscape:window-maximized="1" inkscape:current-layer="g214" /> + style="fill:#ffaaaa" /> + style="fill:#ffaaaa" /> + style="fill:#ffaaaa" /> + style="fill:#ffaaaa" />