feat: maybe done with audible-as-active

Author: ErikBjare

.eslintrc.json

@@ -19,7 +19,7 @@
     "@typescript-eslint/explicit-function-return-type": ["off"],
     "@typescript-eslint/no-var-requires": ["off"],
     "@typescript-eslint/no-explicit-any": ["off"],
-    "@typescript-eslint/no-use-before-define": "warn",
+    "@typescript-eslint/no-use-before-define": ["error", {"functions": false, "classes": false}],
     "@typescript-eslint/no-unused-vars": ["warn", {"argsIgnorePattern": "^_"}],
     "@typescript-eslint/no-this-alias": [
       "warn",

src/queries.ts

@@ -69,12 +69,13 @@ export function canonicalEvents(params: DesktopQueryParams | AndroidQueryParams)
       : '',
     // Fetch browser events
     params.bid_browsers
-      ? browserEvents(params) +
-        // Include focused and audible browser events as indications of not-afk
-        (params.include_audible
-          ? `audible_events = filter_keyvals(browser_events, "audible", [true]);
+      ? isDesktopParams(params) &&
+        browserEvents(params) +
+          // Include focused and audible browser events as indications of not-afk
+          (params.include_audible
+            ? `audible_events = filter_keyvals(browser_events, "audible", [true]);
              not_afk = period_union(not_afk, audible_events);`
-          : '')
+            : '')
       : '',
     // Filter out window events when the user was afk
     isDesktopParams(params) && params.filter_afk
@@ -190,7 +191,8 @@ export function fullDesktopQuery(
   afkbucket: string,
   filterAFK = true,
   classes,
-  filterCategories: string[][]
+  filterCategories: string[][],
+  include_audible: boolean
 ): string[] {
   // Escape `"`
   browserbuckets = _.map(browserbuckets, escape_doublequote);
@@ -205,6 +207,7 @@ export function fullDesktopQuery(
     classes: classes,
     filter_classes: filterCategories,
     filter_afk: filterAFK,
+    include_audible,
   };
 
   return querystr_to_array(

src/store/modules/activity.ts

@@ -31,6 +31,7 @@ interface QueryOptions {
   date?: string;
   timeperiod?: TimePeriod;
   filterAFK?: boolean;
+  includeAudible?: boolean;
   filterCategories?: string[][];
   force?: boolean;
 }
@@ -215,7 +216,7 @@ const actions = {
 
   async query_desktop_full(
     { state, commit, rootState, rootGetters },
-    { timeperiod, filterCategories, filterAFK }: QueryOptions
+    { timeperiod, filterCategories, filterAFK, includeAudible }: QueryOptions
   ) {
     const periods = [timeperiodToStr(timeperiod)];
     const classes = loadClassesForQuery();
@@ -225,7 +226,8 @@ const actions = {
       state.buckets.afk[0],
       filterAFK,
       classes,
-      filterCategories
+      filterCategories,
+      includeAudible
     );
     const data = await this._vm.$aw.query(periods, q);
 

src/views/activity/Activity.vue

@@ -67,6 +67,14 @@ div
         b-form-group(label="Show/filter category" label-cols="5" label-cols-lg="4")
           b-form-select(v-model="filterCategory", :options="categories")
 
+    div.row
+      div.col-md-12
+        b-form-group(label="Filter AFK" label-cols="11")
+          b-form-checkbox(v-model="filterAFK")
+      div.col-md-12
+        b-form-group(label="Browser audible as active" label-cols="11")
+          b-form-checkbox(v-model="includeAudible")
+
     aw-devonly
       b-btn(id="load-demo", @click="load_demo")
         | Load demo data
@@ -143,6 +151,8 @@ export default {
     return {
       today: get_today(),
       filterCategory: null,
+      includeAudible: true,
+      filterAFK: true,
       new_view: {},
     };
   },
@@ -262,7 +272,8 @@ export default {
         timeperiod: this.timeperiod,
         host: this.host,
         force: force,
-        filterAFK: true,
+        filterAFK: this.filterAFK,
+        includeAudible: this.includeAudible,
         filterCategories: this.filterCategories,
       });
     },