Merge branch 'master' into upgrade-deps

api/resolvers/user.js

@@ -1024,6 +1024,20 @@ export default {
 
       return user.streak
     },
+    gunStreak: async (user, args, { models }) => {
+      if (user.hideCowboyHat) {
+        return null
+      }
+
+      return user.gunStreak
+    },
+    horseStreak: async (user, args, { models }) => {
+      if (user.hideCowboyHat) {
+        return null
+      }
+
+      return user.horseStreak
+    },
     maxStreak: async (user, args, { models }) => {
       if (user.hideCowboyHat) {
         return null

components/text.js

@@ -33,7 +33,7 @@ const rehypeSNStyled = () => rehypeSN({
   }]
 })
 
-const remarkPlugins = [gfm, remarkMath]
+const remarkPlugins = [gfm, [remarkMath, { singleDollarTextMath: false }]]
 const rehypePlugins = [rehypeSNStyled, rehypeMathjax]
 
 export function SearchText ({ text }) {

pages/settings/index.js

@@ -370,7 +370,7 @@ export default function Settings ({ ssrData }) {
             groupClassName='mb-0'
           />
           <Checkbox
-            label={<>hide my cowboy hat</>}
+            label={<>hide my cowboy essentials (e.g. cowboy hat)</>}
             name='hideCowboyHat'
             groupClassName='mb-0'
           />