Refactor more "pull requests" to "pr/issues"

Author: linyinfeng

src/chat/mod.rs

@@ -218,7 +218,7 @@ pub async fn pr_issue_add(
     {
         let mut locked = resources.settings.write().await;
         if locked.pr_issues.contains_key(&id) {
-            return Err(Error::PullRequestExists(id));
+            return Err(Error::PRIssueExists(id));
         }
         locked.pr_issues.insert(id, settings);
     }
@@ -229,7 +229,7 @@ pub async fn pr_issue_remove(resources: &ChatRepoResources, id: u64) -> Result<(
     {
         let mut locked = resources.settings.write().await;
         if !locked.pr_issues.contains_key(&id) {
-            return Err(Error::UnknownPullRequest(id));
+            return Err(Error::UnknownPRIssue(id));
         }
         locked.pr_issues.remove(&id);
     }
@@ -256,7 +256,7 @@ pub async fn pr_issue_check(
             locked
                 .pr_issues
                 .remove(&id)
-                .ok_or(Error::UnknownPullRequest(id))?;
+                .ok_or(Error::UnknownPRIssue(id))?;
         };
         resources.save_settings().await?;
         return Ok(PRIssueCheckResult::Closed);
@@ -268,7 +268,7 @@ pub async fn pr_issue_check(
             locked
                 .pr_issues
                 .remove(&id)
-                .ok_or(Error::UnknownPullRequest(id))?
+                .ok_or(Error::UnknownPRIssue(id))?
         };
         resources.save_settings().await?;
         let commit = merged_pr_to_commit(resources, github_info, id, settings).await?;

src/chat/settings.rs

@@ -6,7 +6,7 @@ use url::Url;
 
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct ChatRepoSettings {
-    #[serde(default, alias="pull_requests")]
+    #[serde(default, alias = "pull_requests")]
     pub pr_issues: BTreeMap<u64, PRIssueSettings>,
     #[serde(default)]
     pub commits: BTreeMap<String, CommitSettings>,

src/error.rs

@@ -54,16 +54,16 @@ pub enum Error {
     Serde(#[from] serde_json::Error),
     #[error("unknown commit: '{0}'")]
     UnknownCommit(String),
-    #[error("unknown pull request: '{0}'")]
-    UnknownPullRequest(u64),
+    #[error("unknown PR/issue: '{0}'")]
+    UnknownPRIssue(u64),
     #[error("unknown branch: '{0}'")]
     UnknownBranch(String),
     #[error("unknown repository: '{0}'")]
     UnknownRepository(String),
     #[error("commit already exists: '{0}'")]
     CommitExists(String),
-    #[error("pull request already exists: '{0}'")]
-    PullRequestExists(u64),
+    #[error("PR/issue already exists: '{0}'")]
+    PRIssueExists(u64),
     #[error("branch already exists: '{0}'")]
     BranchExists(String),
     #[error("invalid os string: '{0:?}'")]

src/main.rs

@@ -259,14 +259,14 @@ async fn handle_callback_query_command_result(
             resources.save_settings().await?;
         }
         "p" => {
-            let pr_id: u64 = id.parse().map_err(Error::ParseInt)?;
+            let issue_id: u64 = id.parse().map_err(Error::ParseInt)?;
             let resources = chat::resources_chat_repo(chat_id, repo.clone()).await?;
             {
                 let mut settings = resources.settings.write().await;
                 let subscribers = &mut settings
                     .pr_issues
-                    .get_mut(&pr_id)
-                    .ok_or_else(|| Error::UnknownPullRequest(pr_id))?
+                    .get_mut(&issue_id)
+                    .ok_or_else(|| Error::UnknownPRIssue(issue_id))?
                     .notify
                     .subscribers;
                 modify_subscriber_set(subscribers, subscriber, unsubscribe)?;
@@ -416,7 +416,7 @@ async fn list_for_normal(bot: Bot, msg: &Message) -> Result<(), CommandError> {
                 settings.notify.description_markdown()
             ));
         }
-        result.push_str("  *pull requests*:\n");
+        result.push_str("  *PRs/issues*:\n");
         let pr_issues = &settings.pr_issues;
         if pr_issues.is_empty() {
             result.push_str("  \\(nothing\\)\n");
@@ -693,7 +693,7 @@ async fn pr_issue_add(
         Ok(()) => {
             pr_issue_check(bot, msg, repo, id).await?;
         }
-        Err(Error::PullRequestExists(_)) => {
+        Err(Error::PRIssueExists(_)) => {
             pr_issue_subscribe(bot.clone(), msg.clone(), repo.clone(), id, false).await?;
         }
         Err(e) => return Err(e.into()),
@@ -821,7 +821,7 @@ async fn pr_issue_subscribe(
         let subscribers = &mut settings
             .pr_issues
             .get_mut(&pr_id)
-            .ok_or_else(|| Error::UnknownPullRequest(pr_id))?
+            .ok_or_else(|| Error::UnknownPRIssue(pr_id))?
             .notify
             .subscribers;
         modify_subscriber_set(subscribers, subscriber, unsubscribe)?;

src/update.rs

@@ -76,7 +76,7 @@ async fn update_chat_repo(bot: Bot, chat: ChatId, repo: &str) -> Result<(), Comm
     let resources = chat::resources_chat_repo(chat, repo.to_string()).await?;
     let repo_resources = repo::resources(repo).await?;
 
-    // check pull requests before checking commits
+    // check pull requests/issues before checking commits
     let pr_issues = {
         let settings = resources.settings.read().await;
         settings.pr_issues.clone()