Send push notifications according to users local timezone. resolves #138

Author: mskg

apps/tabler-app/package.json

@@ -149,4 +149,4 @@
         "typescript": "3.7.4",
         "typescript-tslint-plugin": "^0.5.5"
     }
-}
+}

apps/tabler-app/src/auth/ConfirmSignIn.tsx

@@ -14,7 +14,7 @@ import { parseLink } from '../helper/linking/parseLink';
 import { Categories, Logger } from '../helper/Logger';
 import { I18N } from '../i18n/translation';
 import { IAppState } from '../model/IAppState';
-import { restoreSettings, storeLanguage } from '../redux/actions/settings';
+import { restoreSettings } from '../redux/actions/settings';
 import { signin, singedIn } from '../redux/actions/user';
 import { Background, Greeting, Logo } from './Background';
 import Input from './Input';
@@ -26,7 +26,6 @@ type Props = {
     singedIn: typeof singedIn;
     signin: typeof signin,
     restoreSettings: typeof restoreSettings,
-    storeLanguage: typeof storeLanguage,
 };
 
 type State = {
@@ -228,6 +227,5 @@ export default connect(
         restoreSettings,
         singedIn,
         signin,
-        storeLanguage,
     },
 )(withTheme(ConfirmBase));

apps/tabler-app/src/i18n/translation.ts

@@ -10,6 +10,7 @@ import { I18NType } from './I18NType';
 import { pluralize, PluralizeFunc } from './pluralize';
 import DEFAULT_LANGUAGE from './translations/defaultLanguage';
 import { formatNumber, FormatNumberFunc } from './formatNumber';
+import * as Localization from 'expo-localization';
 
 const logger = new Logger(Categories.App);
 
@@ -29,6 +30,7 @@ export function replaceCurrentLanguage(otherLang: any) {
     // moment is loaded with all available locales
     moment.locale((currentLanguage as I18NType).id);
 
+    currentLanguage.timezone = Localization.timezone;
     currentLanguage.format = format;
     currentLanguage.pluralize = pluralize;
     currentLanguage.formatDate = formatDate;
@@ -66,6 +68,7 @@ loadLanguage(getAppLanguage());
 
 // tslint:disable-next-line: export-name
 export const I18N: I18NType & {
+    timezone: string,
     format: FormatFunc,
     formatDate: FormatDateFunc,
     pluralize: PluralizeFunc,

apps/tabler-app/src/model/graphql/AddressFragment.ts

@@ -13,4 +13,5 @@ export interface AddressFragment {
   street2: string | null;
   postal_code: string | null;
   city: string | null;
+  country: string | null;
 }

apps/tabler-app/src/model/graphql/Club.ts

@@ -45,6 +45,7 @@ export interface Club_Club_meetingplace1 {
   street2: string | null;
   postal_code: string | null;
   city: string | null;
+  country: string | null;
   location: Club_Club_meetingplace1_location | null;
 }
 
@@ -60,6 +61,7 @@ export interface Club_Club_meetingplace2 {
   street2: string | null;
   postal_code: string | null;
   city: string | null;
+  country: string | null;
   location: Club_Club_meetingplace2_location | null;
 }
 

apps/tabler-app/src/model/graphql/PushTimezone.ts

@@ -0,0 +1,21 @@
+/* tslint:disable */
+/* eslint-disable */
+// @generated
+// This file was automatically generated and should not be edited.
+
+import { SettingInput } from "./globalTypes";
+
+// ====================================================
+// GraphQL mutation operation: PushTimezone
+// ====================================================
+
+export interface PushTimezone {
+  /**
+   * Updates a setting
+   */
+  putSetting: boolean | null;
+}
+
+export interface PushTimezoneVariables {
+  input: SettingInput;
+}

apps/tabler-app/src/model/graphql/globalTypes.ts

@@ -88,6 +88,7 @@ export enum SettingName {
   nearbymembers = "nearbymembers",
   nearbymembersMap = "nearbymembersMap",
   notifications = "notifications",
+  timezone = "timezone",
 }
 
 export enum UserRole {

apps/tabler-app/src/redux/actions/settings.ts

@@ -41,7 +41,3 @@ export const notificationState = createAction<'@@settings/notificationsAvailable
 export const restoreSettings = createAction<'@@settings/restoreSettings'>(
     '@@settings/restoreSettings',
 );
-
-export const storeLanguage = createAction<'@@settings/storeLanguage'>(
-    '@@settings/storeLanguage',
-);

apps/tabler-app/src/sagas/settings/pushLanguage.ts

@@ -7,9 +7,9 @@ import { I18N } from '../../i18n/translation';
 import { SettingName } from '../../model/graphql/globalTypes';
 import { Pushlanguage, PushlanguageVariables } from '../../model/graphql/Pushlanguage';
 
-export const LANGUAGE_KEY = 'Language';
+const LANGUAGE_KEY = 'setting:language';
 
-export function* pushLanguage(/* _a: typeof settingsActions.storeLanguage.shape */) {
+export function* pushLanguage() {
     const client: ApolloClient<NormalizedCacheObject> = cachedAolloClient();
 
     const existingLanguage = yield AsyncStorage.getItem(LANGUAGE_KEY);
@@ -18,7 +18,7 @@ export function* pushLanguage(/* _a: typeof settingsActions.storeLanguage.shape
         yield client.mutate<Pushlanguage, PushlanguageVariables>({
             mutation: gql`
 mutation Pushlanguage($input: SettingInput!) {
-putSetting (setting: $input)
+    putSetting (setting: $input)
 }`,
             variables: {
                 input: {

apps/tabler-app/src/sagas/settings/pushTimezone.ts

@@ -0,0 +1,34 @@
+import { NormalizedCacheObject } from 'apollo-cache-inmemory';
+import { ApolloClient } from 'apollo-client';
+import gql from 'graphql-tag';
+import { AsyncStorage } from 'react-native';
+import { cachedAolloClient } from '../../apollo/bootstrapApollo';
+import { I18N } from '../../i18n/translation';
+import { SettingName } from '../../model/graphql/globalTypes';
+import { PushTimezone, PushTimezoneVariables } from '../../model/graphql/PushTimezone';
+
+const TIMEZONE_KEY = 'setting:timezone';
+
+export function* pushTimezone() {
+    const client: ApolloClient<NormalizedCacheObject> = cachedAolloClient();
+
+    const kownTimezone = yield AsyncStorage.getItem(TIMEZONE_KEY);
+    const value = I18N.timezone;
+
+    if (kownTimezone !== value) {
+        yield client.mutate<PushTimezone, PushTimezoneVariables>({
+            mutation: gql`
+mutation PushTimezone($input: SettingInput!) {
+    putSetting (setting: $input)
+}`,
+            variables: {
+                input: {
+                    value,
+                    name: SettingName.timezone,
+                },
+            },
+        });
+
+        yield AsyncStorage.setItem(TIMEZONE_KEY, value);
+    }
+}

apps/tabler-app/src/sagas/settingsSaga.ts

@@ -4,7 +4,6 @@ import * as filterActions from '../redux/actions/filter';
 import * as settingsActions from '../redux/actions/settings';
 import { checkAndDisableNotifications } from './settings/checkAndDisableNotifications';
 import { checkLinking } from './settings/checkLinking';
-import { pushLanguage } from './settings/pushLanguage';
 import { restoreSettingsFromCloud } from './settings/restoreSettingsFromCloud';
 import { saveFavoritesToCloud } from './settings/saveFavoritesToCloud';
 import { saveNotificationSettingsToCloud } from './settings/saveNotificationSettingsToCloud';
@@ -16,7 +15,6 @@ export function* settingsSaga(): SagaIterator {
 
         // restore settings
         takeLatest(settingsActions.restoreSettings.type, restoreSettingsFromCloud),
-        takeLatest(settingsActions.storeLanguage.type, pushLanguage),
 
         // mark record as modified on favorite toggle
         debounce(

apps/tabler-app/src/sagas/startup/syncAllSettings.ts

@@ -4,6 +4,7 @@ import { IAppState } from '../../model/IAppState';
 import { AuthState } from '../../model/state/AuthState';
 import { singedIn } from '../../redux/actions/user';
 import { pushLanguage } from '../settings/pushLanguage';
+import { pushTimezone } from '../settings/pushTimezone';
 import { restoreSettingsFromCloud } from '../settings/restoreSettingsFromCloud';
 import { logger } from './logger';
 
@@ -19,5 +20,7 @@ export function* syncAllSettings() {
     yield updateParameters();
 
     yield fork(pushLanguage);
+    yield fork(pushTimezone);
+
     yield fork(restoreSettingsFromCloud);
 }