Skip to content

fix(player): send trakt events on Load/Unload for current Selected streams #911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elpiel wants to merge 1 commit into
base: development
Choose a base branch
from
Open

fix(player): send trakt events on Load/Unload for current Selected streams #911

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions src/models/player.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,15 @@ impl<E: Env + 'static> UpdateWithCtx<E> for Player {
fn update(&mut self, msg: &Msg, ctx: &Ctx) -> Effects {
match msg {
Msg::Action(Action::Load(ActionLoad::Player(selected))) => {
// make sure we send the correct Trakt event if the model hasn't been unloaded
let trakt_event_effects = if self.selected.is_some() {
Effects::msg(Msg::Event(Event::TraktPaused {
context: self.analytics_context.as_ref().cloned().unwrap_or_default(),
}))
.unchanged()
} else {
Effects::none().unchanged()
};
let item_state_update_effects = if self
.selected
.as_ref()
Expand Down Expand Up @@ -283,7 +292,8 @@ impl<E: Env + 'static> UpdateWithCtx<E> for Player {
self.loaded = false;
self.ended = false;
self.paused = None;
item_state_update_effects
trakt_event_effects
.join(item_state_update_effects)
.join(selected_effects)
.join(meta_item_effects)
.join(stream_state_effects)
Expand All @@ -303,6 +313,15 @@ impl<E: Env + 'static> UpdateWithCtx<E> for Player {
.join(notification_effects)
}
Msg::Action(Action::Unload) => {
let trakt_event_effects = if self.selected.is_some() {
Effects::msg(Msg::Event(Event::TraktPaused {
context: self.analytics_context.as_ref().cloned().unwrap_or_default(),
}))
.unchanged()
} else {
Effects::none().unchanged()
};

let ended_effects = if !self.ended && self.selected.is_some() {
Effects::msg(Msg::Event(Event::PlayerStopped {
context: self.analytics_context.as_ref().cloned().unwrap_or_default(),
Expand Down Expand Up @@ -350,7 +369,8 @@ impl<E: Env + 'static> UpdateWithCtx<E> for Player {
self.ended = false;
self.paused = None;

seek_history_effects
trakt_event_effects
.join(seek_history_effects)
.join(item_state_update_effects)
.join(push_to_library_effects)
.join(selected_effects)
Expand Down