fix forgejo

Author: thehighestmath

src/ForgejoRepoAPI.py

@@ -275,7 +275,7 @@ def get_workflow_runs(self, repo) -> list[WorkflowRun]:
         return []
 
     def get_base_url(self) -> str:
-        return self.client.base_url
+        return self.client._client_wrapper.get_base_url()
 
 
 # Точка входа для тестирования

src/git_logger.py

@@ -88,39 +88,32 @@ def get_next_binded_repo(clients: Clients, repositories: list[str]):
 def get_assignee_story(git_object, client, token, repository):
     assignee_result = ""
 
-    try:
-        repo_owner = repository.owner.login
-        repo_name = repository.name
-        issue_index = git_object._id  # Для pull request и issue одинаково
-
-        base_url = client.get_base_url().rstrip('/')
-
-        url = f"{base_url}/repos/{repo_owner}/{repo_name}/issues/{issue_index}/timeline"
-        headers = {
-            "Authorization": f"Bearer {token}" if client is GitHubRepoAPI else f"token {token}",
-            "Accept": "application/json"
-        }
-
-        response = requests.get(url, headers=headers)
-        if response.status_code != 200:
-            raise Exception(f"Failed to fetch issue timeline: {response.status_code}, {response.text}")
-
-        events = response.json()
-
-        for event in events:
-            if event.get('event') in ["assigned", "unassigned"]:
-                date = event.get('created_at')
-                assigner = event.get('actor', {}).get('login', 'unknown')
-                assignee = event.get('assignee', {}).get('login', 'unknown')
-
-                assignee_result += f"{date}: {assigner} -"
-                if event['event'] == "unassigned":
-                    assignee_result += "/"
-                assignee_result += f"> {assignee}; "
-
-                sleep(TIMEDELTA)
-
-    except Exception as e:
-        print(f"get_assignee_story(): error {e}")
+    repo_owner = repository.owner.login
+    repo_name = repository.name
+    issue_index = getattr(git_object, "number", None) or getattr(git_object, "index", None) or getattr(git_object, "_id", None)  # Для pull request и issue одинаково
+    print(issue_index)
+
+    base_url = client.get_base_url().rstrip('/')
+
+    url = f"{base_url}/repos/{repo_owner}/{repo_name}/issues/{issue_index}/timeline"
+    headers = {
+        "Authorization": f"Bearer {token}" if client is GitHubRepoAPI else f"token {token}",
+        "Accept": "application/json"
+    }
+
+    response = requests.get(url, headers=headers)
+    if response.status_code != 200:
+        raise Exception(f"Failed to fetch issue timeline: {response.status_code}, {response.text}")
+
+    events = response.json()
+
+    results = [
+        f"{event.get('created_at')}: {event.get('actor', {}).get('login', 'unknown')} -"
+        + ("/" if event.get('event') == "unassigned" else "")
+        + f"> {event.get('assignee', {}).get('login', 'unknown')}; "
+        for event in events 
+        if event.get('event') in ["assigned", "unassigned"]
+    ]
+    assignee_result = ''.join(results)
 
     return assignee_result