From 33ca5513ada0e21c41e6fe13866b4f5ae961f670 Mon Sep 17 00:00:00 2001 From: tsmethurst Date: Tue, 11 Jan 2022 17:51:45 +0100 Subject: [PATCH] pin instanceAccountID to in-process emoji --- internal/media/processingemoji.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/internal/media/processingemoji.go b/internal/media/processingemoji.go index 7e2d4f31f..41754830f 100644 --- a/internal/media/processingemoji.go +++ b/internal/media/processingemoji.go @@ -37,6 +37,9 @@ type ProcessingEmoji struct { mu sync.Mutex + // id of this instance's account -- pinned for convenience here so we only need to fetch it once + instanceAccountID string + /* below fields should be set on newly created media; emoji will be updated incrementally as media goes through processing @@ -370,12 +373,13 @@ func (m *manager) preProcessEmoji(ctx context.Context, data DataFunc, shortcode } processingEmoji := &ProcessingEmoji{ - emoji: emoji, - data: data, - staticState: received, - fullSizeState: received, - database: m.db, - storage: m.storage, + instanceAccountID: instanceAccount.ID, + emoji: emoji, + data: data, + staticState: received, + fullSizeState: received, + database: m.db, + storage: m.storage, } return processingEmoji, nil