Merge branch 'develop' into feature/custom-folder

Author: LonoxX

src/file-manager.ts

@@ -78,14 +78,93 @@ export class FileManager {
 	}
 
 	public filterIssues(repo: RepositoryTracking, issues: any[]): any[] {
-		return issues;
+		let filteredIssues = issues;
+
+		// Apply label filtering
+		if ((repo.enableLabelFilter ?? false) && (repo.labelFilters?.length ?? 0) > 0) {
+			filteredIssues = this.applyLabelFilter(filteredIssues, repo.labelFilterMode ?? "include", repo.labelFilters ?? []);
+		}
+
+		// Apply assignee filtering
+		if ((repo.enableAssigneeFilter ?? false)) {
+			filteredIssues = this.applyAssigneeFilter(filteredIssues, repo.assigneeFilterMode ?? "assigned-to-me", repo.assigneeFilters ?? []);
+		}
+
+		return filteredIssues;
+	}
+
+	private applyLabelFilter(items: any[], filterMode: "include" | "exclude", labelFilters: string[]): any[] {
+		return items.filter((item) => {
+			if (!item.labels || !Array.isArray(item.labels)) {
+				// If no labels, only include in "exclude" mode (since we're excluding specific labels)
+				return filterMode === "exclude";
+			}
+
+			const itemLabels = item.labels.map((label: any) =>
+				typeof label === 'string' ? label : label.name
+			);
+
+			const hasMatchingLabel = labelFilters.some(filterLabel =>
+				itemLabels.includes(filterLabel)
+			);
+
+			// Include mode: only include items that have at least one of the specified labels
+			// Exclude mode: exclude items that have any of the specified labels
+			return filterMode === "include" ? hasMatchingLabel : !hasMatchingLabel;
+		});
+	}
+
+	private applyAssigneeFilter(items: any[], filterMode: "assigned-to-me" | "assigned-to-specific" | "unassigned" | "any-assigned", assigneeFilters: string[]): any[] {
+		return items.filter((item) => {
+			const assignees = item.assignees || [];
+			const assigneeUsernames = assignees.map((assignee: any) => assignee.login || assignee);
+
+			switch (filterMode) {
+				case "assigned-to-me":
+					// Get current user from the item's context or use a stored current user
+					const currentUser = this.getCurrentUser();
+					return assigneeUsernames.includes(currentUser);
+
+				case "assigned-to-specific":
+					// Check if any of the specified assignees are assigned
+					return assigneeFilters.some(filterUser => assigneeUsernames.includes(filterUser));
+
+				case "unassigned":
+					// Only include items with no assignees
+					return assigneeUsernames.length === 0;
+
+				case "any-assigned":
+					// Only include items that have at least one assignee
+					return assigneeUsernames.length > 0;
+
+				default:
+					return true;
+			}
+		});
+	}
+
+	private getCurrentUser(): string {
+		// Access the current user from the GitHubClient through the main plugin
+		return this.gitHubClient ? this.gitHubClient.getCurrentUser() : "";
 	}
 
 	public filterPullRequests(
 		repo: RepositoryTracking,
 		pullRequests: any[],
 	): any[] {
-		return pullRequests;
+		let filteredPullRequests = pullRequests;
+
+		// Apply label filtering
+		if ((repo.enablePrLabelFilter ?? false) && (repo.prLabelFilters?.length ?? 0) > 0) {
+			filteredPullRequests = this.applyLabelFilter(filteredPullRequests, repo.prLabelFilterMode ?? "include", repo.prLabelFilters ?? []);
+		}
+
+		// Apply assignee filtering
+		if ((repo.enablePrAssigneeFilter ?? false)) {
+			filteredPullRequests = this.applyAssigneeFilter(filteredPullRequests, repo.prAssigneeFilterMode ?? "assigned-to-me", repo.prAssigneeFilters ?? []);
+		}
+
+		return filteredPullRequests;
 	}
 
 	public async cleanupEmptyFolders(): Promise<void> {
@@ -274,11 +353,20 @@ export class FileManager {
 		const file = this.app.vault.getAbstractFileByPath(`${issueFolderPath}/${fileName}`);
 
 		const [owner, repoName] = repo.repository.split("/");
-		const comments = await this.gitHubClient.fetchIssueComments(
-			owner,
-			repoName,
-			issue.number,
-		);
+
+		// Only fetch comments if they should be included
+		let comments: any[] = [];
+		if (repo.includeIssueComments) {
+			comments = await this.gitHubClient.fetchIssueComments(
+				owner,
+				repoName,
+				issue.number,
+			);
+		} else {
+			this.noticeManager.debug(
+				`Skipping comments for issue ${issue.number}: repository setting disabled`,
+			);
+		}
 
 		let content = this.createIssueContent(issue, repo, comments);
 
@@ -366,11 +454,20 @@ export class FileManager {
 		const file = this.app.vault.getAbstractFileByPath(`${pullRequestFolderPath}/${fileName}`);
 
 		const [owner, repoName] = repo.repository.split("/");
-		const comments = await this.gitHubClient.fetchPullRequestComments(
-			owner,
-			repoName,
-			pr.number,
-		);
+
+		// Only fetch comments if they should be included
+		let comments: any[] = [];
+		if (repo.includePullRequestComments) {
+			comments = await this.gitHubClient.fetchPullRequestComments(
+				owner,
+				repoName,
+				pr.number,
+			);
+		} else {
+			this.noticeManager.debug(
+				`Skipping comments for PR ${pr.number}: repository setting disabled`,
+			);
+		}
 
 		let content = this.createPullRequestContent(pr, repo, comments);
 

src/github-client.ts

@@ -4,6 +4,7 @@ import { NoticeManager } from "./notice-manager";
 
 export class GitHubClient {
 	private octokit: Octokit | null = null;
+	private currentUser: string = "";
 
 	constructor(
 		private settings: GitHubTrackerSettings,
@@ -54,7 +55,8 @@ export class GitHubClient {
 
 		try {
 			const response = await this.octokit.rest.users.getAuthenticated();
-			return response.data.login;
+			this.currentUser = response.data.login;
+			return this.currentUser;
 		} catch (error) {
 			this.noticeManager.error(
 				"Error fetching authenticated user",
@@ -64,6 +66,13 @@ export class GitHubClient {
 		}
 	}
 
+	/**
+	 * Get the currently cached authenticated user
+	 */
+	public getCurrentUser(): string {
+		return this.currentUser;
+	}
+
 	/**
 	 * Fetch issues for a repository
 	 */
@@ -403,7 +412,158 @@ export class GitHubClient {
 		}
 	}
 
+	/**
+	 * Fetch labels for a repository
+	 */
+	public async fetchRepositoryLabels(
+		owner: string,
+		repo: string,
+	): Promise<any[]> {
+		if (!this.octokit) {
+			return [];
+		}
+
+		try {
+			let allLabels: any[] = [];
+			let page = 1;
+			let hasMorePages = true;
+
+			while (hasMorePages) {
+				const response = await this.octokit.rest.issues.listLabelsForRepo({
+					owner,
+					repo,
+					per_page: 100,
+					page,
+				});
+
+				allLabels = [...allLabels, ...response.data];
+				hasMorePages = response.data.length === 100;
+				page++;
+			}
+
+			this.noticeManager.debug(
+				`Fetched ${allLabels.length} labels for ${owner}/${repo}`,
+			);
+			return allLabels;
+		} catch (error) {
+			this.noticeManager.error(
+				`Error fetching labels for ${owner}/${repo}`,
+				error,
+			);
+			return [];
+		}
+	}
+
+	/**
+	 * Fetch repository collaborators/contributors
+	 */
+	public async fetchRepositoryCollaborators(
+		owner: string,
+		repo: string,
+	): Promise<any[]> {
+		if (!this.octokit) {
+			return [];
+		}
+
+		try {
+			let allCollaborators: any[] = [];
+			let page = 1;
+			let hasMorePages = true;
+
+			while (hasMorePages) {
+				const response = await this.octokit.rest.repos.listCollaborators({
+					owner,
+					repo,
+					per_page: 100,
+					page,
+				});
+
+				allCollaborators = [...allCollaborators, ...response.data];
+				hasMorePages = response.data.length === 100;
+				page++;
+			}
+
+			this.noticeManager.debug(
+				`Fetched ${allCollaborators.length} collaborators for ${owner}/${repo}`,
+			);
+			return allCollaborators;
+		} catch (error) {
+			// If collaborators endpoint fails (permissions), try contributors as fallback
+			try {
+				let allContributors: any[] = [];
+				let page = 1;
+				let hasMorePages = true;
+
+				while (hasMorePages) {
+					const response = await this.octokit.rest.repos.listContributors({
+						owner,
+						repo,
+						per_page: 100,
+						page,
+					});
+
+					allContributors = [...allContributors, ...response.data];
+					hasMorePages = response.data.length === 100;
+					page++;
+				}
+
+				this.noticeManager.debug(
+					`Fetched ${allContributors.length} contributors for ${owner}/${repo} (fallback)`,
+				);
+				return allContributors;
+			} catch (fallbackError) {
+				this.noticeManager.error(
+					`Error fetching collaborators/contributors for ${owner}/${repo}`,
+					fallbackError,
+				);
+				return [];
+			}
+		}
+	}
+
+	/**
+	 * Validate the GitHub token and get its scopes
+	 */
+	public async validateToken(): Promise<{ valid: boolean; scopes: string[]; user?: string }> {
+		if (!this.octokit) {
+			return { valid: false, scopes: [] };
+		}
+
+		try {
+			const response = await this.octokit.rest.users.getAuthenticated();
+			const scopes = response.headers['x-oauth-scopes']?.split(', ') || [];
+			return {
+				valid: true,
+				scopes,
+				user: response.data.login
+			};
+		} catch (error) {
+			return { valid: false, scopes: [] };
+		}
+	}
+
+	/**
+	 * Get current rate limit information
+	 */
+	public async getRateLimit(): Promise<{ remaining: number; limit: number; reset: Date } | null> {
+		if (!this.octokit) {
+			return null;
+		}
+
+		try {
+			const response = await this.octokit.rest.rateLimit.get();
+			return {
+				remaining: response.data.rate.remaining,
+				limit: response.data.rate.limit,
+				reset: new Date(response.data.rate.reset * 1000)
+			};
+		} catch (error) {
+			return null;
+		}
+	}
+
 	public dispose(): void {
 		this.octokit = null;
+		this.currentUser = "";
 	}
 }