mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-10-28 21:12:25 -05:00
[bugfix] Fix failure to look up remote profiles with duplicate emojis in some cases (#1534)
* Tidy up emoji parsing on profile submission Don't bother reparsing for emoji unless one of the fields that can have emoji in it has changed. Deduplicate emoji between the display name and profile note - I'm not sure whether this was hurting anything, but better safe. * Deduplicate emoji when parsing remote accounts Some servers - Misskey at least - don't deduplicate emoji, so it's possible to get an account which has the same emoji used in both the display name and note and therefore includes that emoji twice in its metadata. When we start trying to put those into our database, we run into a uniqueness constraint and fall over. This change just deduplicates at the point of construction of an account.
This commit is contained in:
parent
2af33d3fb5
commit
f559d46261
2 changed files with 37 additions and 25 deletions
|
|
@ -453,6 +453,7 @@ func ExtractHashtag(i Hashtaggable) (*gtsmodel.Tag, error) {
|
|||
// ExtractEmojis returns a slice of emojis on the interface.
|
||||
func ExtractEmojis(i WithTag) ([]*gtsmodel.Emoji, error) {
|
||||
emojis := []*gtsmodel.Emoji{}
|
||||
emojiMap := make(map[string]*gtsmodel.Emoji)
|
||||
tagsProp := i.GetActivityStreamsTag()
|
||||
if tagsProp == nil {
|
||||
return emojis, nil
|
||||
|
|
@ -477,6 +478,9 @@ func ExtractEmojis(i WithTag) ([]*gtsmodel.Emoji, error) {
|
|||
continue
|
||||
}
|
||||
|
||||
emojiMap[emoji.URI] = emoji
|
||||
}
|
||||
for _, emoji := range emojiMap {
|
||||
emojis = append(emojis, emoji)
|
||||
}
|
||||
return emojis, nil
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue