Merge remote-tracking branch 'soapbox/develop' into mastodon-groups

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>

app/soapbox/utils/code.js

@@ -3,6 +3,8 @@ const { execSync } = require('child_process');
 
 const pkg = require('../../../package.json');
 
+const { CI_COMMIT_TAG, CI_COMMIT_REF_NAME, CI_COMMIT_SHA } = process.env;
+
 const shortRepoName = url => new URL(url).pathname.substring(1);
 const trimHash = hash => hash.substring(0, 7);
 
@@ -10,14 +12,12 @@ const tryGit = cmd => {
   try {
     return String(execSync(cmd));
   } catch (e) {
-    return null;
+    return undefined;
   }
 };
 
 const version = pkg => {
   // Try to discern from GitLab CI first
-  const { CI_COMMIT_TAG, CI_COMMIT_REF_NAME, CI_COMMIT_SHA } = process.env;
-
   if (CI_COMMIT_TAG === `v${pkg.version}` || CI_COMMIT_REF_NAME === 'stable') {
     return pkg.version;
   }
@@ -43,4 +43,5 @@ module.exports = {
   repository: shortRepoName(pkg.repository.url),
   version: version(pkg),
   homepage: pkg.homepage,
+  ref: CI_COMMIT_TAG || CI_COMMIT_SHA || tryGit('git rev-parse HEAD'),
 };

app/soapbox/utils/download.ts

@@ -1,9 +1,7 @@
-import type { AxiosResponse } from 'axios';
-
 /** Download the file from the response instead of opening it in a tab. */
 // https://stackoverflow.com/a/53230807
-export const download = (response: AxiosResponse, filename: string) => {
-  const url = URL.createObjectURL(new Blob([response.data]));
+export const download = (data: string, filename: string): void => {
+  const url = URL.createObjectURL(new Blob([data]));
   const link = document.createElement('a');
   link.href = url;
   link.setAttribute('download', filename);

app/soapbox/utils/theme.ts

@@ -116,3 +116,18 @@ export const colorsToCss = (colors: TailwindColorPalette): string => {
 export const generateThemeCss = (soapboxConfig: SoapboxConfig): string => {
   return colorsToCss(soapboxConfig.colors.toJS() as TailwindColorPalette);
 };
+
+const hexToHsl = (hex: string): Hsl | null => {
+  const rgb = hexToRgb(hex);
+  return rgb ? rgbToHsl(rgb) : null;
+};
+
+export const hueShift = (hex: string, delta: number): string => {
+  const { h, s, l } = hexToHsl(hex)!;
+
+  return hslToHex({
+    h: (h + delta) % 360,
+    s,
+    l,
+  });
+};