feanil
diff --git a/‎javascripts/experiment.js‎
Lines changed: 7 additions & 33 deletions b/‎javascripts/experiment.js‎
Lines changed: 7 additions & 33 deletions
diff --git a/‎javascripts/helpfulness.js‎
Lines changed: 8 additions & 24 deletions b/‎javascripts/helpfulness.js‎
Lines changed: 8 additions & 24 deletions
@@ -1,47 +1,21 @@
 import murmur from 'imurmurhash'
-import { v4 as uuidv4 } from 'uuid'
-import Cookies from 'js-cookie'
-import getCsrf from './get-csrf'
+import { getUserEventsId, sendEvent } from './events'
 
 const TREATMENT = 'TREATMENT'
 const CONTROL = 'CONTROL'
-const COOKIE_NAME = '_docs-experiment'
-
-let cookieValue
-
-export function getUserExperimentId () {
-  if (cookieValue) return cookieValue
-  cookieValue = Cookies.get(COOKIE_NAME)
-  if (cookieValue) return cookieValue
-  cookieValue = uuidv4()
-  Cookies.set(COOKIE_NAME, cookieValue, {
-    secure: true,
-    sameSite: 'strict',
-    expires: 365
-  })
-  return cookieValue
-}
 
 export function bucket (test) {
-  const id = getUserExperimentId()
+  const id = getUserEventsId()
   const hash = murmur(test).hash(id).result()
   return hash % 2 ? TREATMENT : CONTROL
 }
 
 export async function sendSuccess (test) {
-  return fetch('/events', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-      'CSRF-Token': getCsrf()
-    },
-    body: JSON.stringify({
-      type: 'EXPERIMENT',
-      user: getUserExperimentId(),
-      test,
-      group: bucket(test).toLowerCase(),
-      success: 'yes'
-    })
+  return sendEvent({
+    type: 'experiment',
+    experiment_name: test,
+    experiment_variation: bucket(test).toLowerCase(),
+    experiment_success: true
   })
 }
 
 
@@ -1,15 +1,11 @@
-import getCsrf from './get-csrf'
+import { sendEvent } from './events'
 
 export default function helpfulness () {
-  const EVENT_TYPE = 'HELPFULNESS'
-
   const forms = Array.from(document.querySelectorAll('.js-helpfulness'))
   const texts = Array.from(document.querySelectorAll('.js-helpfulness input, .js-helpfulness textarea'))
   const votes = Array.from(document.querySelectorAll('.js-helpfulness [type=radio]'))
   if (!forms.length || !texts.length || !votes.length) return
 
-  let id = '' // So that we only create one event per pageview
-
   forms.forEach(form => {
     form.addEventListener('submit', async evt => {
       evt.preventDefault()
@@ -82,25 +78,13 @@ export default function helpfulness () {
     return trackEvent(data)
   }
 
-  async function trackEvent ({ token, vote, email, comment, category }) {
-    const response = await fetch(id ? '/events/' + id : '/events', {
-      method: id ? 'PUT' : 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'CSRF-Token': getCsrf()
-      },
-      body: JSON.stringify({
-        type: EVENT_TYPE,
-        token, // Honeypot
-        url: window.location.origin + window.location.pathname,
-        vote,
-        email,
-        comment,
-        category
-      })
+  async function trackEvent ({ token, vote, email, comment }) {
+    return sendEvent({
+      type: 'survey',
+      token, // Honeypot
+      survey_vote: vote === 'Yes',
+      survey_comment: comment,
+      survey_email: email
     })
-    const data = response.ok ? await response.json() : {}
-    if (data.id) id = data.id
-    return id
   }
 }