Fix GitHub avatars for GitHub Apps

Signed-off-by: magic_rb <richard@brezak.sk>

Author: MagicRB

buildbot_nix/__init__.py

@@ -889,13 +889,15 @@ def configure(self, config: dict[str, Any]) -> None:
                 backend.create_change_hook()
             )
 
-        if "auth" not in config["www"]:
-            config["www"].setdefault("avatar_methods", [])
+        config["www"].setdefault("avatar_methods", [])
+
+        for backend in backends.values():
+            avatar_method = backend.create_avatar_method()
+            print(avatar_method)
+            if avatar_method is not None:
+                config["www"]["avatar_methods"].append(avatar_method)
 
-            for backend in backends.values():
-                avatar_method = backend.create_avatar_method()
-                if avatar_method is not None:
-                    config["www"]["avatar_methods"].append(avatar_method)
+        if "auth" not in config["www"]:
             # TODO one cannot have multiple auth backends...
             if auth is not None:
                 config["www"]["auth"] = auth

buildbot_nix/github_projects.py

@@ -533,7 +533,22 @@ def create_change_hook(self) -> dict[str, Any]:
         }
 
     def create_avatar_method(self) -> AvatarBase | None:
-        return AvatarGitHub(token=self.auth_backend.get_general_token().get())
+        avatar = AvatarGitHub(token=self.auth_backend.get_general_token().get())
+
+        # TODO: not a proper fix, the /users/{username} endpoint is per installation, but I'm not sure
+        # how to tell which installation token to use, unless there is a way to build a huge map of
+        # username -> token, or we just try each one in order
+        def _get_avatar_by_username(self: Any, username: Any) -> Any:
+            return f"https://github.com/{username}.png"
+
+        import types
+
+        avatar._get_avatar_by_username = types.MethodType(  # noqa: SLF001
+            _get_avatar_by_username,
+            avatar,
+        )
+
+        return avatar
 
     def create_auth(self) -> AuthBase:
         assert self.config.oauth_id is not None, "GitHub OAuth ID is required"