github-monitor 1.9rc1__py3-none-any.whl → 2.3__py3-none-any.whl

github_monitor.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 """
 Author: Michal Szymanski <misiektoja-github@rm-rf.ninja>
-v1.9
+v2.3
 
-OSINT tool implementing real-time tracking of Github users activities including profile and repositories changes:
+OSINT tool implementing real-time tracking of GitHub users activities including profile and repositories changes:
 https://github.com/misiektoja/github_monitor/
 
 Python pip3 requirements:
@@ -16,14 +16,14 @@ tzlocal (optional)
 python-dotenv (optional)
 """
 
-VERSION = "1.9"
+VERSION = "2.3"
 
 # ---------------------------
 # CONFIGURATION SECTION START
 # ---------------------------
 
 CONFIG_BLOCK = """
-# Get your Github personal access token (classic) by visiting:
+# Get your GitHub personal access token (classic) by visiting:
 # https://github.com/settings/apps
 #
 # Then go to: Personal access tokens -> Tokens (classic) -> Generate new token (classic)
@@ -32,18 +32,24 @@ CONFIG_BLOCK = """
 #   - Pass it at runtime with -t / --github-token
 #   - Set it as an environment variable (e.g. export GITHUB_TOKEN=...)
 #   - Add it to ".env" file (GITHUB_TOKEN=...) for persistent use
-# Fallback:
-#   - Hard-code it in the code or config file
+#   - Fallback: hard-code it in the code or config file
 GITHUB_TOKEN = "your_github_classic_personal_access_token"
 
-# The URL of the Github API
+# The URL of the GitHub API
 #
-# For Public Web Github use the default: https://api.github.com
-# For Github Enterprise change to: https://{your_hostname}/api/v3
+# For Public Web GitHub use the default: https://api.github.com
+# For GitHub Enterprise change to: https://{your_hostname}/api/v3
 #
 # Can also be set using the -x flag
 GITHUB_API_URL = "https://api.github.com"
 
+# The base URL of the GitHub web interface
+# Required to check if the profile is public or private
+#
+# For public GitHub use the default: https://github.com
+# For GitHub Enterprise change to: https://{your_hostname}
+GITHUB_HTML_URL = "https://github.com"
+
 # SMTP settings for sending email notifications
 # If left as-is, no notifications will be sent
 #
@@ -70,6 +76,7 @@ EVENT_NOTIFICATION = False
 
 # Whether to send an email when user's repositories change (stargazers, watchers, forks, issues,
 # PRs, description etc., except for update date)
+# Requires TRACK_REPOS_CHANGES to be enabled
 # Can also be enabled via the -q flag
 REPO_NOTIFICATION = False
 
@@ -77,6 +84,11 @@ REPO_NOTIFICATION = False
 # Can also be enabled via the -u flag
 REPO_UPDATE_DATE_NOTIFICATION = False
 
+# Whether to send an email when user's daily contributions count changes
+# Requires TRACK_CONTRIB_CHANGES to be enabled
+# Can also be enabled via the -y flag
+CONTRIB_NOTIFICATION = False
+
 # Whether to send an email on errors
 # Can also be disabled via the -e flag
 ERROR_NOTIFICATION = True
@@ -85,7 +97,7 @@ ERROR_NOTIFICATION = True
 # Can also be set using the -c flag
 GITHUB_CHECK_INTERVAL = 1800  # 30 mins
 
-# Set your local time zone so that Github API timestamps are converted accordingly (e.g. 'Europe/Warsaw')
+# Set your local time zone so that GitHub API timestamps are converted accordingly (e.g. 'Europe/Warsaw')
 # Use this command to list all time zones supported by pytz:
 #   python3 -c "import pytz; print('\\n'.join(pytz.all_timezones))"
 # If set to 'Auto', the tool will try to detect your local time zone automatically (requires tzlocal)
@@ -120,6 +132,36 @@ EVENTS_TO_MONITOR = [
 # any events older than the most recent EVENTS_NUMBER will be missed
 EVENTS_NUMBER = 30  # 1 page
 
+# If True, track user's repository changes (changed stargazers, watchers, forks, description, update date etc.)
+# Can also be enabled using the -j flag
+TRACK_REPOS_CHANGES = False
+
+# Repositories to monitor when TRACK_REPOS_CHANGES is enabled
+# Use 'ALL' to monitor all repositories (default behavior)
+# Use 'user/repo_name' format to monitor specific repositories for specific users
+# If the current user matches the user in the list, that repository will be monitored
+# Example: ['user1/repo1', 'user2/repo2', 'user1/repo3']
+# Can also be set using the --repos flag (comma-separated repo names only, without user prefix)
+# Example: --repos "repo1,repo2,repo3"
+# Note: When using a specific list (not 'ALL'), newly created repositories will NOT be
+# automatically monitored - only repositories explicitly listed here will be monitored.
+REPOS_TO_MONITOR = ['ALL']
+
+# If True, disable event monitoring
+# Can also be disabled using the -k flag
+DO_NOT_MONITOR_GITHUB_EVENTS = False
+
+# If True, fetch all user repos (owned, forks, collaborations); otherwise, fetch only owned repos
+GET_ALL_REPOS = False
+
+# Alert about blocked (403 - TOS violation and 451 - DMCA block) repos in the console output (in monitoring mode)
+# In listing mode (-r), blocked repos are always shown
+BLOCKED_REPOS = False
+
+# If True, track and log user's daily contributions count changes
+# Can also be enabled using the -m flag
+TRACK_CONTRIB_CHANGES = False
+
 # How often to print a "liveness check" message to the output; in seconds
 # Set to 0 to disable
 LIVENESS_CHECK_INTERVAL = 43200  # 12 hours
@@ -148,10 +190,10 @@ GITHUB_LOGFILE = "github_monitor"
 # Can also be disabled via the -d flag
 DISABLE_LOGGING = False
 
-# Width of main horizontal line (─)
+# Width of main horizontal line
 HORIZONTAL_LINE1 = 105
 
-# Width of horizontal line for repositories list output (─)
+# Width of horizontal line for repositories list output
 HORIZONTAL_LINE2 = 80
 
 # Whether to clear the terminal screen after starting the tool
@@ -175,6 +217,7 @@ GITHUB_CHECK_SIGNAL_VALUE = 60  # 1 minute
 # Do not change values below - modify them in the configuration section or config file instead
 GITHUB_TOKEN = ""
 GITHUB_API_URL = ""
+GITHUB_HTML_URL = ""
 SMTP_HOST = ""
 SMTP_PORT = 0
 SMTP_USER = ""
@@ -186,11 +229,18 @@ PROFILE_NOTIFICATION = False
 EVENT_NOTIFICATION = False
 REPO_NOTIFICATION = False
 REPO_UPDATE_DATE_NOTIFICATION = False
+CONTRIB_NOTIFICATION = False
 ERROR_NOTIFICATION = False
 GITHUB_CHECK_INTERVAL = 0
 LOCAL_TIMEZONE = ""
 EVENTS_TO_MONITOR = []
 EVENTS_NUMBER = 0
+TRACK_REPOS_CHANGES = False
+REPOS_TO_MONITOR = []
+DO_NOT_MONITOR_GITHUB_EVENTS = False
+GET_ALL_REPOS = False
+BLOCKED_REPOS = False
+TRACK_CONTRIB_CHANGES = False
 LIVENESS_CHECK_INTERVAL = 0
 CHECK_INTERNET_URL = ""
 CHECK_INTERNET_TIMEOUT = 0
@@ -218,9 +268,6 @@ LIVENESS_CHECK_COUNTER = LIVENESS_CHECK_INTERVAL / GITHUB_CHECK_INTERVAL
 stdout_bck = None
 csvfieldnames = ['Date', 'Type', 'Name', 'Old', 'New']
 
-TRACK_REPOS_CHANGES = False
-DO_NOT_MONITOR_GITHUB_EVENTS = False
-
 CLI_CONFIG_PATH = None
 
 # to solve the issue: 'SyntaxError: f-string expression part cannot include a backslash'
@@ -236,7 +283,7 @@ if sys.version_info < (3, 10):
 import time
 import string
 import os
-from datetime import datetime, timezone
+from datetime import datetime, timezone, date
 from dateutil import relativedelta
 from dateutil.parser import isoparse
 import calendar
@@ -262,6 +309,7 @@ import re
 import ipaddress
 try:
     from github import Github, Auth, GithubException, UnknownObjectException
+    from github.GithubException import RateLimitExceededException
     from github.GithubException import BadCredentialsException
 except ModuleNotFoundError:
     raise SystemExit("Error: Couldn't find the PyGitHub library !\n\nTo install it, run:\n    pip3 install PyGithub\n\nOnce installed, re-run this tool. For more help, visit:\nhttps://github.com/PyGithub/PyGithub")
@@ -272,7 +320,9 @@ import socket
 from typing import Any, Callable
 import shutil
 from pathlib import Path
-
+from typing import Optional
+import datetime as dt
+import requests
 
 NET_ERRORS = (
     req.exceptions.RequestException,
@@ -550,6 +600,11 @@ def now_local_naive():
     return datetime.now(pytz.timezone(LOCAL_TIMEZONE)).replace(microsecond=0, tzinfo=None)
 
 
+# Returns today's date in LOCAL_TIMEZONE (naive date)
+def today_local() -> dt.date:
+    return now_local_naive().date()
+
+
 # Returns the current date/time in human readable format; eg. Sun 21 Apr 2024, 15:08:45
 def get_cur_ts(ts_str=""):
     return (f'{ts_str}{calendar.day_abbr[(now_local_naive()).weekday()]}, {now_local_naive().strftime("%d %b %Y, %H:%M:%S")}')
@@ -619,6 +674,11 @@ def get_short_date_from_ts(ts, show_year=False, show_hour=True, show_weekday=Tru
         ts_rounded = int(round(ts))
         ts_new = datetime.fromtimestamp(ts_rounded, tz)
 
+    elif isinstance(ts, date):
+        ts = datetime.combine(ts, datetime.min.time())
+        ts = pytz.utc.localize(ts)
+        ts_new = ts.astimezone(tz)
+
     else:
         return ""
 
@@ -721,7 +781,7 @@ def toggle_profile_changes_notifications_signal_handler(sig, frame):
     PROFILE_NOTIFICATION = not PROFILE_NOTIFICATION
     sig_name = signal.Signals(sig).name
     print(f"* Signal {sig_name} received")
-    print(f"* Email notifications: [profile changes = {PROFILE_NOTIFICATION}]")
+    print(f"* Email notifications:\t\t[profile changes = {PROFILE_NOTIFICATION}]")
     print_cur_ts("Timestamp:\t\t\t")
 
 
@@ -731,7 +791,7 @@ def toggle_new_events_notifications_signal_handler(sig, frame):
     EVENT_NOTIFICATION = not EVENT_NOTIFICATION
     sig_name = signal.Signals(sig).name
     print(f"* Signal {sig_name} received")
-    print(f"* Email notifications: [new events = {EVENT_NOTIFICATION}]")
+    print(f"* Email notifications:\t\t[new events = {EVENT_NOTIFICATION}]")
     print_cur_ts("Timestamp:\t\t\t")
 
 
@@ -741,7 +801,7 @@ def toggle_repo_changes_notifications_signal_handler(sig, frame):
     REPO_NOTIFICATION = not REPO_NOTIFICATION
     sig_name = signal.Signals(sig).name
     print(f"* Signal {sig_name} received")
-    print(f"* Email notifications: [repos changes = {REPO_NOTIFICATION}]")
+    print(f"* Email notifications:\t\t[repos changes = {REPO_NOTIFICATION}]")
     print_cur_ts("Timestamp:\t\t\t")
 
 
@@ -751,7 +811,17 @@ def toggle_repo_update_date_changes_notifications_signal_handler(sig, frame):
     REPO_UPDATE_DATE_NOTIFICATION = not REPO_UPDATE_DATE_NOTIFICATION
     sig_name = signal.Signals(sig).name
     print(f"* Signal {sig_name} received")
-    print(f"* Email notifications: [repos update date = {REPO_UPDATE_DATE_NOTIFICATION}]")
+    print(f"* Email notifications:\t\t[repos update date = {REPO_UPDATE_DATE_NOTIFICATION}]")
+    print_cur_ts("Timestamp:\t\t\t")
+
+
+# Signal handler for SIGURG allowing to switch email notifications for user's daily contributions changes
+def toggle_contrib_changes_notifications_signal_handler(sig, frame):
+    global CONTRIB_NOTIFICATION
+    CONTRIB_NOTIFICATION = not CONTRIB_NOTIFICATION
+    sig_name = signal.Signals(sig).name
+    print(f"* Signal {sig_name} received")
+    print(f"* Email notifications:\t\t[contrib changes = {CONTRIB_NOTIFICATION}]")
     print_cur_ts("Timestamp:\t\t\t")
 
 
@@ -761,7 +831,7 @@ def increase_check_signal_handler(sig, frame):
     GITHUB_CHECK_INTERVAL = GITHUB_CHECK_INTERVAL + GITHUB_CHECK_SIGNAL_VALUE
     sig_name = signal.Signals(sig).name
     print(f"* Signal {sig_name} received")
-    print(f"* Github timers: [check interval: {display_time(GITHUB_CHECK_INTERVAL)}]")
+    print(f"* GitHub polling interval:\t[ {display_time(GITHUB_CHECK_INTERVAL)} ]")
     print_cur_ts("Timestamp:\t\t\t")
 
 
@@ -772,7 +842,7 @@ def decrease_check_signal_handler(sig, frame):
         GITHUB_CHECK_INTERVAL = GITHUB_CHECK_INTERVAL - GITHUB_CHECK_SIGNAL_VALUE
     sig_name = signal.Signals(sig).name
     print(f"* Signal {sig_name} received")
-    print(f"* Github timers: [check interval: {display_time(GITHUB_CHECK_INTERVAL)}]")
+    print(f"* GitHub polling interval:\t[ {display_time(GITHUB_CHECK_INTERVAL)} ]")
     print_cur_ts("Timestamp:\t\t\t")
 
 
@@ -824,6 +894,34 @@ def gh_call(fn: Callable[..., Any], retries=NET_MAX_RETRIES, backoff=NET_BASE_BA
         for i in range(1, retries + 1):
             try:
                 return fn(*args, **kwargs)
+            except RateLimitExceededException as e:
+                headers = getattr(e, "headers", None)
+
+                reset_str = None
+                if headers:
+                    val = headers.get("X-RateLimit-Reset")
+                    if isinstance(val, str):
+                        reset_str = val
+
+                sleep_for: int
+                if reset_str is not None and reset_str.isdigit():
+                    reset_epoch = int(reset_str)
+                    sleep_for = max(0, reset_epoch - int(time.time()) + 1)
+                else:
+                    retry_after_str = None
+                    if headers:
+                        ra = headers.get("Retry-After")
+                        if isinstance(ra, str):
+                            retry_after_str = ra
+                    if retry_after_str is not None and retry_after_str.isdigit():
+                        sleep_for = int(retry_after_str)
+                    else:
+                        sleep_for = int(backoff * i)
+
+                print(f"* {fn.__name__} rate limited, sleeping {sleep_for}s (retry {i}/{retries})")
+                time.sleep(sleep_for)
+                continue
+
             except NET_ERRORS as e:
                 print(f"* {fn.__name__} error: {e} (retry {i}/{retries})")
                 time.sleep(backoff * i)
@@ -865,7 +963,7 @@ def github_print_followers_and_followings(user):
 
     print(f"\nUsername:\t\t{user_name_str}")
     print(f"User URL:\t\t{user_url}/")
-    print(f"Github API URL:\t\t{GITHUB_API_URL}")
+    print(f"GitHub API URL:\t\t{GITHUB_API_URL}")
     print(f"Local timezone:\t\t{LOCAL_TIMEZONE}")
 
     print(f"\nFollowers:\t\t{followers_count}")
@@ -903,6 +1001,7 @@ def github_print_followers_and_followings(user):
 
 # Processes items from all passed repositories and returns a list of dictionaries
 def github_process_repos(repos_list):
+    import logging
     list_of_repos = []
     stargazers_list = []
     subscribers_list = []
@@ -913,9 +1012,24 @@ def github_process_repos(repos_list):
             try:
                 repo_created_date = repo.created_at
                 repo_updated_date = repo.updated_at
-                stargazers_list = [star.login for star in repo.get_stargazers()]
-                subscribers_list = [subscriber.login for subscriber in repo.get_subscribers()]
-                forked_repos = [fork.full_name for fork in repo.get_forks()]
+
+                github_logger = logging.getLogger('github')
+                original_level = github_logger.level
+                github_logger.setLevel(logging.ERROR)
+
+                try:
+                    stargazers_list = [star.login for star in repo.get_stargazers()]
+                    subscribers_list = [subscriber.login for subscriber in repo.get_subscribers()]
+                    forked_repos = [fork.full_name for fork in repo.get_forks()]
+                except GithubException as e:
+                    if e.status in [403, 451]:
+                        if BLOCKED_REPOS:
+                            print(f"* Repo '{repo.name}' is blocked, skipping for now: {e}")
+                            print_cur_ts("Timestamp:\t\t\t")
+                        continue
+                    raise
+                finally:
+                    github_logger.setLevel(original_level)
 
                 issues = list(repo.get_issues(state='open'))
                 pulls = list(repo.get_pulls(state='open'))
@@ -928,8 +1042,20 @@ def github_process_repos(repos_list):
                 pr_list = [f"#{pr.number} {pr.title} ({pr.user.login}) [ {pr.html_url} ]" for pr in pulls]
 
                 list_of_repos.append({"name": repo.name, "descr": repo.description, "is_fork": repo.fork, "forks": repo.forks_count, "stars": repo.stargazers_count, "subscribers": repo.subscribers_count, "url": repo.html_url, "language": repo.language, "date": repo_created_date, "update_date": repo_updated_date, "stargazers_list": stargazers_list, "forked_repos": forked_repos, "subscribers_list": subscribers_list, "issues": issue_count, "pulls": pr_count, "issues_list": issues_list, "pulls_list": pr_list})
+
+            except GithubException as e:
+                # Skip TOS-blocked (403) and legally blocked (451) repositories
+                if e.status in [403, 451]:
+                    if BLOCKED_REPOS:
+                        print(f"* Repo '{repo.name}' is blocked, skipping for now: {e}")
+                        print_cur_ts("Timestamp:\t\t\t")
+                    continue
+                else:
+                    print(f"* Cannot process repo '{repo.name}', skipping for now: {e}")
+                    print_cur_ts("Timestamp:\t\t\t")
+                    continue
             except Exception as e:
-                print(f"* Error while processing info for repo '{repo.name}', skipping for now: {e}")
+                print(f"* Cannot process repo '{repo.name}', skipping for now: {e}")
                 print_cur_ts("Timestamp:\t\t\t")
                 continue
 
@@ -938,6 +1064,7 @@ def github_process_repos(repos_list):
 
 # Prints a list of public repositories for a GitHub user (-r)
 def github_print_repos(user):
+    import logging
     user_name_str = user
     user_url = "-"
     repos_count = 0
@@ -954,8 +1081,12 @@ def github_print_repos(user):
         user_name = g_user.name
         user_url = g_user.html_url
 
-        repos_count = g_user.public_repos
-        repos_list = g_user.get_repos()
+        if GET_ALL_REPOS:
+            repos_list = g_user.get_repos()
+            repos_count = g_user.public_repos
+        else:
+            repos_list = [repo for repo in g_user.get_repos(type='owner') if not repo.fork and repo.owner.login == user_login]
+            repos_count = len(repos_list)
 
         user_name_str = user_login
         if user_name:
@@ -965,7 +1096,8 @@ def github_print_repos(user):
 
     print(f"\nUsername:\t\t{user_name_str}")
     print(f"User URL:\t\t{user_url}/")
-    print(f"Github API URL:\t\t{GITHUB_API_URL}")
+    print(f"GitHub API URL:\t\t{GITHUB_API_URL}")
+    print(f"Owned repos only:\t{not GET_ALL_REPOS}")
     print(f"Local timezone:\t\t{LOCAL_TIMEZONE}")
 
     print(f"\nRepositories:\t\t{repos_count}\n")
@@ -976,6 +1108,10 @@ def github_print_repos(user):
             for repo in repos_list:
                 print(f"🔸 {repo.name} {'(fork)' if repo.fork else ''} \n")
 
+                github_logger = logging.getLogger('github')
+                original_level = github_logger.level
+                github_logger.setLevel(logging.ERROR)
+
                 try:
                     pr_count = repo.get_pulls(state='open').totalCount
                     issue_count = repo.open_issues_count - pr_count
@@ -983,26 +1119,36 @@ def github_print_repos(user):
                     pr_count = "?"
                     issue_count = "?"
 
-                print(f" - 🌐 URL:\t\t{repo.html_url}")
-                print(f" - 💻 Language:\t\t{repo.language}")
-
-                print(f"\n - ⭐ Stars:\t\t{repo.stargazers_count}")
-                print(f" - 🍴 Forks:\t\t{repo.forks_count}")
-                print(f" - 👓 Watchers:\t\t{repo.subscribers_count}")
-
-                # print(f" - 🐞 Issues+PRs:\t{repo.open_issues_count}")
-                print(f" - 🐞 Issues:\t\t{issue_count}")
-                print(f" - 📬 PRs:\t\t{pr_count}")
-
-                print(f"\n - 📝 License:\t\t{repo.license.name if repo.license else 'None'}")
-                print(f" - 🌿 Branch (default):\t{repo.default_branch}")
-
-                print(f"\n - 📅 Created:\t\t{get_date_from_ts(repo.created_at)} ({calculate_timespan(int(time.time()), repo.created_at, granularity=2)} ago)")
-                print(f" - 🔄 Updated:\t\t{get_date_from_ts(repo.updated_at)} ({calculate_timespan(int(time.time()), repo.updated_at, granularity=2)} ago)")
-                print(f" - 🔃 Last push:\t{get_date_from_ts(repo.pushed_at)} ({calculate_timespan(int(time.time()), repo.pushed_at, granularity=2)} ago)")
+                try:
+                    print(f" - 🌐 URL:\t\t{repo.html_url}")
+                    print(f" - 💻 Language:\t\t{repo.language}")
+
+                    print(f"\n - ⭐ Stars:\t\t{repo.stargazers_count}")
+                    print(f" - 🍴 Forks:\t\t{repo.forks_count}")
+                    print(f" - 👓 Watchers:\t\t{repo.subscribers_count}")
+
+                    # print(f" - 🐞 Issues+PRs:\t{repo.open_issues_count}")
+                    print(f" - 🐞 Issues:\t\t{issue_count}")
+                    print(f" - 📬 PRs:\t\t{pr_count}")
+
+                    print(f"\n - 📝 License:\t\t{repo.license.name if repo.license else 'None'}")
+                    print(f" - 🌿 Branch (default):\t{repo.default_branch}")
+
+                    print(f"\n - 📅 Created:\t\t{get_date_from_ts(repo.created_at)} ({calculate_timespan(int(time.time()), repo.created_at, granularity=2)} ago)")
+                    print(f" - 🔄 Updated:\t\t{get_date_from_ts(repo.updated_at)} ({calculate_timespan(int(time.time()), repo.updated_at, granularity=2)} ago)")
+                    print(f" - 🔃 Last push:\t{get_date_from_ts(repo.pushed_at)} ({calculate_timespan(int(time.time()), repo.pushed_at, granularity=2)} ago)")
+
+                    if repo.description:
+                        print(f"\n - 📝 Desc:\t\t{repo.description}")
+                except GithubException as e:
+                    # Inform about TOS-blocked (403) and legally blocked (451) repositories
+                    if e.status in [403, 451]:
+                        print(f"\n* Repo '{repo.name}' is blocked: {e}")
+                        print("─" * HORIZONTAL_LINE2)
+                        continue
+                finally:
+                    github_logger.setLevel(original_level)
 
-                if repo.description:
-                    print(f"\n - 📝 Desc:\t\t{repo.description}")
                 print("─" * HORIZONTAL_LINE2)
     except Exception as e:
         raise RuntimeError(f"Cannot fetch user's repositories list: {e}")
@@ -1039,7 +1185,7 @@ def github_print_starred_repos(user):
 
     print(f"\nUsername:\t\t{user_name_str}")
     print(f"User URL:\t\t{user_url}/")
-    print(f"Github API URL:\t\t{GITHUB_API_URL}")
+    print(f"GitHub API URL:\t\t{GITHUB_API_URL}")
     print(f"Local timezone:\t\t{LOCAL_TIMEZONE}")
 
     print(f"\nRepos starred by user:\t{starred_count}")
@@ -1074,6 +1220,13 @@ def format_body_block(content, indent="    "):
     return f"\n{indented}"
 
 
+# Returns the base web URL for GitHub or GHE (e.g. https://github.com or https://ghe.example.com)
+def github_web_base() -> str:
+    if "api.github.com" in GITHUB_API_URL:
+        return "https://github.com"
+    return GITHUB_API_URL.replace("/api/v3", "").rstrip("/")
+
+
 # Prints details about passed GitHub event
 def github_print_event(event, g, time_passed=False, ts: datetime | None = None):
 
@@ -1094,19 +1247,33 @@ def github_print_event(event, g, time_passed=False, ts: datetime | None = None):
     st += print_v(f"Event type:\t\t\t{event.type}")
 
     if event.repo.id:
-        repo_name = event.repo.name
-        repo_url = event.repo.url.replace("https://api.github.com/repos/", "https://github.com/")
-        st += print_v(f"\nRepo name:\t\t\t{repo_name}")
-        st += print_v(f"Repo URL:\t\t\t{repo_url}")
-
         try:
             desc_len = 80
             repo = g.get_repo(event.repo.name)
-            desc = repo.description or ''
+
+            # For ForkEvent, prefer the source repo if available
+            if event.type == "ForkEvent" and repo is not None:
+                try:
+                    parent = gh_call(lambda: getattr(repo, "parent", None))()
+                    if parent:
+                        repo = parent
+                except Exception:
+                    pass
+
+            repo_name = getattr(repo, "full_name", event.repo.name)
+
+            api_prefix = GITHUB_API_URL.rstrip("/") + "/repos/"
+            repo_url = getattr(repo, "html_url", event.repo.url.replace(api_prefix, github_web_base() + "/"))
+
+            st += print_v(f"\nRepo name:\t\t\t{repo_name}")
+            st += print_v(f"Repo URL:\t\t\t{repo_url}")
+
+            desc = (repo.description or "") if repo else ""
             cleaned = desc.replace('\n', ' ')
             short_desc = cleaned[:desc_len] + '...' if len(cleaned) > desc_len else cleaned
             if short_desc:
                 st += print_v(f"Repo description:\t\t{short_desc}")
+
         except UnknownObjectException:
             repo = None
             st += print_v("\nRepository not found or has been removed")
@@ -1134,6 +1301,7 @@ def github_print_event(event, g, time_passed=False, ts: datetime | None = None):
     if event.payload.get("action"):
         st += print_v(f"\nAction:\t\t\t\t{event.payload.get('action')}")
 
+    # Prefer commits from payload when present (older API behavior)
     if event.payload.get("commits"):
         commits = event.payload["commits"]
         commits_total = len(commits)
@@ -1144,7 +1312,7 @@ def github_print_event(event, g, time_passed=False, ts: datetime | None = None):
 
             commit_details = None
             if repo:
-                commit_details = repo.get_commit(commit["sha"])
+                commit_details = gh_call(lambda: repo.get_commit(commit["sha"]))()
 
             if commit_details:
                 commit_date = commit_details.commit.author.date
@@ -1180,6 +1348,81 @@ def github_print_event(event, g, time_passed=False, ts: datetime | None = None):
             st += print_v(f"\n - Commit message:\t\t'{commit['message']}'")
             st += print_v("." * HORIZONTAL_LINE1)
 
+    # Fallback for new Events API where PushEvent no longer includes commit summaries
+    elif event.type == "PushEvent" and repo:
+        before_sha = event.payload.get("before")
+        head_sha = event.payload.get("head") or event.payload.get("after")
+        size_hint = event.payload.get("size")
+
+        # Debug when payload has no commits
+        # st += print_v("\n[debug] PushEvent payload has no 'commits' array; using compare API")
+        # st += print_v(f"[debug] before:\t\t\t{before_sha}")
+        # st += print_v(f"[debug] head/after:\t\t{head_sha}")
+        # if size_hint is not None:
+        #     st += print_v(f"[debug] size (hint):\t\t{size_hint}")
+
+        if before_sha and head_sha and before_sha != head_sha:
+            try:
+                compare = gh_call(lambda: repo.compare(before_sha, head_sha))()
+            except Exception as e:
+                compare = None
+                st += print_v(f"* Error using compare({before_sha[:12]}...{head_sha[:12]}): {e}")
+
+            if compare:
+                commits = list(compare.commits)
+                commits_total = len(commits)
+                short_repo = getattr(repo, "full_name", repo_name)
+                compare_url = f"{github_web_base()}/{short_repo}/compare/{before_sha[:12]}...{head_sha[:12]}"
+                st += print_v(f"\nNumber of commits:\t\t{commits_total}")
+                st += print_v(f"Compare URL:\t\t\t{compare_url}")
+
+                for commit_count, c in enumerate(commits, start=1):
+                    st += print_v(f"\n=== Commit {commit_count}/{commits_total} ===")
+                    st += print_v("." * HORIZONTAL_LINE1)
+
+                    commit_sha = getattr(c, "sha", None) or getattr(c, "id", None)
+                    commit_details = gh_call(lambda: repo.get_commit(commit_sha))() if (repo and commit_sha) else None
+
+                    if commit_details:
+                        commit_date = commit_details.commit.author.date
+                        st += print_v(f" - Commit date:\t\t\t{get_date_from_ts(commit_date)}")
+
+                    if commit_sha:
+                        st += print_v(f" - Commit SHA:\t\t\t{commit_sha}")
+
+                    author_name = None
+                    if commit_details and commit_details.commit and commit_details.commit.author:
+                        author_name = commit_details.commit.author.name
+                    st += print_v(f" - Commit author:\t\t{author_name or 'N/A'}")
+
+                    if commit_details and commit_details.author:
+                        st += print_v(f" - Commit author URL:\t\t{commit_details.author.html_url}")
+
+                    if commit_details:
+                        st += print_v(f" - Commit URL:\t\t\t{commit_details.html_url}")
+                        st += print_v(f" - Commit raw patch URL:\t{commit_details.html_url}.patch")
+
+                        stats = getattr(commit_details, "stats", None)
+                        additions = stats.additions if stats else 0
+                        deletions = stats.deletions if stats else 0
+                        stats_total = stats.total if stats else 0
+                        st += print_v(f"\n - Additions/Deletions:\t\t+{additions} / -{deletions} ({stats_total})")
+
+                        try:
+                            file_count = sum(1 for _ in commit_details.files)
+                        except Exception:
+                            file_count = "N/A"
+                        st += print_v(f" - Files changed:\t\t{file_count}")
+                        if file_count and file_count != "N/A":
+                            st += print_v(" - Changed files list:")
+                            for f in commit_details.files:
+                                st += print_v(f"     • '{f.filename}' - {f.status} (+{f.additions} / -{f.deletions})")
+
+                        st += print_v(f"\n - Commit message:\t\t'{commit_details.commit.message}'")
+                        st += print_v("." * HORIZONTAL_LINE1)
+        else:
+            st += print_v("\nNo compare range available (forced push, tag push, or identical before/after)")
+
     if event.payload.get("commits") == []:
         st += print_v("\nNo new commits (forced push, tag push, branch reset or other ref update)")
 
@@ -1557,7 +1800,7 @@ def github_list_events(user, number, csv_file_name):
 
     print(f"Username:\t\t\t{user_name_str}")
     print(f"User URL:\t\t\t{user_url}/")
-    print(f"Github API URL:\t\t\t{GITHUB_API_URL}")
+    print(f"GitHub API URL:\t\t\t{GITHUB_API_URL}")
     if csv_file_name:
         print(f"CSV export enabled:\t\t{bool(csv_file_name)}" + (f" ({csv_file_name})" if csv_file_name else ""))
     print(f"Local timezone:\t\t\t{LOCAL_TIMEZONE}")
@@ -1636,9 +1879,11 @@ def handle_profile_change(label, count_old, count_new, list_old, raw_list, user,
     if removed_items:
         print(f"Removed {label.lower()}:\n")
         removed_mbody = f"\nRemoved {label.lower()}:\n\n"
+        web_base = github_web_base()
         for item in removed_items:
-            item_url = (f"https://github.com/{item}/" if label.lower() in ["followers", "followings", "starred repos"]
-                        else f"https://github.com/{user}/{item}/")
+            item_url = (f"{web_base}/{item}/" if label.lower() in ["followers", "followings", "starred repos"]
+                        else f"{web_base}/{user}/{item}/")
+
             print(f"- {item} [ {item_url} ]")
             removed_list_str += f"- {item} [ {item_url} ]\n"
             try:
@@ -1651,9 +1896,10 @@ def handle_profile_change(label, count_old, count_new, list_old, raw_list, user,
     if added_items:
         print(f"Added {label.lower()}:\n")
         added_mbody = f"\nAdded {label.lower()}:\n\n"
+        web_base = github_web_base()
         for item in added_items:
-            item_url = (f"https://github.com/{item}/" if label.lower() in ["followers", "followings", "starred repos"]
-                        else f"https://github.com/{user}/{item}/")
+            item_url = (f"{web_base}/{item}/" if label.lower() in ["followers", "followings", "starred repos"]
+                        else f"{web_base}/{user}/{item}/")
             print(f"- {item} [ {item_url} ]")
             added_list_str += f"- {item} [ {item_url} ]\n"
             try:
@@ -1664,12 +1910,12 @@ def handle_profile_change(label, count_old, count_new, list_old, raw_list, user,
         print()
 
     if diff == 0:
-        m_subject = f"Github user {user} {label.lower()} list changed"
+        m_subject = f"GitHub user {user} {label.lower()} list changed"
         m_body = (f"{label} list changed {label_context} user {user}\n"
                   f"{removed_mbody}{removed_list_str}{added_mbody}{added_list_str}\n"
                   f"Check interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}")
     else:
-        m_subject = f"Github user {user} {label.lower()} number has changed! ({diff_str}, {old_count} -> {new_count})"
+        m_subject = f"GitHub user {user} {label.lower()} number has changed! ({diff_str}, {old_count} -> {new_count})"
         m_body = (f"{label} number changed {label_context} user {user} from {old_count} to {new_count} ({diff_str})\n"
                   f"{removed_mbody}{removed_list_str}{added_mbody}{added_list_str}\n"
                   f"Check interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}")
@@ -1725,7 +1971,7 @@ def check_repo_list_changes(count_old, count_new, list_old, list_new, label, rep
             print(f"{removal_text} {label.lower()}:\n")
             removed_mbody = f"\n{removal_text} {label.lower()}:\n\n"
             for item in removed_items:
-                item_line = f"- {item} [ https://github.com/{item}/ ]" if label.lower() in ["stargazers", "watchers", "forks"] else f"- {item}"
+                item_line = f"- {item} [ {github_web_base()}/{item}/ ]" if label.lower() in ["stargazers", "watchers", "forks"] else f"- {item}"
                 print(item_line)
                 removed_list_str += item_line + "\n"
                 try:
@@ -1740,7 +1986,7 @@ def check_repo_list_changes(count_old, count_new, list_old, list_new, label, rep
             print(f"Added {label.lower()}:\n")
             added_mbody = f"\nAdded {label.lower()}:\n\n"
             for item in added_items:
-                item_line = f"- {item} [ https://github.com/{item}/ ]" if label.lower() in ["stargazers", "watchers", "forks"] else f"- {item}"
+                item_line = f"- {item} [ {github_web_base()}/{item}/ ]" if label.lower() in ["stargazers", "watchers", "forks"] else f"- {item}"
                 print(item_line)
                 added_list_str += item_line + "\n"
                 try:
@@ -1752,12 +1998,12 @@ def check_repo_list_changes(count_old, count_new, list_old, list_new, label, rep
             print()
 
     if diff == 0:
-        m_subject = f"Github user {user} {label.lower()} list changed for repo '{repo_name}'!"
+        m_subject = f"GitHub user {user} {label.lower()} list changed for repo '{repo_name}'!"
         m_body = (f"* Repo '{repo_name}': {label.lower()} list changed\n"
                   f"* Repo URL: {repo_url}\n{removed_mbody}{removed_list_str}{added_mbody}{added_list_str}\n"
                   f"Check interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}")
     else:
-        m_subject = f"Github user {user} number of {label.lower()} for repo '{repo_name}' has changed! ({diff_str}, {old_count} -> {new_count})"
+        m_subject = f"GitHub user {user} number of {label.lower()} for repo '{repo_name}' has changed! ({diff_str}, {old_count} -> {new_count})"
         m_body = (f"* Repo '{repo_name}': number of {label.lower()} changed from {old_count} to {new_count} ({diff_str})\n"
                   f"* Repo URL: {repo_url}\n{removed_mbody}{removed_list_str}{added_mbody}{added_list_str}\n"
                   f"Check interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}")
@@ -1807,7 +2053,215 @@ def resolve_executable(path):
     raise FileNotFoundError(f"Could not find executable '{path}'")
 
 
-# Main function that monitors activity of the specified GitHub user
+# Checks if the authenticated user (token's owner) is blocked by user
+def is_blocked_by(user):
+    try:
+
+        headers = {
+            "Authorization": f"Bearer {GITHUB_TOKEN}",
+            "Accept": "application/vnd.github+json",
+        }
+
+        response = req.get(f"{GITHUB_API_URL}/user", headers=headers, timeout=15)
+        if response.status_code != 200:
+            return False
+        me_login = response.json().get("login", "").lower()
+        if user.lower() == me_login:
+            return False
+
+        graphql_endpoint = GITHUB_API_URL.rstrip("/") + "/graphql"
+        query = """
+        query($login: String!) {
+          user(login: $login) {
+            viewerCanFollow
+          }
+        }
+        """
+        payload = {"query": query, "variables": {"login": user}}
+        response_graphql = req.post(graphql_endpoint, json=payload, headers=headers, timeout=15)
+
+        if response_graphql.status_code == 404:
+            return False
+
+        if not response_graphql.ok:
+            return False
+
+        data = response_graphql.json()
+        can_follow = (data.get("data", {}).get("user", {}).get("viewerCanFollow", True))
+        return not bool(can_follow)
+
+    except Exception:
+        return False
+
+
+# Return the total number of repositories the user has starred (faster than via PyGithub)
+def get_starred_count(user):
+    try:
+
+        headers = {
+            "Authorization": f"Bearer {GITHUB_TOKEN}",
+            "Accept": "application/vnd.github+json",
+        }
+
+        graphql_endpoint = f"{GITHUB_API_URL.rstrip('/')}/graphql"
+        query = """
+        query($login:String!){
+          user(login:$login){
+            starredRepositories{
+              totalCount
+            }
+          }
+        }
+        """
+        payload = {"query": query, "variables": {"login": user}}
+        response = req.post(graphql_endpoint, json=payload, headers=headers, timeout=15)
+
+        if not response.ok:
+            return 0
+
+        data = response.json()
+
+        return (data.get("data", {}).get("user", {}).get("starredRepositories", {}).get("totalCount", 0))
+
+    except Exception:
+        return 0
+
+
+# Returns True if the user's GitHub page shows "activity is private"
+def has_private_banner(user):
+    try:
+        url = f"{GITHUB_HTML_URL.rstrip('/')}/{user}"
+        r = req.get(url, timeout=15)
+        return r.ok and "activity is private" in r.text.lower()
+    except Exception:
+        return False
+
+
+# Returns True if the user's GitHub profile is public
+def is_profile_public(g: Github, user, new_account_days=30):
+
+    if has_private_banner(user):
+        return False
+
+    try:
+        u = g.get_user(user)
+
+        if any([
+            u.followers > 0,
+            u.following > 0,
+            get_starred_count(user) > 0,
+        ]):
+            return True
+
+        try:
+            events_iter = iter(u.get_events())
+            next(events_iter)
+            return True
+        except (StopIteration, GithubException):
+            pass
+
+    except GithubException:
+        pass
+
+    return False
+
+
+# Returns a dict mapping 'YYYY-MM-DD' -> int contribution count for the range
+def get_daily_contributions(username: str, start: Optional[dt.date] = None, end: Optional[dt.date] = None, token: Optional[str] = None) -> dict:
+    if token is None:
+        raise ValueError("GitHub token is required")
+
+    today = dt.date.today()
+    if start is None:
+        start = today
+    if end is None:
+        end = today
+
+    url = GITHUB_API_URL.rstrip("/") + "/graphql"
+    headers = {
+        "Authorization": f"Bearer {token}",
+        "Time-Zone": LOCAL_TIMEZONE,
+    }
+
+    tz = pytz.timezone(LOCAL_TIMEZONE)
+    start_w = start - dt.timedelta(days=1)
+    end_w_exclusive = end + dt.timedelta(days=2)
+    start_iso = tz.localize(dt.datetime.combine(start_w, dt.time.min)).isoformat()
+    end_iso = tz.localize(dt.datetime.combine(end_w_exclusive, dt.time.min)).isoformat()
+
+    query = """
+    query($login: String!, $from: DateTime!, $to: DateTime!) {
+      user(login: $login) {
+        contributionsCollection(from: $from, to: $to) {
+          contributionCalendar {
+            weeks {
+              contributionDays {
+                date
+                contributionCount
+              }
+            }
+          }
+        }
+      }
+    }"""
+
+    variables = {"login": username, "from": start_iso, "to": end_iso}
+    r = requests.post(url, json={"query": query, "variables": variables}, headers=headers, timeout=30)
+    r.raise_for_status()
+    data = r.json()
+
+    days = data["data"]["user"]["contributionsCollection"]["contributionCalendar"]["weeks"]
+    out = {}
+    for w in days:
+        for d in w["contributionDays"]:
+            date = d["date"]
+            if start <= dt.date.fromisoformat(date) <= end:
+                out[date] = d["contributionCount"]
+    return out
+
+
+# Return contribution count for a single day
+def get_daily_contributions_count(username: str, day: dt.date, token: str) -> int:
+    data = get_daily_contributions(username, day, day, token)
+    return next(iter(data.values()), 0)
+
+
+# Checks count for today and decides whether to notify based on stored state.
+def check_daily_contribs(username: str, token: str, state: dict, min_delta: int = 1, fail_threshold: int = 3) -> tuple[bool, int, bool]:
+    day = today_local()
+
+    try:
+        curr = get_daily_contributions_count(username, day, token=token)
+        state["consecutive_failures"] = 0
+        state["last_error"] = None
+    except Exception as e:
+        state["consecutive_failures"] = state.get("consecutive_failures", 0) + 1
+        state["last_error"] = f"{type(e).__name__}: {e}"
+        error_notify = state["consecutive_failures"] >= fail_threshold
+        return False, state.get("count", 0), error_notify
+
+    prev_day = state.get("day")
+    prev_cnt = state.get("count")
+
+    # New day -> reset baseline silently
+    if prev_day != day:
+        state["day"] = day
+        state["count"] = curr
+        state["prev_count"] = curr
+        return False, curr, False  # no notify on rollover
+
+    # Same day -> notify if change >= threshold
+    if prev_cnt is not None and abs(curr - prev_cnt) >= min_delta:
+        state["prev_count"] = prev_cnt
+        state["count"] = curr
+        return True, curr, False
+
+    # No change
+    state["count"] = curr
+    return False, curr, False
+
+
+# Monitors activity of the specified GitHub user
 def github_monitor_user(user, csv_file_name):
 
     try:
@@ -1824,6 +2278,12 @@ def github_monitor_user(user, csv_file_name):
     events = []
     repos_list = []
     event_date: datetime | None = None
+    blocked = None
+    public = False
+    contrib_state = {}
+    contrib_curr = 0
+
+    print("Sneaking into GitHub like a ninja ...")
 
     try:
         auth = Auth.Token(GITHUB_TOKEN)
@@ -1847,21 +2307,37 @@ def github_monitor_user(user, csv_file_name):
 
         followers_count = g_user.followers
         followings_count = g_user.following
-        repos_count = g_user.public_repos
 
         followers_list = g_user.get_followers()
         followings_list = g_user.get_following()
-        repos_list = g_user.get_repos()
+
+        if GET_ALL_REPOS:
+            repos_list = g_user.get_repos()
+            repos_count = g_user.public_repos
+        else:
+            repos_list = [repo for repo in g_user.get_repos(type='owner') if not repo.fork and repo.owner.login == user_login]
+            repos_count = len(repos_list)
 
         starred_list = g_user.get_starred()
         starred_count = starred_list.totalCount
 
+        public = is_profile_public(g, user)
+        blocked = is_blocked_by(user) if public else None
+
+        if TRACK_CONTRIB_CHANGES:
+            contrib_curr = get_daily_contributions_count(user, today_local(), token=GITHUB_TOKEN)
+            contrib_state = {
+                "day": today_local(),
+                "count": contrib_curr,
+                "prev_count": contrib_curr
+            }
+
         if not DO_NOT_MONITOR_GITHUB_EVENTS:
             events = list(islice(g_user.get_events(), EVENTS_NUMBER))
             available_events = len(events)
 
     except Exception as e:
-        print(f"* Error: {e}")
+        print(f"\n* Error: {e}")
         sys.exit(1)
 
     last_event_id = 0
@@ -1879,7 +2355,7 @@ def github_monitor_user(user, csv_file_name):
                 if last_event_id:
                     last_event_ts = newest.created_at
             except Exception as e:
-                print(f"* Cannot get event IDs / timestamps: {e}\n")
+                print(f"\n* Cannot get event IDs / timestamps: {e}\n")
                 pass
 
     followers_old_count = followers_count
@@ -1893,6 +2369,8 @@ def github_monitor_user(user, csv_file_name):
     company_old = company
     email_old = email
     blog_old = blog
+    blocked_old = blocked
+    public_old = public
 
     last_event_id_old = last_event_id
     last_event_ts_old = last_event_ts
@@ -1902,7 +2380,7 @@ def github_monitor_user(user, csv_file_name):
     if user_myself_name:
         user_myself_name_str += f" ({user_myself_name})"
 
-    print(f"Token belongs to:\t\t{user_myself_name_str}" + f"\n\t\t\t\t[ {user_myself_url} ]" if user_myself_url else "")
+    print(f"\nToken belongs to:\t\t{user_myself_name_str}" + f"\n\t\t\t\t[ {user_myself_url} ]" if user_myself_url else "")
 
     user_name_str = user_login
     if user_name:
@@ -1923,6 +2401,9 @@ def github_monitor_user(user, csv_file_name):
     if blog:
         print(f"Blog URL:\t\t\t{blog}")
 
+    print(f"\nPublic profile:\t\t\t{'Yes' if public else 'No'}")
+    print(f"Blocked by the user:\t\t{'Unknown' if blocked is None else ('Yes' if blocked else 'No')}")
+
     print(f"\nAccount creation date:\t\t{get_date_from_ts(account_created_date)} ({calculate_timespan(int(time.time()), account_created_date, show_seconds=False)} ago)")
     print(f"Account updated date:\t\t{get_date_from_ts(account_updated_date)} ({calculate_timespan(int(time.time()), account_updated_date, show_seconds=False)} ago)")
     account_updated_date_old = account_updated_date
@@ -1931,6 +2412,9 @@ def github_monitor_user(user, csv_file_name):
     print(f"Followings:\t\t\t{followings_count}")
     print(f"Repositories:\t\t\t{repos_count}")
     print(f"Starred repos:\t\t\t{starred_count}")
+    if TRACK_CONTRIB_CHANGES:
+        print(f"Today's contributions:\t\t{contrib_curr}")
+
     if not DO_NOT_MONITOR_GITHUB_EVENTS:
         print(f"Available events:\t\t{available_events}{'+' if available_events == EVENTS_NUMBER else ''}")
 
@@ -1941,9 +2425,31 @@ def github_monitor_user(user, csv_file_name):
 
     list_of_repos = []
     if repos_list and TRACK_REPOS_CHANGES:
+        # Filter repos for detailed monitoring only (keep full repos_list for profile change detection)
+        repos_list_filtered = repos_list
+        if 'ALL' not in REPOS_TO_MONITOR:
+            repos_list_filtered = []
+            for repo in repos_list:
+                # Check if repo matches any entry in REPOS_TO_MONITOR
+                should_monitor = False
+                for monitor_entry in REPOS_TO_MONITOR:
+                    if '/' in monitor_entry:
+                        # Format: 'user/repo_name' - check if user matches and repo matches
+                        monitor_user, monitor_repo = monitor_entry.split('/', 1)
+                        if monitor_user == user_login and monitor_repo == repo.name:
+                            should_monitor = True
+                            break
+                    else:
+                        # Format: just 'repo_name' (from CLI) - check if repo name matches for current user
+                        if monitor_entry == repo.name and repo.owner.login == user_login:
+                            should_monitor = True
+                            break
+                if should_monitor:
+                    repos_list_filtered.append(repo)
+
         print("Processing list of public repositories (be patient, it might take a while) ...")
         try:
-            list_of_repos = github_process_repos(repos_list)
+            list_of_repos = github_process_repos(repos_list_filtered)
         except Exception as e:
             print(f"* Cannot process list of public repositories: {e}")
         print_cur_ts("\nTimestamp:\t\t\t")
@@ -1983,7 +2489,7 @@ def github_monitor_user(user, csv_file_name):
     alive_counter = 0
     email_sent = False
 
-    # main loop
+    # Primary loop
     while True:
 
         try:
@@ -2031,8 +2537,13 @@ def github_monitor_user(user, csv_file_name):
             followers_old, followers_old_count = handle_profile_change("Followers", followers_old_count, followers_count, followers_old, followers_raw, user, csv_file_name, field="login")
 
         # Changed public repositories
-        repos_raw = list(gh_call(g_user.get_repos)())
-        repos_count = gh_call(lambda: g_user.public_repos)()
+        if GET_ALL_REPOS:
+            repos_raw = list(gh_call(g_user.get_repos)())
+            repos_count = gh_call(lambda: g_user.public_repos)()
+        else:
+            repos_raw = list(gh_call(lambda: [repo for repo in g_user.get_repos(type='owner') if not repo.fork and repo.owner.login == user_login])())
+            repos_count = len(repos_raw)
+
         if repos_raw is not None and repos_count is not None:
             repos_old, repos_old_count = handle_profile_change("Repos", repos_old_count, repos_count, repos_old, repos_raw, user, csv_file_name, field="name")
 
@@ -2043,6 +2554,36 @@ def github_monitor_user(user, csv_file_name):
             starred_count = starred_raw.totalCount
             starred_old, starred_old_count = handle_profile_change("Starred Repos", starred_old_count, starred_count, starred_old, starred_list, user, csv_file_name, field="full_name")
 
+        # Changed contributions in a day
+        if TRACK_CONTRIB_CHANGES:
+            contrib_notify, contrib_curr, contrib_error_notify = check_daily_contribs(user, GITHUB_TOKEN, contrib_state, min_delta=1, fail_threshold=3)
+            if contrib_error_notify and ERROR_NOTIFICATION:
+                failures = contrib_state.get("consecutive_failures", 0)
+                last_err = contrib_state.get("last_error", "Unknown error")
+                err_msg = f"Error: GitHub daily contributions check failed {failures} times. Last error: {last_err}\n"
+                print(err_msg)
+                send_email(f"GitHub monitor errors for {user}", err_msg + get_cur_ts(nl_ch + "Timestamp: "), "", SMTP_SSL)
+
+            if contrib_notify:
+                contrib_old = contrib_state.get("prev_count")
+                print(f"* Daily contributions changed for user {user} on {get_short_date_from_ts(contrib_state['day'], show_hour=False)} from {contrib_old} to {contrib_curr}!\n")
+
+                try:
+                    if csv_file_name:
+                        write_csv_entry(csv_file_name, now_local_naive(), "Daily Contribs", user, contrib_old, contrib_curr)
+                except Exception as e:
+                    print(f"* Error: {e}")
+
+                m_subject = f"GitHub user {user} daily contributions changed from {contrib_old} to {contrib_curr}!"
+                m_body = (f"GitHub user {user} daily contributions changed on {get_short_date_from_ts(contrib_state['day'], show_hour=False)} from {contrib_old} to {contrib_curr}\n\nCheck interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}")
+
+                if CONTRIB_NOTIFICATION:
+                    print(f"Sending email notification to {RECEIVER_EMAIL}")
+                    send_email(m_subject, m_body, "", SMTP_SSL)
+
+                print(f"Check interval:\t\t\t{display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)})")
+                print_cur_ts("Timestamp:\t\t\t")
+
         # Changed bio
         bio = gh_call(lambda: g_user.bio)()
         if bio is not None and bio != bio_old:
@@ -2056,8 +2597,8 @@ def github_monitor_user(user, csv_file_name):
             except Exception as e:
                 print(f"* Error: {e}")
 
-            m_subject = f"Github user {user} bio has changed!"
-            m_body = f"Github user {user} bio has changed\n\nOld bio:\n\n{bio_old}\n\nNew bio:\n\n{bio}\n\nCheck interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}"
+            m_subject = f"GitHub user {user} bio has changed!"
+            m_body = f"GitHub user {user} bio has changed\n\nOld bio:\n\n{bio_old}\n\nNew bio:\n\n{bio}\n\nCheck interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}"
 
             if PROFILE_NOTIFICATION:
                 print(f"Sending email notification to {RECEIVER_EMAIL}")
@@ -2080,8 +2621,8 @@ def github_monitor_user(user, csv_file_name):
             except Exception as e:
                 print(f"* Error: {e}")
 
-            m_subject = f"Github user {user} location has changed!"
-            m_body = f"Github user {user} location has changed\n\nOld location: {location_old}\n\nNew location: {location}\n\nCheck interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}"
+            m_subject = f"GitHub user {user} location has changed!"
+            m_body = f"GitHub user {user} location has changed\n\nOld location: {location_old}\n\nNew location: {location}\n\nCheck interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}"
 
             if PROFILE_NOTIFICATION:
                 print(f"Sending email notification to {RECEIVER_EMAIL}")
@@ -2104,8 +2645,8 @@ def github_monitor_user(user, csv_file_name):
             except Exception as e:
                 print(f"* Error: {e}")
 
-            m_subject = f"Github user {user} name has changed!"
-            m_body = f"Github user {user} name has changed\n\nOld user name: {user_name_old}\n\nNew user name: {user_name}\n\nCheck interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}"
+            m_subject = f"GitHub user {user} name has changed!"
+            m_body = f"GitHub user {user} name has changed\n\nOld user name: {user_name_old}\n\nNew user name: {user_name}\n\nCheck interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}"
 
             if PROFILE_NOTIFICATION:
                 print(f"Sending email notification to {RECEIVER_EMAIL}")
@@ -2128,8 +2669,8 @@ def github_monitor_user(user, csv_file_name):
             except Exception as e:
                 print(f"* Error: {e}")
 
-            m_subject = f"Github user {user} company has changed!"
-            m_body = f"Github user {user} company has changed\n\nOld company: {company_old}\n\nNew company: {company}\n\nCheck interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}"
+            m_subject = f"GitHub user {user} company has changed!"
+            m_body = f"GitHub user {user} company has changed\n\nOld company: {company_old}\n\nNew company: {company}\n\nCheck interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}"
 
             if PROFILE_NOTIFICATION:
                 print(f"Sending email notification to {RECEIVER_EMAIL}")
@@ -2152,8 +2693,8 @@ def github_monitor_user(user, csv_file_name):
             except Exception as e:
                 print(f"* Error: {e}")
 
-            m_subject = f"Github user {user} email has changed!"
-            m_body = f"Github user {user} email has changed\n\nOld email: {email_old}\n\nNew email: {email}\n\nCheck interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}"
+            m_subject = f"GitHub user {user} email has changed!"
+            m_body = f"GitHub user {user} email has changed\n\nOld email: {email_old}\n\nNew email: {email}\n\nCheck interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}"
 
             if PROFILE_NOTIFICATION:
                 print(f"Sending email notification to {RECEIVER_EMAIL}")
@@ -2176,8 +2717,8 @@ def github_monitor_user(user, csv_file_name):
             except Exception as e:
                 print(f"* Error: {e}")
 
-            m_subject = f"Github user {user} blog URL has changed!"
-            m_body = f"Github user {user} blog URL has changed\n\nOld blog URL: {blog_old}\n\nNew blog URL: {blog}\n\nCheck interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}"
+            m_subject = f"GitHub user {user} blog URL has changed!"
+            m_body = f"GitHub user {user} blog URL has changed\n\nOld blog URL: {blog_old}\n\nNew blog URL: {blog}\n\nCheck interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}"
 
             if PROFILE_NOTIFICATION:
                 print(f"Sending email notification to {RECEIVER_EMAIL}")
@@ -2200,8 +2741,8 @@ def github_monitor_user(user, csv_file_name):
             except Exception as e:
                 print(f"* Error: {e}")
 
-            m_subject = f"Github user {user} account has been updated! (after {calculate_timespan(account_updated_date, account_updated_date_old, show_seconds=False, granularity=2)})"
-            m_body = f"Github user {user} account has been updated (after {calculate_timespan(account_updated_date, account_updated_date_old, show_seconds=False, granularity=2)})\n\nOld account update date: {get_date_from_ts(account_updated_date_old)}\n\nNew account update date: {get_date_from_ts(account_updated_date)}\n\nCheck interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}"
+            m_subject = f"GitHub user {user} account has been updated! (after {calculate_timespan(account_updated_date, account_updated_date_old, show_seconds=False, granularity=2)})"
+            m_body = f"GitHub user {user} account has been updated (after {calculate_timespan(account_updated_date, account_updated_date_old, show_seconds=False, granularity=2)})\n\nOld account update date: {get_date_from_ts(account_updated_date_old)}\n\nNew account update date: {get_date_from_ts(account_updated_date)}\n\nCheck interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}"
 
             if PROFILE_NOTIFICATION:
                 print(f"Sending email notification to {RECEIVER_EMAIL}")
@@ -2211,14 +2752,97 @@ def github_monitor_user(user, csv_file_name):
             print(f"Check interval:\t\t\t{display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)})")
             print_cur_ts("Timestamp:\t\t\t")
 
+        # Profile visibility changed
+        public = is_profile_public(g, user)
+        if public != public_old:
+
+            def _get_profile_status(public):
+                return "public" if public else "private"
+
+            print(f"* User {user} has changed profile visibility to '{_get_profile_status(public)}' !\n")
+
+            try:
+                if csv_file_name:
+                    write_csv_entry(csv_file_name, now_local_naive(), "Profile Visibility", user, _get_profile_status(public_old), _get_profile_status(public))
+            except Exception as e:
+                print(f"* Error: {e}")
+
+            m_subject = f"GitHub user {user} has changed profile visibility to '{_get_profile_status(public)}' !"
+            m_body = f"GitHub user {user} has changed profile visibility to '{_get_profile_status(public)}' !\n\nCheck interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}"
+
+            if PROFILE_NOTIFICATION:
+                print(f"Sending email notification to {RECEIVER_EMAIL}")
+                send_email(m_subject, m_body, "", SMTP_SSL)
+
+            public_old = public
+            print(f"Check interval:\t\t\t{display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)})")
+            print_cur_ts("Timestamp:\t\t\t")
+
+        # Blocked status changed
+        blocked = is_blocked_by(user) if public else None
+
+        if blocked is not None and blocked_old is None:
+            blocked_old = blocked
+
+        elif None not in (blocked_old, blocked) and blocked != blocked_old:
+
+            def _get_blocked_status(blocked, public):
+                return 'Unknown' if blocked is None else ('Yes' if blocked else 'No')
+
+            print(f"* User {user} has {'blocked' if blocked else 'unblocked'} you!\n")
+
+            try:
+                if csv_file_name:
+                    write_csv_entry(csv_file_name, now_local_naive(), "Block Status", user, _get_blocked_status(blocked_old, public), _get_blocked_status(blocked, public))
+            except Exception as e:
+                print(f"* Error: {e}")
+
+            m_subject = f"GitHub user {user} has {'blocked' if blocked else 'unblocked'} you!"
+            m_body = f"GitHub user {user} has {'blocked' if blocked else 'unblocked'} you!\n\nCheck interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}"
+
+            if PROFILE_NOTIFICATION:
+                print(f"Sending email notification to {RECEIVER_EMAIL}")
+                send_email(m_subject, m_body, "", SMTP_SSL)
+
+            blocked_old = blocked
+            print(f"Check interval:\t\t\t{display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)})")
+            print_cur_ts("Timestamp:\t\t\t")
+
         list_of_repos = []
 
         # Changed repos details
         if TRACK_REPOS_CHANGES:
-            repos_list = gh_call(g_user.get_repos)()
-            if repos_list is not None:
+
+            if GET_ALL_REPOS:
+                repos_list = gh_call(g_user.get_repos)()
+            else:
+                repos_list = gh_call(lambda: [repo for repo in g_user.get_repos(type='owner') if not repo.fork and repo.owner.login == user_login])()
+
+            # Filter repos for detailed monitoring only (keep full repos_list for profile change detection)
+            repos_list_filtered = repos_list
+            if repos_list is not None and 'ALL' not in REPOS_TO_MONITOR:
+                repos_list_filtered = []
+                for repo in repos_list:
+                    # Check if repo matches any entry in REPOS_TO_MONITOR
+                    should_monitor = False
+                    for monitor_entry in REPOS_TO_MONITOR:
+                        if '/' in monitor_entry:
+                            # Format: 'user/repo_name' - check if user matches and repo matches
+                            monitor_user, monitor_repo = monitor_entry.split('/', 1)
+                            if monitor_user == user_login and monitor_repo == repo.name:
+                                should_monitor = True
+                                break
+                        else:
+                            # Format: just 'repo_name' (from CLI) - check if repo name matches for current user
+                            if monitor_entry == repo.name and repo.owner.login == user_login:
+                                should_monitor = True
+                                break
+                    if should_monitor:
+                        repos_list_filtered.append(repo)
+
+            if repos_list_filtered is not None:
                 try:
-                    list_of_repos = github_process_repos(repos_list)
+                    list_of_repos = github_process_repos(repos_list_filtered)
                     list_of_repos_ok = True
                 except Exception as e:
                     list_of_repos = list_of_repos_old
@@ -2269,7 +2893,7 @@ def github_monitor_user(user, csv_file_name):
                                             write_csv_entry(csv_file_name, now_local_naive(), "Repo Update Date", r_name, convert_to_local_naive(r_update_old), convert_to_local_naive(r_update))
                                     except Exception as e:
                                         print(f"* Error: {e}")
-                                    m_subject = f"Github user {user} repo '{r_name}' update date has changed ! (after {calculate_timespan(r_update, r_update_old, show_seconds=False, granularity=2)})"
+                                    m_subject = f"GitHub user {user} repo '{r_name}' update date has changed ! (after {calculate_timespan(r_update, r_update_old, show_seconds=False, granularity=2)})"
                                     m_body = f"{r_message}\nCheck interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}"
                                     if REPO_UPDATE_DATE_NOTIFICATION:
                                         print(f"Sending email notification to {RECEIVER_EMAIL}")
@@ -2301,7 +2925,7 @@ def github_monitor_user(user, csv_file_name):
                                             write_csv_entry(csv_file_name, now_local_naive(), "Repo Description", r_name, r_descr_old, r_descr)
                                     except Exception as e:
                                         print(f"* Error: {e}")
-                                    m_subject = f"Github user {user} repo '{r_name}' description has changed !"
+                                    m_subject = f"GitHub user {user} repo '{r_name}' description has changed !"
                                     m_body = f"{r_message}\nCheck interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}"
                                     if REPO_NOTIFICATION:
                                         print(f"Sending email notification to {RECEIVER_EMAIL}")
@@ -2311,7 +2935,7 @@ def github_monitor_user(user, csv_file_name):
 
                     list_of_repos_old = list_of_repos
 
-        # New Github events
+        # New GitHub events
         if not DO_NOT_MONITOR_GITHUB_EVENTS:
             events = list(gh_call(lambda: list(islice(g_user.get_events(), EVENTS_NUMBER)))())
             if events is not None:
@@ -2366,8 +2990,8 @@ def github_monitor_user(user, csv_file_name):
                                 except Exception as e:
                                     print(f"* Error: {e}")
 
-                                m_subject = f"Github user {user} has new {event.type} (repo: {repo_name})"
-                                m_body = f"Github user {user} has new {event.type} event\n\n{event_text}\nCheck interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}"
+                                m_subject = f"GitHub user {user} has new {event.type} (repo: {repo_name})"
+                                m_body = f"GitHub user {user} has new {event.type} event\n\n{event_text}\nCheck interval: {display_time(GITHUB_CHECK_INTERVAL)} ({get_range_of_dates_from_tss(int(time.time()) - GITHUB_CHECK_INTERVAL, int(time.time()), short=True)}){get_cur_ts(nl_ch + 'Timestamp: ')}"
 
                                 if EVENT_NOTIFICATION:
                                     print(f"\nSending email notification to {RECEIVER_EMAIL}")
@@ -2392,7 +3016,7 @@ def github_monitor_user(user, csv_file_name):
 
 
 def main():
-    global CLI_CONFIG_PATH, DOTENV_FILE, LOCAL_TIMEZONE, LIVENESS_CHECK_COUNTER, GITHUB_TOKEN, GITHUB_API_URL, CSV_FILE, DISABLE_LOGGING, GITHUB_LOGFILE, PROFILE_NOTIFICATION, EVENT_NOTIFICATION, REPO_NOTIFICATION, REPO_UPDATE_DATE_NOTIFICATION, ERROR_NOTIFICATION, GITHUB_CHECK_INTERVAL, SMTP_PASSWORD, stdout_bck, DO_NOT_MONITOR_GITHUB_EVENTS, TRACK_REPOS_CHANGES
+    global CLI_CONFIG_PATH, DOTENV_FILE, LOCAL_TIMEZONE, LIVENESS_CHECK_COUNTER, GITHUB_TOKEN, GITHUB_API_URL, CSV_FILE, DISABLE_LOGGING, GITHUB_LOGFILE, PROFILE_NOTIFICATION, EVENT_NOTIFICATION, REPO_NOTIFICATION, REPO_UPDATE_DATE_NOTIFICATION, ERROR_NOTIFICATION, GITHUB_CHECK_INTERVAL, SMTP_PASSWORD, stdout_bck, DO_NOT_MONITOR_GITHUB_EVENTS, TRACK_REPOS_CHANGES, REPOS_TO_MONITOR, GET_ALL_REPOS, CONTRIB_NOTIFICATION, TRACK_CONTRIB_CHANGES
 
     if "--generate-config" in sys.argv:
         print(CONFIG_BLOCK.strip("\n"))
@@ -2409,7 +3033,7 @@ def main():
 
     clear_screen(CLEAR_SCREEN)
 
-    print(f"Github Monitoring Tool v{VERSION}\n")
+    print(f"GitHub Monitoring Tool v{VERSION}\n")
 
     parser = argparse.ArgumentParser(
         prog="github_monitor",
@@ -2499,6 +3123,13 @@ def main():
         default=None,
         help="Email when user's repositories update date changes"
     )
+    notify.add_argument(
+        "-y", "--notify-daily-contribs",
+        dest="notify_daily_contribs",
+        action="store_true",
+        default=None,
+        help="Email when user's daily contributions count changes"
+    )
     notify.add_argument(
         "-e", "--no-error-notify",
         dest="notify_errors",
@@ -2577,6 +3208,13 @@ def main():
         default=None,
         help="Disable event monitoring"
     )
+    opts.add_argument(
+        "-a", "--get-all-repos",
+        dest="get_all_repos",
+        action="store_true",
+        default=None,
+        help="Fetch all user repos (owned, forks, collaborations)"
+    )
     opts.add_argument(
         "-b", "--csv-file",
         dest="csv_file",
@@ -2591,6 +3229,20 @@ def main():
         default=None,
         help="Disable logging to github_monitor_<username>.log"
     )
+    opts.add_argument(
+        "-m", "--track-contribs-changes",
+        dest="track_contribs_changes",
+        action="store_true",
+        default=None,
+        help="Track user's daily contributions count and log changes"
+    )
+    opts.add_argument(
+        "--repos",
+        dest="repos",
+        metavar="REPO_LIST",
+        type=str,
+        help="Comma-separated list of repository names to monitor (only when -j/--track-repos-changes is enabled). Overrides REPOS_TO_MONITOR config. Example: --repos \"repo1,repo2,repo3\""
+    )
 
     args = parser.parse_args()
 
@@ -2694,6 +3346,9 @@ def main():
         print("* Error: GITHUB_API_URL (-x / --github_url) value is empty")
         sys.exit(1)
 
+    if args.get_all_repos is True:
+        GET_ALL_REPOS = True
+
     if args.list_followers_and_followings:
         try:
             github_print_followers_and_followings(args.username)
@@ -2777,12 +3432,25 @@ def main():
     if args.notify_repo_update_date is True:
         REPO_UPDATE_DATE_NOTIFICATION = True
 
+    if args.notify_daily_contribs is True:
+        CONTRIB_NOTIFICATION = True
+
     if args.notify_errors is False:
         ERROR_NOTIFICATION = False
 
     if args.track_repos_changes is True:
         TRACK_REPOS_CHANGES = True
 
+    if args.repos is not None:
+        if not TRACK_REPOS_CHANGES:
+            print("* Error: --repos requires -j/--track-repos-changes to be enabled")
+            sys.exit(1)
+        # Split comma-separated repo names and strip whitespace
+        REPOS_TO_MONITOR = [repo.strip() for repo in args.repos.split(',') if repo.strip()]
+
+    if args.track_contribs_changes is True:
+        TRACK_CONTRIB_CHANGES = True
+
     if args.no_monitor_events is True:
         DO_NOT_MONITOR_GITHUB_EVENTS = True
 
@@ -2790,6 +3458,9 @@ def main():
         REPO_NOTIFICATION = False
         REPO_UPDATE_DATE_NOTIFICATION = False
 
+    if not TRACK_CONTRIB_CHANGES:
+        CONTRIB_NOTIFICATION = False
+
     if DO_NOT_MONITOR_GITHUB_EVENTS:
         EVENT_NOTIFICATION = False
 
@@ -2798,13 +3469,16 @@ def main():
         PROFILE_NOTIFICATION = False
         REPO_NOTIFICATION = False
         REPO_UPDATE_DATE_NOTIFICATION = False
+        CONTRIB_NOTIFICATION = False
         ERROR_NOTIFICATION = False
 
-    print(f"* Github polling interval:\t[ {display_time(GITHUB_CHECK_INTERVAL)} ]")
-    print(f"* Email notifications:\t\t[profile changes = {PROFILE_NOTIFICATION}] [new events = {EVENT_NOTIFICATION}]\n*\t\t\t\t[repos changes = {REPO_NOTIFICATION}] [repos update date = {REPO_UPDATE_DATE_NOTIFICATION}]\n*\t\t\t\t[errors = {ERROR_NOTIFICATION}]")
-    print(f"* Github API URL:\t\t{GITHUB_API_URL}")
+    print(f"* GitHub polling interval:\t[ {display_time(GITHUB_CHECK_INTERVAL)} ]")
+    print(f"* Email notifications:\t\t[profile changes = {PROFILE_NOTIFICATION}] [new events = {EVENT_NOTIFICATION}]\n*\t\t\t\t[repos changes = {REPO_NOTIFICATION}] [repos update date = {REPO_UPDATE_DATE_NOTIFICATION}]\n*\t\t\t\t[contrib changes = {CONTRIB_NOTIFICATION}] [errors = {ERROR_NOTIFICATION}]")
+    print(f"* GitHub API URL:\t\t{GITHUB_API_URL}")
     print(f"* Track repos changes:\t\t{TRACK_REPOS_CHANGES}")
-    print(f"* Monitor Github events:\t{not DO_NOT_MONITOR_GITHUB_EVENTS}")
+    print(f"* Track contrib changes:\t{TRACK_CONTRIB_CHANGES}")
+    print(f"* Monitor GitHub events:\t{not DO_NOT_MONITOR_GITHUB_EVENTS}")
+    print(f"* Get owned repos only:\t\t{not GET_ALL_REPOS}")
     print(f"* Liveness check:\t\t{bool(LIVENESS_CHECK_INTERVAL)}" + (f" ({display_time(LIVENESS_CHECK_INTERVAL)})" if LIVENESS_CHECK_INTERVAL else ""))
     print(f"* CSV logging enabled:\t\t{bool(CSV_FILE)}" + (f" ({CSV_FILE})" if CSV_FILE else ""))
     print(f"* Output logging enabled:\t{not DISABLE_LOGGING}" + (f" ({FINAL_LOG_PATH})" if not DISABLE_LOGGING else ""))
@@ -2812,9 +3486,10 @@ def main():
     print(f"* Dotenv file:\t\t\t{env_path or 'None'}")
     print(f"* Local timezone:\t\t{LOCAL_TIMEZONE}")
 
-    out = f"\nMonitoring Github user {args.username}"
+    out = f"\nMonitoring GitHub user {args.username}"
     print(out)
-    print("-" * len(out))
+    # print("-" * len(out))
+    print("─" * HORIZONTAL_LINE1)
 
     # We define signal handlers only for Linux, Unix & MacOS since Windows has limited number of signals supported
     if platform.system() != 'Windows':
@@ -2822,6 +3497,7 @@ def main():
         signal.signal(signal.SIGUSR2, toggle_new_events_notifications_signal_handler)
         signal.signal(signal.SIGCONT, toggle_repo_changes_notifications_signal_handler)
         signal.signal(signal.SIGPIPE, toggle_repo_update_date_changes_notifications_signal_handler)
+        signal.signal(signal.SIGURG, toggle_contrib_changes_notifications_signal_handler)
         signal.signal(signal.SIGTRAP, increase_check_signal_handler)
         signal.signal(signal.SIGABRT, decrease_check_signal_handler)
         signal.signal(signal.SIGHUP, reload_secrets_signal_handler)