diff --git a/src/app/app.html b/src/app/app.html index df46b4b..7691d02 100644 --- a/src/app/app.html +++ b/src/app/app.html @@ -154,7 +154,7 @@
- + diff --git a/src/app/feed-private/feed-private.ts b/src/app/feed-private/feed-private.ts index 21cd217..d84d19c 100644 --- a/src/app/feed-private/feed-private.ts +++ b/src/app/feed-private/feed-private.ts @@ -146,17 +146,17 @@ export class FeedPrivateComponent { feedChanged($event: any, type: string) { if (type === 'public') { // If user choose public and set the value to values, we'll turn on the private. - if (!this.options.options.publicFeed) { - this.options.options.privateFeed = true; + if (!this.options.values.publicFeed) { + this.options.values.privateFeed = true; } else { - this.options.options.privateFeed = false; + this.options.values.privateFeed = false; } } else { // If user choose private and set the value to values, we'll turn on the public. - if (!this.options.options.privateFeed) { - this.options.options.publicFeed = true; + if (!this.options.values.privateFeed) { + this.options.values.publicFeed = true; } else { - this.options.options.publicFeed = false; + this.options.values.publicFeed = false; } } } @@ -176,7 +176,7 @@ export class FeedPrivateComponent { async ngOnInit() { this.appState.updateTitle('Following Notes'); - this.options.options.privateFeed = true; + this.options.values.privateFeed = true; this.subscriptions.push( this.navigation.showMore$.subscribe(() => { diff --git a/src/app/feed-public/feed-public.html b/src/app/feed-public/feed-public.html index 78f24cb..5d9347b 100644 --- a/src/app/feed-public/feed-public.html +++ b/src/app/feed-public/feed-public.html @@ -11,9 +11,9 @@ - Pause feed - Hide spam - Hide LN invoices + Pause feed + Hide spam + Hide LN invoices diff --git a/src/app/settings/settings.ts b/src/app/settings/settings.ts index cf59236..864a9b4 100644 --- a/src/app/settings/settings.ts +++ b/src/app/settings/settings.ts @@ -10,6 +10,7 @@ import { ProfileService } from '../services/profile'; import { RelayService } from '../services/relay'; import { ThemeService } from '../services/theme'; import { AddRelayDialog, AddRelayDialogData } from '../shared/add-relay-dialog/add-relay-dialog'; +import { OptionsService } from '../services/options'; @Component({ selector: 'app-settings', @@ -24,7 +25,15 @@ export class SettingsComponent { wipedNotes = false; open = false; - constructor(public relayService: RelayService, public dialog: MatDialog, public appState: ApplicationState, private profileService: ProfileService, public theme: ThemeService, private db: StorageService) {} + constructor( + public optionsService: OptionsService, + public relayService: RelayService, + public dialog: MatDialog, + public appState: ApplicationState, + private profileService: ProfileService, + public theme: ThemeService, + private db: StorageService + ) {} toggle() { if (this.open) { diff --git a/src/app/shared/content-music/content-music.ts b/src/app/shared/content-music/content-music.ts index 670df97..7c7cdfd 100644 --- a/src/app/shared/content-music/content-music.ts +++ b/src/app/shared/content-music/content-music.ts @@ -37,7 +37,7 @@ export class ContentMusicComponent { constructor(private options: OptionsService, private profileService: ProfileService, private utilities: Utilities, public dialog: MatDialog) {} toggleMediaPlayer() { - this.options.options.showMediaPlayer = !this.options.options.showMediaPlayer; + this.options.values.showMediaPlayer = !this.options.values.showMediaPlayer; } mediaConnect() { diff --git a/src/app/shared/content-podcast/content-podcast.ts b/src/app/shared/content-podcast/content-podcast.ts index 791da1d..dac5976 100644 --- a/src/app/shared/content-podcast/content-podcast.ts +++ b/src/app/shared/content-podcast/content-podcast.ts @@ -38,7 +38,7 @@ export class ContentPodcastComponent { constructor(private media: MediaService, private options: OptionsService, private profileService: ProfileService, private utilities: Utilities, public dialog: MatDialog) {} toggleMediaPlayer() { - this.options.options.showMediaPlayer = !this.options.options.showMediaPlayer; + this.options.values.showMediaPlayer = !this.options.values.showMediaPlayer; } play(title: string, artist: string, file: string, artwork: string) { diff --git a/src/app/shared/event-buttons/event-buttons.html b/src/app/shared/event-buttons/event-buttons.html index 002c96b..95a4c00 100644 --- a/src/app/shared/event-buttons/event-buttons.html +++ b/src/app/shared/event-buttons/event-buttons.html @@ -1,4 +1,4 @@ -
+
sentiment_satisfied diff --git a/src/app/shared/event-reactions/event-reactions.html b/src/app/shared/event-reactions/event-reactions.html index 45e34c0..c5b5db7 100644 --- a/src/app/shared/event-reactions/event-reactions.html +++ b/src/app/shared/event-reactions/event-reactions.html @@ -1,4 +1,4 @@ -
+
🔁 {{ threadEntry?.boosts }} {{ item.key }} {{ item.value }}
diff --git a/src/app/shared/event-thread/event-thread.html b/src/app/shared/event-thread/event-thread.html index 61a850f..544baf4 100644 --- a/src/app/shared/event-thread/event-thread.html +++ b/src/app/shared/event-thread/event-thread.html @@ -1,10 +1,10 @@ -
+
{{ event.created_at | ago }}
- + diff --git a/src/app/user/user.ts b/src/app/user/user.ts index fc5f3bb..a53de03 100644 --- a/src/app/user/user.ts +++ b/src/app/user/user.ts @@ -381,13 +381,13 @@ export class UserComponent { activeOptions() { let options = ''; - if (this.options.options.hideSpam) { + if (this.options.values.hideSpam) { options += ' Spam: Filtered'; } else { options += ' Spam: Allowed'; } - if (this.options.options.hideInvoice) { + if (this.options.values.hideInvoice) { options += ' Invoices: Hidden'; } else { options += ' Invoices: Displayed';