velvox
/
litecord
mirror of https://gitlab.com/litecord/litecord.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix subscription state for new dms

This commit is contained in:
Luna 2021-09-02 00:08:16 -03:00
parent dccd90890d
commit e2ffaa119d
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
litecord/blueprints/dm_channels.py
View File

@ -17,6 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
""" """
from typing import Iterable
from quart import Blueprint, current_app as app, jsonify from quart import Blueprint, current_app as app, jsonify
from logbook import Logger from logbook import Logger
@ -55,6 +57,14 @@ async def _raw_gdm_remove(channel_id, user_id):
) )
async def gdm_pubsub(channel_id: int, recipients: Iterable[int]):
for recipient_id in recipients:
await app.dispatcher.channel.sub_many(
channel_id,
[state.session_id for state in app.state_manager.user_states(recipient_id)],
)
async def gdm_create(user_id, peer_id) -> int: async def gdm_create(user_id, peer_id) -> int:
"""Create a group dm, given two users. """Create a group dm, given two users.
@ -83,8 +93,7 @@ async def gdm_create(user_id, peer_id) -> int:
await _raw_gdm_add(channel_id, user_id) await _raw_gdm_add(channel_id, user_id)
await _raw_gdm_add(channel_id, peer_id) await _raw_gdm_add(channel_id, peer_id)
await app.dispatcher.channel.sub(channel_id, user_id) await gdm_pubsub(channel_id, (user_id, peer_id))
await app.dispatcher.channel.sub(channel_id, peer_id)
chan = await app.storage.get_channel(channel_id) chan = await app.storage.get_channel(channel_id)
await app.dispatcher.channel.dispatch(channel_id, ("CHANNEL_CREATE", chan)) await app.dispatcher.channel.dispatch(channel_id, ("CHANNEL_CREATE", chan))
@ -108,7 +117,7 @@ async def gdm_add_recipient(channel_id: int, peer_id: int, *, user_id=None):
await dispatch_user(peer_id, ("CHANNEL_CREATE", gdm_recipient_view(chan, peer_id))) await dispatch_user(peer_id, ("CHANNEL_CREATE", gdm_recipient_view(chan, peer_id)))
await app.dispatcher.channel.dispatch(channel_id, ("CHANNEL_UPDATE", chan)) await app.dispatcher.channel.dispatch(channel_id, ("CHANNEL_UPDATE", chan))
await app.dispatcher.channel.sub(peer_id) await gdm_pubsub(channel_id, (peer_id,))
if user_id: if user_id:
await send_sys_message(channel_id, MessageType.RECIPIENT_ADD, user_id, peer_id) await send_sys_message(channel_id, MessageType.RECIPIENT_ADD, user_id, peer_id)

4
litecord/blueprints/dms.py
View File

@ -30,7 +30,7 @@ from ..enums import ChannelType
from .auth import token_check from .auth import token_check
from litecord.blueprints.dm_channels import gdm_create, gdm_add_recipient from litecord.blueprints.dm_channels import gdm_create, gdm_add_recipient, gdm_pubsub
from litecord.common.channels import try_dm_state from litecord.common.channels import try_dm_state
log = Logger(__name__) log = Logger(__name__)
@ -73,6 +73,7 @@ async def create_dm(user_id: int, recipient_id: int):
) )
if dm_id: if dm_id:
await gdm_pubsub(dm_id, (user_id, recipient_id))
return await jsonify_dm(dm_id, user_id) return await jsonify_dm(dm_id, user_id)
# if no dm was found, create a new one # if no dm was found, create a new one
@ -105,6 +106,7 @@ async def create_dm(user_id: int, recipient_id: int):
# until the user sends a message. # until the user sends a message.
await try_dm_state(user_id, dm_id) await try_dm_state(user_id, dm_id)
await gdm_pubsub(dm_id, (user_id, recipient_id))
return await jsonify_dm(dm_id, user_id) return await jsonify_dm(dm_id, user_id)