update list stuff

lists/holoen.txt

@@ -1,3 +1,5 @@
+# https://twitter.com/i/lists/1339605775807864832
+
 # ----- hololive EN  -----
 
 # --- [Myth] ---

lists/holoid.txt

@@ -0,0 +1,18 @@
+# https://twitter.com/i/lists/1557912878656929792
+
+# ----- hololive ID  -----
+
+# --- [Gen 1] ---
+ayunda_risu 1234752200145899520
+moonahoshinova 1234753886520393729
+airaniiofifteen 1235180878449397764
+
+# --- [Gen 2] ---
+pavoliareine 1328275136575799297
+kureijiollie 1328277233492844544
+anyamelfissa 1328277750000492545
+
+# --- [Gen 3] ---
+kobokanaeru 1486629076005634049
+vestiazeta 1486633489101307907
+kaelakovalskia 1486636197908602880

lists/nijien.txt

@@ -1,3 +1,5 @@
+# https://twitter.com/i/lists/1415262975435231235
+
 # ----- [NIJISANJI EN] -----
 
 # --- [Lazulight] ---
@@ -38,5 +40,9 @@ KyoKanek0 1545552756773208066
 AiaAmare 1545562635650957312
 RenZott0 1546328834559340544
 
+# --- [ALTS] ---
+3W1W4 1507066475638673422
+RyuguFinana 1506863869901168642
+
 # --- [STAFF] ---
 NIJISANJI_World 1214737620749578240

lists/nijiexid.txt

@@ -0,0 +1,31 @@
+# https://twitter.com/i/lists/1431602917857923075
+
+# ----- [NIJISANJI ex-ID] -----
+
+ZEA_Cornelia 1165866976192823297
+Hana_Macchia 1165866977472024576
+Taka_Radjiman 1165866977715347456
+MiyuOttavia 1205742630467801088
+RiksaDhirendra 1205743596785127424
+Rai_Galilei 1205744131294654466
+AmiciaMichella 1205744430386315265
+Azura_Cecillia 1237600624646078464
+Nara_Haramaung 1237603606448058371
+LaylaAlstro2434 1237613895675596800
+bobon_pranaja 1290243278814683137
+Etna_Crimson 1290243331629318144
+SiskaLeontyne 1290243510193369089
+DeremKado 1323147415168323586
+NagisaArcinia 1323147843398324225
+RezaAvanluna 1323147856828510208
+HyonaElatiora 1414845791944937476
+Xia_Ekavira 1414845844692504611
+MikaMelatika 1414849131655450626
+
+# --- [ALTS] ---
+HanaMacchia2 1405494022446010375
+
+# --- [STAFF] ---
+NIJISANJI_ID 1152523848060850177
+
+

src/catchup.py

@@ -52,6 +52,6 @@ async def run():
     # ttweet = tt.TalentTweet.deserialize(serialized_ttweet)
     # print(ttweet)
 
-    ttweet = tt.TalentAPITweet(1573563417415233536)
+    ttweet = tt.TalentAPITweet(1557021645331542016)
     print(ttweet)
-    # await TwAPI.instance.create_post(ttweet)
+    await TwAPI.instance.create_post(ttweet)

src/talent_lists.py

@@ -1,7 +1,9 @@
 import util
 
-niji_en = dict()
 holo_en = dict()
+holo_id = dict()
+niji_en = dict()
+niji_exid = dict()
 talents = dict()
 
 def __create_dict(file, _dict):
@@ -14,10 +16,17 @@ def __create_dict(file, _dict):
                 _dict[int(id)] = name
                 talents[int(id)] = name
 def init():
-    global niji_en
     global holo_en
+    global holo_id
+    global niji_en
+    global niji_exid
 
     # holoEN
     __create_dict(f'{util.get_project_dir()}/lists/holoen.txt', holo_en)
+    # holoID
+    __create_dict(f'{util.get_project_dir()}/lists/holoid.txt', holo_id)
     # nijiEN
     __create_dict(f'{util.get_project_dir()}/lists/nijien.txt', niji_en)
+    # nijiexID
+    __create_dict(f'{util.get_project_dir()}/lists/nijiexid.txt', niji_exid)
+

src/talenttweet.py

@@ -87,14 +87,19 @@ class TalentTweet:
         return s[:-1]
 
     def is_cross_company(self):
-        # TODO: update for EN/ID
         for other_id in self.all_parties:
-            if self.author_id in talent_lists.niji_en:
-                if other_id in talent_lists.holo_en:
+            if self.author_id in talent_lists.holo_en:
+                if other_id in talent_lists.niji_en or other_id in talent_lists.niji_exid:
                     return True
-            elif self.author_id in talent_lists.holo_en:
+            if self.author_id in talent_lists.niji_en:
+                if other_id in talent_lists.holo_en or other_id in talent_lists.holo_id:
+                    return True
+            if self.author_id in talent_lists.holo_id:
                 if other_id in talent_lists.niji_en:
                     return True
+            if self.author_id in talent_lists.niji_exid:
+                if other_id in talent_lists.holo_en:
+                    return True
         return False
     
     def get_all_parties_usernames(self):