wip to Core

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);

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;")
       <svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="20px" height="20px" viewBox="0 4 20 30" xml:space="preserve">
         <g>

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" />
   <defs
@@ -354,22 +354,22 @@
        d="m 448.56,281.75 c 0,9.3125 7.5781,16.891 16.891,16.891 9.3086,0 16.891,-7.5781 16.891,-16.891 0,-9.3008 -7.582,-16.891 -16.891,-16.891 -9.3164,0.008 -16.891,7.5898 -16.891,16.891 z"
        id="path120"
        inkscape:connector-curvature="0"
-       style="fill:#ff5555" />
+       style="fill:#ffaaaa" />
     <path
        d="m 364.41,399.67 c 0,-9.3125 -7.582,-16.891 -16.891,-16.891 -9.3086,0 -16.879,7.5781 -16.879,16.891 0,9.3129 7.5664,16.891 16.879,16.891 9.3125,-0.004 16.891,-7.5781 16.891,-16.891 z"
        id="path122"
        inkscape:connector-curvature="0"
-       style="fill:#ff5555" />
+       style="fill:#ffaaaa" />
     <path
        d="m 247.22,282.48 c 0,-9.3125 -7.5664,-16.891 -16.891,-16.891 -9.3008,0 -16.867,7.5781 -16.867,16.891 0,9.3242 7.5664,16.879 16.867,16.879 9.3242,0 16.891,-7.5547 16.891,-16.879 z"
        id="path124"
        inkscape:connector-curvature="0"
-       style="fill:#ff5555" />
+       style="fill:#ffaaaa" />
     <path
        d="m 331.38,164.56 c 0,9.3125 7.582,16.891 16.891,16.891 9.3008,0 16.879,-7.5781 16.879,-16.891 0,-9.3008 -7.582,-16.879 -16.879,-16.879 -9.3086,0.004 -16.891,7.5781 -16.891,16.879 z"
        id="path126"
        inkscape:connector-curvature="0"
-       style="fill:#ff5555" />
+       style="fill:#ffaaaa" />
     <path
        d="m 492.02,275.46 30.359,-0.14453 c -0.29297,-10.668 -1.5391,-21.309 -3.7852,-31.719 l -132.19,-132.18 c -10.484,-2.25 -21.219,-3.5234 -31.965,-3.7852 l -0.21875,30.277 c 12.195,2.7227 21.352,13.637 21.352,26.652 0,15.055 -12.242,27.301 -27.301,27.301 -15.055,0 -27.301,-12.254 -27.301,-27.301 0,-13.539 9.9023,-24.797 22.832,-26.938 l 0.21094,-29.949 c -10.219,0.35156 -20.418,1.5898 -30.406,3.7344 l -132.19,132.19 c -2.207,10.242 -3.457,20.703 -3.7695,31.199 h 26.492 c 3.3281,-11.328 13.816,-19.629 26.191,-19.629 15.062,0 27.312,12.258 27.312,27.312 0,15.059 -12.254,27.301 -27.312,27.301 -14.125,0 -25.781,-10.797 -27.156,-24.555 h -25.531 c 0.3125,10.484 1.5625,20.945 3.7695,31.191 l 132.19,132.17 c 9.2344,1.9883 18.652,3.2031 28.125,3.6523 l -0.76172,-26.062 c -11.906,-2.9453 -20.742,-13.727 -20.742,-26.512 0,-15.055 12.242,-27.289 27.301,-27.289 15.055,0 27.312,12.242 27.312,27.289 0,13.742 -10.207,25.145 -23.441,27.035 l 0.75,25.715 c 11.52,-0.13281 23.023,-1.4062 34.242,-3.832 l 132.19,-132.17 c 2.168,-10.074 3.4141,-20.363 3.7461,-30.684 l -29.887,0.14453 c -2.0117,13.098 -13.355,23.172 -26.996,23.172 -15.055,0 -27.316,-12.258 -27.316,-27.312 0,-15.059 12.258,-27.301 27.316,-27.301 12.91,0.008 23.727,8.9922 26.578,21.027 z m -78.227,-27.07 c -7.0117,0 -13.469,-2.2461 -18.766,-6.0547 l -19.641,19.656 c 3.7852,5.2812 6.0469,11.754 6.0469,18.742 0,7 -2.2617,13.461 -6.0469,18.75 l 19.641,19.641 c 5.293,-3.7852 11.754,-6.0312 18.766,-6.0312 17.723,0 32.148,14.43 32.148,32.156 0,17.746 -14.426,32.172 -32.148,32.172 -17.746,0 -32.172,-14.426 -32.172,-32.172 0,-6.9883 2.2383,-13.469 6.0469,-18.742 l -19.66,-19.66 c -5.2656,3.8086 -11.754,6.0547 -18.738,6.0547 -7,0 -13.473,-2.2461 -18.754,-6.0547 l -19.652,19.66 c 3.8086,5.2695 6.0547,11.754 6.0547,18.742 0,17.746 -14.426,32.172 -32.168,32.172 -17.734,0 -32.172,-14.426 -32.172,-32.172 0,-17.723 14.438,-32.156 32.172,-32.156 6.9883,0 13.461,2.2461 18.742,6.0312 l 19.652,-19.641 c -3.8086,-5.2852 -6.043,-11.754 -6.043,-18.75 0,-6.9961 2.2344,-13.461 6.043,-18.742 l -19.652,-19.656 c -5.2812,3.8086 -11.754,6.0547 -18.742,6.0547 -17.734,0 -32.172,-14.426 -32.172,-32.168 0,-17.746 14.438,-32.168 32.172,-32.168 17.734,0 32.168,14.422 32.168,32.168 0,6.9883 -2.2578,13.461 -6.0547,18.742 l 19.652,19.66 c 5.2812,-3.8086 11.754,-6.0547 18.754,-6.0547 6.9883,0 13.473,2.2461 18.738,6.0547 l 19.66,-19.66 c -3.8086,-5.2812 -6.0469,-11.754 -6.0469,-18.742 0,-17.746 14.426,-32.168 32.172,-32.168 17.723,0 32.148,14.422 32.148,32.168 0,17.742 -14.426,32.168 -32.148,32.168 z"
        id="path128"