Merge branch 'main' of gitlab.com:bashrc2/epicyon

content.py

@@ -1397,6 +1397,7 @@ def bold_reading_string(text: str) -> str:
 
 def import_emoji(base_dir: str, import_filename: str, session) -> None:
     """Imports emoji from the given filename
+    Each line should be [emoji url], :emojiname:
     """
     if not os.path.isfile(import_filename):
         return

emoji/default_emoji.json

@@ -2661,5 +2661,167 @@
   "youtube": "youtube",
   "yvespray": "yvespray",
   "zcash": "zcash",
-  "zec": "zec"
+  "zec": "zec",
+  "100_valid": "100_valid",
+  "Bmo": "Bmo",
+  "HappyTurtle": "HappyTurtle",
+  "Mimikyu": "Mimikyu",
+  "QueerRaccoon_BlackTrans": "QueerRaccoon_BlackTrans",
+  "YeeHaw": "YeeHaw",
+  "_earth": "_earth",
+  "_gayheart2": "_gayheart2",
+  "aaaa": "aaaa",
+  "aaaa_trans": "aaaa_trans",
+  "ablobmeltsoblove": "ablobmeltsoblove",
+  "ablobsadpats": "ablobsadpats",
+  "abunhdhappy": "abunhdhappy",
+  "acab": "acab",
+  "activitypub": "activitypub",
+  "afloppy": "afloppy",
+  "anarchism": "anarchism",
+  "anarchistflagblack": "anarchistflagblack",
+  "anarchiststar": "anarchiststar",
+  "anarcho_nihilism": "anarcho_nihilism",
+  "anarchoheart2": "anarchoheart2",
+  "anartrans_symbol": "anartrans_symbol",
+  "anartrans_symbol_black": "anartrans_symbol_black",
+  "anfem": "anfem",
+  "anfem_heart": "anfem_heart",
+  "anqueer": "anqueer",
+  "anticopyright": "anticopyright",
+  "antifa": "antifa",
+  "bancars": "bancars",
+  "better_pride": "better_pride",
+  "black_and_rainbow": "black_and_rainbow",
+  "black_bloc_blob": "black_bloc_blob",
+  "blackcat": "blackcat",
+  "blacker_heart": "blacker_heart",
+  "blob_anar_raccoon": "blob_anar_raccoon",
+  "blob_cat_ohnoes": "blob_cat_ohnoes",
+  "blob_cat_sip": "blob_cat_sip",
+  "blob_pat_anar_raccoon": "blob_pat_anar_raccoon",
+  "blob_raccoon_blueheart": "blob_raccoon_blueheart",
+  "blob_raccoon_coffee": "blob_raccoon_coffee",
+  "blob_raccoon_heart": "blob_raccoon_heart",
+  "blob_raccoon_melt": "blob_raccoon_melt",
+  "blob_raccoon_peek": "blob_raccoon_peek",
+  "blob_raccoon_reach": "blob_raccoon_reach",
+  "blobbigheart": "blobbigheart",
+  "blobboing": "blobboing",
+  "blobbunmelt": "blobbunmelt",
+  "blobcat_sipglare": "blobcat_sipglare",
+  "blobcat_sipsmile": "blobcat_sipsmile",
+  "blobcat_thisisfine": "blobcat_thisisfine",
+  "blobcatcomfaww": "blobcatcomfaww",
+  "blobcatcomfcool": "blobcatcomfcool",
+  "blobcatdisputed": "blobcatdisputed",
+  "blobcatflood": "blobcatflood",
+  "blobcatmelt2": "blobcatmelt2",
+  "blobcatmeltlove": "blobcatmeltlove",
+  "blobcatmmm": "blobcatmmm",
+  "blobcatnight": "blobcatnight",
+  "blobconfused": "blobconfused",
+  "blobdead": "blobdead",
+  "blobgalaxythink": "blobgalaxythink",
+  "blobhug": "blobhug",
+  "blobmeltsoblove": "blobmeltsoblove",
+  "blobmiou": "blobmiou",
+  "blobnomcookie": "blobnomcookie",
+  "bloboro": "bloboro",
+  "blobraccoon": "blobraccoon",
+  "blobraccoon_flamethrower": "blobraccoon_flamethrower",
+  "blobraccoonouin": "blobraccoonouin",
+  "blobraccoonpeekderp": "blobraccoonpeekderp",
+  "blobraccoonpeekderp_lt": "blobraccoonpeekderp_lt",
+  "blobraccoonpeekderp_r": "blobraccoonpeekderp_r",
+  "blobraccoonpeekderp_rt": "blobraccoonpeekderp_rt",
+  "blobwink": "blobwink",
+  "bot": "bot",
+  "bugs": "bugs",
+  "cannabis": "cannabis",
+  "chaos": "chaos",
+  "chaos_pink": "chaos_pink",
+  "circle_aleph": "circle_aleph",
+  "circlea": "circlea",
+  "collar": "collar",
+  "crt_w_prompt": "crt_w_prompt",
+  "diogenes": "diogenes",
+  "ecoanarchism_heart": "ecoanarchism_heart",
+  "egoistball": "egoistball",
+  "facepalm": "facepalm",
+  "fbsdthink": "fbsdthink",
+  "flag_genderflux": "flag_genderflux",
+  "flan_beg": "flan_beg",
+  "flan_think": "flan_think",
+  "florshed": "florshed",
+  "flow_wink": "flow_wink",
+  "fredy_perlman": "fredy_perlman",
+  "fuckterfs": "fuckterfs",
+  "furry_trash": "furry_trash",
+  "gayduck": "gayduck",
+  "girlpower": "girlpower",
+  "goldman": "goldman",
+  "googlegun": "googlegun",
+  "green_anarchy": "green_anarchy",
+  "grraccoon": "grraccoon",
+  "heart_ace2": "heart_ace2",
+  "heart_cyber": "heart_cyber",
+  "heart_demi": "heart_demi",
+  "heart_pan": "heart_pan",
+  "helpme": "helpme",
+  "humanturtle": "humanturtle",
+  "jokerfied": "jokerfied",
+  "jorts": "jorts",
+  "knife_agender": "knife_agender",
+  "knife_bi": "knife_bi",
+  "knife_lgbt": "knife_lgbt",
+  "knife_nb": "knife_nb",
+  "lain": "lain",
+  "lainbear": "lainbear",
+  "lainsip": "lainsip",
+  "lesknife": "lesknife",
+  "leviathan1": "leviathan1",
+  "local_only": "local_only",
+  "meow": "meow",
+  "nb_heart": "nb_heart",
+  "negate": "negate",
+  "netkitty": "netkitty",
+  "neurodiversity": "neurodiversity",
+  "nihilist": "nihilist",
+  "no_vim": "no_vim",
+  "over18": "over18",
+  "pig_cop": "pig_cop",
+  "pika_surpise": "pika_surpise",
+  "pleading": "pleading",
+  "polyamory": "polyamory",
+  "pusheenblob": "pusheenblob",
+  "raddle": "raddle",
+  "rainblob": "rainblob",
+  "real_gun_r": "real_gun_r",
+  "sad_cowblob": "sad_cowblob",
+  "sean_swain": "sean_swain",
+  "sean_swain_head": "sean_swain_head",
+  "sigil": "sigil",
+  "smuglain": "smuglain",
+  "snufkin": "snufkin",
+  "snufkin_away": "snufkin_away",
+  "snufkin_aww": "snufkin_aww",
+  "snufkin_yow": "snufkin_yow",
+  "sparkles_trans": "sparkles_trans",
+  "sq_she_her": "sq_she_her",
+  "sq_they_them": "sq_they_them",
+  "squat": "squat",
+  "stirner": "stirner",
+  "stirner2": "stirner2",
+  "stirnerblob": "stirnerblob",
+  "stirnerdab": "stirnerdab",
+  "stirnerrage": "stirnerrage",
+  "the_good_circle_a": "the_good_circle_a",
+  "thinking_sun": "thinking_sun",
+  "transknife": "transknife",
+  "vaporfish": "vaporfish",
+  "vegan": "vegan",
+  "vegananarchism": "vegananarchism",
+  "wiphala_bolivia": "wiphala_bolivia",
+  "yayblob": "yayblob"
 }