From c4a08292ee44bc731ff90bad18a3f37e5ee8ef22 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Mon, 26 Sep 2022 11:56:01 +0200
Subject: [feature] Show + federate emojis in accounts (#837)

* Start adding account emoji

* get emojis serialized + deserialized nicely

* update tests

* set / retrieve emojis on accounts

* show account emojis in web view

* fetch emojis from db based on ids

* fix typo in test

* lint

* fix pg migration

* update tests

* update emoji checking logic

* update comment

* clarify comments + add some spacing

* tidy up loops a lil (thanks kim)
---
 internal/federation/federatingdb/update.go | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'internal/federation/federatingdb/update.go')

diff --git a/internal/federation/federatingdb/update.go b/internal/federation/federatingdb/update.go
index 599544e34..f3a04cbcc 100644
--- a/internal/federation/federatingdb/update.go
+++ b/internal/federation/federatingdb/update.go
@@ -121,7 +121,7 @@ func (f *federatingDB) Update(ctx context.Context, asType vocab.Type) error {
 			return fmt.Errorf("UPDATE: error converting to account: %s", err)
 		}
 
-		if updatedAcct.Domain == config.GetHost() {
+		if updatedAcct.Domain == config.GetHost() || updatedAcct.Domain == config.GetAccountDomain() {
 			// no need to update local accounts
 			// in fact, if we do this will break the shit out of things so do NOT
 			return nil
@@ -136,13 +136,8 @@ func (f *federatingDB) Update(ctx context.Context, asType vocab.Type) error {
 		updatedAcct.ID = requestingAcct.ID
 		updatedAcct.Language = requestingAcct.Language
 
-		// do the update
-		updatedAcct, err = f.db.UpdateAccount(ctx, updatedAcct)
-		if err != nil {
-			return fmt.Errorf("UPDATE: database error inserting updated account: %s", err)
-		}
-
-		// pass to the processor for further processing of eg., avatar/header
+		// pass to the processor for further updating of eg., avatar/header, emojis
+		// the actual db insert/update will take place a bit later
 		f.fedWorker.Queue(messages.FromFederator{
 			APObjectType:     ap.ObjectProfile,
 			APActivityType:   ap.ActivityUpdate,
-- 
cgit v1.2.3