CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-07-06 21:18:58 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

realm_emoji: Fix race while custom emoji are being uploaded.

Browse Source 
During a brief period while a custom emoji is being uploaded, it could
be visible to clients even though it was still in the process of being
uploaded, an operation that can fail.
This commit is contained in:
Tim Abbott 2022-08-09 11:41:50 -07:00
parent 172a166159
commit fe282b343a
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zerver/models.py
View File

@ -1111,7 +1111,17 @@ class RealmEmoji(models.Model):
def get_realm_emoji_dicts(realm: Realm, only_active_emojis: bool = False) -> Dict[str, EmojiInfo]:
query = RealmEmoji.objects.filter(realm=realm).select_related("author")
# RealmEmoji objects with file_name=None are still in the process
# of being uploaded, and we expect to be cleaned up by a
# try/finally block if the upload fails, so it's correct to
# exclude them.
query = (
RealmEmoji.objects.filter(realm=realm)
.exclude(
file_name=None,
)
.select_related("author")
)
if only_active_emojis:
query = query.filter(deactivated=False)
d = {}