Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Prevent a sync request from removing a user's busy presence status #12213

Merged
merged 21 commits into from
Apr 13, 2022
Merged

Prevent a sync request from removing a user's busy presence status #12213

merged 21 commits into from
Apr 13, 2022

Commits on Mar 11, 2022

  1. Prevent a sync request from removing a user's busy presence status 

    In trying to use the MSC3026 busy presence status, the user's status
would be set back to 'online' next time they synced. The change makes
it so that sycning does not affect a user's presence status if it
is currently set to 'busy': it must be removed through the presence
API.

The MSC defers to implementations on the behaviour of busy presence,
so I think this remains compatible with the MSC.
    @dbkr
    dbkr committed Mar 11, 2022
    Configuration menu
    Copy the full SHA
    dce7bf8 View commit details
    Browse the repository at this point in the history

  2. I guessed wrong

    @dbkr
    dbkr committed Mar 11, 2022
    Configuration menu
    Copy the full SHA
    e029284 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2022

  1. Add new arg to docstring

    @dbkr
    dbkr committed Apr 5, 2022
    Configuration menu
    Copy the full SHA
    68dfb7e View commit details
    Browse the repository at this point in the history

  2. Remove ignore_status_msg from _serialize_payload too

    @dbkr
    dbkr committed Apr 5, 2022
    Configuration menu
    Copy the full SHA
    0fb0e4d View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2022

  1. Set presence in worker user_syncing

    @dbkr
    dbkr committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    9beae07 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into dbkr/sync_dont_cle… 

    …ar_busy_presence
    @dbkr
    dbkr committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    5863b7a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into dbkr/sync_dont_clear_busy_presence

    @dbkr
    dbkr committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    25d46be View commit details
    Browse the repository at this point in the history

  4. Await on set_state

    @dbkr
    dbkr committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    9098c9d View commit details
    Browse the repository at this point in the history

  5. Remove redundant check

    @dbkr
    dbkr committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    53d2fa4 View commit details
    Browse the repository at this point in the history

  6. Put ignore_status_msg back and use it in the worker user_syncing method

    @dbkr
    dbkr committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    b2a44ac View commit details
    Browse the repository at this point in the history

  7. Make non-worker behaviour match old behaviour 

    re-adding previous case where it didn't set last_active_ts unless
the previous state was offline. I have made it set the presence
state in other cases as that looked like a bug.
    @dbkr
    dbkr committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    920fddf View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2022

  1. Use ste_state in both places so behaviour is consistent

    @dbkr
    dbkr committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    f5119b4 View commit details
    Browse the repository at this point in the history

  2. Forgot to get the state member

    @dbkr
    dbkr committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    2d2f774 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2022

  1. Rearrange to hopefully be easier to understand

    @dbkr
    dbkr committed Apr 11, 2022
    Configuration menu
    Copy the full SHA
    e7093fa View commit details
    Browse the repository at this point in the history

  2. Take a copy of the previous state before we start messing with it

    @dbkr
    dbkr committed Apr 11, 2022
    Configuration menu
    Copy the full SHA
    0a7b3f8 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2022

  1. Update prev_state using the proper function

    @dbkr
    dbkr committed Apr 13, 2022
    Configuration menu
    Copy the full SHA
    bd932fc View commit details
    Browse the repository at this point in the history

  2. Add comment

    @dbkr
    dbkr committed Apr 13, 2022
    Configuration menu
    Copy the full SHA
    6d6b88e View commit details
    Browse the repository at this point in the history

  3. Revert presence_state setting 

    We can only get here if presence_state is OFFLINE, which is never, given the current implementations of SyncRestServlet.on_GET and EventStreamHandler.get_stream

Co-authored-by: Sean Quah <8349537+squahtx@users.noreply.github.com>
    @dbkr @squahtx
    dbkr and squahtx committed Apr 13, 2022
    Configuration menu
    Copy the full SHA
    e50a0a1 View commit details
    Browse the repository at this point in the history

  4. Revert unnecessary comma change 

    Co-authored-by: Sean Quah <8349537+squahtx@users.noreply.github.com>
    @dbkr @squahtx
    dbkr and squahtx committed Apr 13, 2022
    Configuration menu
    Copy the full SHA
    edcdfed View commit details
    Browse the repository at this point in the history

  5. Add comment on set_state's updating of last_active_ts

    @dbkr
    dbkr committed Apr 13, 2022
    Configuration menu
    Copy the full SHA
    31d3060 View commit details
    Browse the repository at this point in the history

  6. Put comment in the right place 

    Co-authored-by: Sean Quah <8349537+squahtx@users.noreply.github.com>
    @dbkr @squahtx
    dbkr and squahtx committed Apr 13, 2022
    Configuration menu
    Copy the full SHA
    9e8ef0f View commit details
    Browse the repository at this point in the history