From af49467e83c073de9d8613facfc833d0912945ef Mon Sep 17 00:00:00 2001
From: Caesar Schinas <caesar@caesarschinas.com>
Date: Mon, 19 Dec 2022 00:05:51 -1000
Subject: [PATCH] [BRANDING] Add `forgejo` emoji

(cherry picked from commit ade55ad308ea0ac6bb36903e3a69b02d18228adb)
(cherry picked from commit 107f7266183584b51299351961b73ab2b185f24b)
(cherry picked from commit f29cf9cfc107692cd79a4ba4062a66f90813bc4e)
(cherry picked from commit 0761a41eee30a32c822834ca2b989ad6343ed1e0)
(cherry picked from commit 2b1fd9565f615dde8bdd07d86ff3a5ca3815af67)
(cherry picked from commit 6a7c82f13b17df1fa647130d086fbcdbeb086571)
(cherry picked from commit 4a56d404942562e3f5a45abd45518bc8679109b6)
(cherry picked from commit b48e3e896d0d3942362b5a1c18f847ffd64609cb)
(cherry picked from commit bde83340cbcce8370d524da9c909731c78544c49)
(cherry picked from commit 74e0603d6be22d8d74d38f9c99c8bcf26dd83482)
(cherry picked from commit 84bd1ddc082aa55a7d7c03eeac55478f0e15e019)
(cherry picked from commit 62d9acde2a0692f46257dc3db329e0196b74837a)
(cherry picked from commit 5b84a909135a4d71c778a2d0719a20ff01abef64)
(cherry picked from commit 5362f7d053f4e8bd6a91d93ddbcb6d291a250efe)
(cherry picked from commit 65ad7d1bd9875b6dd00f3ef31bc1d5ef2b9e84f5)
(cherry picked from commit 6e42d545a97ef7d470b57f6ae43ae15fa1581a37)
(cherry picked from commit 24d3bb33e2031a44c535602a7a083194acacbff1)
(cherry picked from commit 704935cadd997dcc1dea5e51a089ed25ec1ccab1)
(cherry picked from commit 5d9fc59e17c9be563432376c3b7d1851300ccdac)
(cherry picked from commit 4c95df3f86f9e778a9d1267cdca22c4ce15ffb94)
(cherry picked from commit 1ac704762ac78ba2a86a787f02de45779d765673)
(cherry picked from commit 0da9fb13189b0bff21a734c0f635ec196731a91f)
(cherry picked from commit bc2de51eeffea7fb4c5b53e7a72cab315af8215a)
(cherry picked from commit ea897a20b91e89be48570ca923dcbea1b4baf81e)
(cherry picked from commit 66f3f9c6effd19ca6762437e7756bd3ac564a6f3)
(cherry picked from commit edc5c3c3043867ea01b93f50ca83014592ef89b6)
(cherry picked from commit 11dd4f31a49b5448d4207c928df6be647adf5ce0)
(cherry picked from commit bf0fb77afb91dfff7ba81a59bbf5506a6b0a6462)
(cherry picked from commit 3a823b1001817b906c31453ff86d43ebe6bf9719)
(cherry picked from commit e1f6cb4ed607f17da4bedf36fe60af9d4a492089)
(cherry picked from commit 0b3f45972ff338a00ca084b1c3371714fc1b7011)
(cherry picked from commit a9579c967946436338e44d323db2303f108dbf69)
(cherry picked from commit 0dea1aadf25e120ee1f19ffa6f15caa285ad3c7b)
(cherry picked from commit aeed23b96ee384054068633cb3bae71893d9382c)
(cherry picked from commit 72712f467df8de65955f15457c5845b80c2925e1)
(cherry picked from commit b49b832899b24efc73bbe7f1d7ed3626e5b55434)
(cherry picked from commit a985bb8b902ddcc98d24e6f3078b1e1fee61a1c7)
(cherry picked from commit dac4d692182eb96701c46451f6d5a22966494583)
(cherry picked from commit 4962eb361dea6528b6d36d29e1c27d8e76351ec9)
(cherry picked from commit 61835639c8134b017ee8cf1816315c1536eeedcc)
(cherry picked from commit f4e44e3b602bda4c11150bea1e0e56f75f751398)
(cherry picked from commit 65c5f553c1cd9890de0eae416820dae84ad412a6)

Conflicts:
	modules/setting/ui.go
	https://codeberg.org/forgejo/forgejo/pulls/1976
(cherry picked from commit ef2f0c1c4a00e23579829ee874f80af2a9423c39)
(cherry picked from commit 4c208ef65e9dd65c772d981f165305f2ebd436b2)
(cherry picked from commit 3386a9d6ee8ea4e42faa3d9f1879de66f7f44d39)

Conflicts:
	modules/setting/ui.go
	https://codeberg.org/forgejo/forgejo/pulls/2116
(cherry picked from commit 8f93b38c6636e85151d79647050e8731f0cb07a9)
---
 modules/setting/ui.go               |   4 ++--
 public/assets/img/emoji/forgejo.png | Bin 0 -> 3189 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 public/assets/img/emoji/forgejo.png

diff --git a/modules/setting/ui.go b/modules/setting/ui.go
index 2f9eef93c3..8021aa1ad6 100644
--- a/modules/setting/ui.go
+++ b/modules/setting/ui.go
@@ -84,8 +84,8 @@ var UI = struct {
 	DefaultTheme:            `gitea-auto`,
 	Themes:                  []string{`gitea-auto`, `gitea-light`, `gitea-dark`},
 	Reactions:               []string{`+1`, `-1`, `laugh`, `hooray`, `confused`, `heart`, `rocket`, `eyes`},
-	CustomEmojis:            []string{`git`, `gitea`, `codeberg`, `gitlab`, `github`, `gogs`},
-	CustomEmojisMap:         map[string]string{"git": ":git:", "gitea": ":gitea:", "codeberg": ":codeberg:", "gitlab": ":gitlab:", "github": ":github:", "gogs": ":gogs:"},
+	CustomEmojis:            []string{`git`, `gitea`, `codeberg`, `gitlab`, `github`, `gogs`, `forgejo`},
+	CustomEmojisMap:         map[string]string{"git": ":git:", "gitea": ":gitea:", "codeberg": ":codeberg:", "gitlab": ":gitlab:", "github": ":github:", "gogs": ":gogs:", "forgejo": ":forgejo:"},
 	PreferredTimestampTense: "mixed",
 
 	AmbiguousUnicodeDetection: true,
diff --git a/public/assets/img/emoji/forgejo.png b/public/assets/img/emoji/forgejo.png
new file mode 100644
index 0000000000000000000000000000000000000000..f335e51dad13df7ceb19701a71f8efe192173286
GIT binary patch
literal 3189
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
I1NZ2E0VOn}g8%>k

literal 0
HcmV?d00001