update dev w/ latest in main (#639)

* add new spotify embed url to caddyfile (#636) Co-authored-by: Lazy Nina <> * ln/fix-youtube-embeds (#637) Co-authored-by: Lazy Nina <> * ln/add-affiliates-to-heroswap-iframe (#638) Co-authored-by: Lazy Nina <>
deso-protocol · Aug 31, 2023 · eb8100e · eb8100e
1 parent 87410ee
commit eb8100e
Show file tree

Hide file tree

Showing 9 changed files with 184 additions and 181 deletions.
diff --git a/Caddyfile b/Caddyfile
@@ -45,8 +45,6 @@ header @html Content-Security-Policy "
     bitcoinfees.earn.com
     api.blockcypher.com
     amp.bitclout.com
-    api.testwyre.com
-    api.sendwyre.com
     https://videodelivery.net
     https://lvpr.tv
     https://upload.videodelivery.net;
@@ -92,6 +90,7 @@ header @html Content-Security-Policy "
     https://www.tiktok.com
     https://giphy.com
     https://open.spotify.com
+    https://embed-standalone.spotify.com
     https://w.soundcloud.com
     https://player.twitch.tv
     https://clips.twitch.tv

diff --git a/src/app/buy-deso-page/buy-deso-heroswap/buy-deso-heroswap.component.ts b/src/app/buy-deso-page/buy-deso-heroswap/buy-deso-heroswap.component.ts
@@ -52,6 +52,7 @@ export class BuyDeSoHeroSwapComponent implements OnInit {
         `&destinationAddress=${
           this.globalVars.loggedInUser?.PublicKeyBase58Check || ''
         }`,
+        `${environment.heroswapAffiliateName ? '&affiliateName=' + environment.heroswapAffiliateName : ''}`,
         `&now=${Date.now()}`,
       ].join('')
     );

diff --git a/src/environments/environment.bitclout.ts b/src/environments/environment.bitclout.ts
@@ -22,4 +22,5 @@ export const environment = {
     logoAssetDir: '/assets/bitclout/',
   },
   heroswapURL: 'https://heroswap.com',
+  heroswapAffiliateName: 'bitcloutAffiliate',
 };
diff --git a/src/environments/environment.deso.ts b/src/environments/environment.deso.ts
@@ -22,4 +22,5 @@ export const environment = {
     logoAssetDir: '/assets/deso/',
   },
   heroswapURL: 'https://heroswap.com',
+  heroswapAffiliateName: 'nodedesoorg',
 };
diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts
@@ -22,4 +22,5 @@ export const environment = {
     logoAssetDir: '/assets/deso/',
   },
   heroswapURL: 'https://heroswap.com',
+  heroswapAffiliateName: 'frontenddev',
 };
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
@@ -22,4 +22,5 @@ export const environment = {
     logoAssetDir: '/assets/deso/',
   },
   heroswapURL: 'https://heroswap.com',
+  heroswapAffiliateName: 'frontendprod',
 };
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -26,4 +26,5 @@ export const environment = {
     logoAssetDir: '/assets/deso/',
   },
   heroswapURL: 'https://heroswap.com',
+  heroswapAffiliateName: 'frontendbase',
 };
diff --git a/src/index.bitclout.html b/src/index.bitclout.html
@@ -1,96 +1,95 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="referrer" content="no-referrer" />
-    <title>Welcome to BitClout</title>
-    <meta
-      name="description"
-      content="BitClout is a platform owned by its users. Bitcoin is decentralizing money, BitClout is decentralizing social media."
-    />
-    <meta
-      name="theme-color"
-      content="#eeeeee"
-      media="(prefers-color-scheme: light)"
-    />
-    <meta
-      name="theme-color"
-      content="#121212"
-      media="(prefers-color-scheme: dark)"
-    />
-    <meta name="twitter:card" content="summary_large_image" />
-    <meta
-      name="twitter:image"
-      content="https://bitclout.com/assets/bitclout/camelcase_logo_og.jpg"
-    />
-    <meta property="og:title" content="Welcome to BitClout" />
-    <meta
-      property="og:description"
-      content="BitClout is a platform owned by its users. Bitcoin is decentralizing money, BitClout is decentralizing social media."
-    />
-    <meta property="og:site_name" content="BitClout" />
-    <meta
-      property="og:image"
-      content="https://bitclout.com/assets/bitclout/camelcase_logo_og.jpg"
-    />
-    <meta
-      property="og:image:secure_url"
-      content="https://bitclout.com/assets/bitclout/camelcase_logo_og.jpg"
-    />
-    <meta property="og:image:type" content="image/jpeg" />
-    <meta
-      property="og:image:alt"
-      content="bitclout.com Logo on White Background"
-    />
-    <meta property="og:type" content="website" />
-    <meta property="og:url" content="https://bitclout.com" />
-    <base href="/" />
+<head>
+  <meta charset="utf-8"/>
+  <title>Welcome to BitClout</title>
+  <meta
+    name="description"
+    content="BitClout is a platform owned by its users. Bitcoin is decentralizing money, BitClout is decentralizing social media."
+  />
+  <meta
+    name="theme-color"
+    content="#eeeeee"
+    media="(prefers-color-scheme: light)"
+  />
+  <meta
+    name="theme-color"
+    content="#121212"
+    media="(prefers-color-scheme: dark)"
+  />
+  <meta name="twitter:card" content="summary_large_image"/>
+  <meta
+    name="twitter:image"
+    content="https://bitclout.com/assets/bitclout/camelcase_logo_og.jpg"
+  />
+  <meta property="og:title" content="Welcome to BitClout"/>
+  <meta
+    property="og:description"
+    content="BitClout is a platform owned by its users. Bitcoin is decentralizing money, BitClout is decentralizing social media."
+  />
+  <meta property="og:site_name" content="BitClout"/>
+  <meta
+    property="og:image"
+    content="https://bitclout.com/assets/bitclout/camelcase_logo_og.jpg"
+  />
+  <meta
+    property="og:image:secure_url"
+    content="https://bitclout.com/assets/bitclout/camelcase_logo_og.jpg"
+  />
+  <meta property="og:image:type" content="image/jpeg"/>
+  <meta
+    property="og:image:alt"
+    content="bitclout.com Logo on White Background"
+  />
+  <meta property="og:type" content="website"/>
+  <meta property="og:url" content="https://bitclout.com"/>
+  <base href="/"/>
 
-    <meta name="viewport" content="width=device-width, initial-scale=0.9" />
-    <link rel="icon" type="image/x-icon" href="/assets/bitclout/favicon.png" />
-    <link href="/vendor/bootstrap.min.css" rel="stylesheet" />
-    <link href="/vendor/roboto-mono.css" rel="stylesheet" />
-    <link href="/vendor/roboto.css" rel="stylesheet" />
-    <link href="/vendor/fontello.css" rel="stylesheet" />
-    <link href="/vendor/bs-datepicker.css" rel="stylesheet" />
+  <meta name="viewport" content="width=device-width, initial-scale=0.9"/>
+  <link rel="icon" type="image/x-icon" href="/assets/bitclout/favicon.png"/>
+  <link href="/vendor/bootstrap.min.css" rel="stylesheet"/>
+  <link href="/vendor/roboto-mono.css" rel="stylesheet"/>
+  <link href="/vendor/roboto.css" rel="stylesheet"/>
+  <link href="/vendor/fontello.css" rel="stylesheet"/>
+  <link href="/vendor/bs-datepicker.css" rel="stylesheet"/>
 
-    <script
-      src="https://kit.fontawesome.com/070ca4195b.js"
-      crossorigin="anonymous"
-    ></script>
-    <!-- Add to iOS home screen -->
-    <link rel="manifest" href="/assets/app.webmanifest" />
-    <script
-      async
-      src="/vendor/pwacompat.min.js"
-      crossorigin="anonymous"
-    ></script>
-    <link
-      rel="icon"
-      type="image/png"
-      href="/assets/bitclout/logo-512.png"
-      sizes="512x512"
-    />
-    <link
-      rel="icon"
-      type="image/png"
-      href="/assets/bitclout/logo-192.png"
-      sizes="192x192"
-    />
-    <link
-      rel="apple-touch-icon"
-      sizes="192x192"
-      href="/assets/bitclout/logo-192.png"
-      type="image/png"
-    />
-    <link
-      rel="apple-touch-icon"
-      sizes="512x512"
-      href="/assets/bitclout/logo-512.png"
-      type="image/png"
-    />
-  </head>
-  <body app-theme>
-    <app-root></app-root>
-  </body>
+  <script
+    src="https://kit.fontawesome.com/070ca4195b.js"
+    crossorigin="anonymous"
+  ></script>
+  <!-- Add to iOS home screen -->
+  <link rel="manifest" href="/assets/app.webmanifest"/>
+  <script
+    async
+    src="/vendor/pwacompat.min.js"
+    crossorigin="anonymous"
+  ></script>
+  <link
+    rel="icon"
+    type="image/png"
+    href="/assets/bitclout/logo-512.png"
+    sizes="512x512"
+  />
+  <link
+    rel="icon"
+    type="image/png"
+    href="/assets/bitclout/logo-192.png"
+    sizes="192x192"
+  />
+  <link
+    rel="apple-touch-icon"
+    sizes="192x192"
+    href="/assets/bitclout/logo-192.png"
+    type="image/png"
+  />
+  <link
+    rel="apple-touch-icon"
+    sizes="512x512"
+    href="/assets/bitclout/logo-512.png"
+    type="image/png"
+  />
+</head>
+<body app-theme>
+<app-root></app-root>
+</body>
 </html>