5 files changed, 34 insertions, 31 deletions
diff --git a/data/completion/_gallery-dl b/data/completion/_gallery-dl
index a82db8a..94d2f06 100644
--- a/data/completion/_gallery-dl
+++ b/data/completion/_gallery-dl
@@ -16,8 +16,6 @@ _arguments -C -S \
 --source-address'[Client-side IP address to bind to]':'<ip>' \
 --user-agent'[User-Agent request header]':'<ua>' \
 --clear-cache'[Delete cached login sessions, cookies, etc. for MODULE (ALL to delete everything)]':'<module>' \
---cookies'[File to load additional cookies from]':'<file>':_files \
---cookies-from-browser'[Name of the browser to load cookies from, with optional keyring name prefixed with "+", profile prefixed with ":", and container prefixed with "::" ("none" for no container)]':'<browser[+keyring][:profile][::container]>' \
 {-q,--quiet}'[Activate quiet mode]' \
 {-v,--verbose}'[Print various debugging information]' \
 {-g,--get-urls}'[Print URLs instead of downloading]' \
@@ -56,6 +54,9 @@ _arguments -C -S \
 {-u,--username}'[Username to login with]':'<user>' \
 {-p,--password}'[Password belonging to the given username]':'<pass>' \
 --netrc'[Enable .netrc authentication data]' \
+{-C,--cookies}'[File to load additional cookies from]':'<file>':_files \
+--cookies-export'[Export session cookies to FILE]':'<file>':_files \
+--cookies-from-browser'[Name of the browser to load cookies from, with optional domain prefixed with "/", keyring name prefixed with "+", profile prefixed with ":", and container prefixed with "::" ("none" for no container)]':'<browser[/domain][+keyring][:profile][::container]>' \
 --download-archive'[Record all downloaded or skipped files in FILE and skip downloading any file already in it]':'<file>':_files \
 {-A,--abort}'[Stop current extractor run after N consecutive file downloads were skipped]':'<n>' \
 {-T,--terminate}'[Stop current and parent extractor runs after N consecutive file downloads were skipped]':'<n>' \
diff --git a/data/completion/gallery-dl b/data/completion/gallery-dl
index 1750af8..02fc847 100644
--- a/data/completion/gallery-dl
+++ b/data/completion/gallery-dl
@@ -5,12 +5,12 @@ _gallery_dl()
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"
 
-    if [[ "${prev}" =~ ^(-i|--input-file|--cookies|--write-log|--write-unsupported|-c|--config|--config-yaml|--config-toml|--download-archive)$ ]]; then
+    if [[ "${prev}" =~ ^(-i|--input-file|--write-log|--write-unsupported|-c|--config|--config-yaml|--config-toml|-C|--cookies|--cookies-export|--download-archive)$ ]]; then
         COMPREPLY=( $(compgen -f -- "${cur}") )
     elif [[ "${prev}" =~ ^()$ ]]; then
         COMPREPLY=( $(compgen -d -- "${cur}") )
     else
-        COMPREPLY=( $(compgen -W "--help --version --input-file --filename --destination --directory --extractors --proxy --source-address --user-agent --clear-cache --cookies --cookies-from-browser --quiet --verbose --get-urls --resolve-urls --dump-json --simulate --extractor-info --list-keywords --list-modules --list-extractors --write-log --write-unsupported --write-pages --limit-rate --retries --http-timeout --sleep --sleep-request --sleep-extractor --filesize-min --filesize-max --chunk-size --no-part --no-skip --no-mtime --no-download --no-postprocessors --no-check-certificate --option --config --config-yaml --config-toml --config-create --config-ignore --ignore-config --username --password --netrc --download-archive --abort --terminate --range --chapter-range --filter --chapter-filter --zip --ugoira-conv --ugoira-conv-lossless --ugoira-conv-copy --write-metadata --write-info-json --write-infojson --write-tags --mtime-from-date --exec --exec-after --postprocessor --postprocessor-option" -- "${cur}") )
+        COMPREPLY=( $(compgen -W "--help --version --input-file --filename --destination --directory --extractors --proxy --source-address --user-agent --clear-cache --quiet --verbose --get-urls --resolve-urls --dump-json --simulate --extractor-info --list-keywords --list-modules --list-extractors --write-log --write-unsupported --write-pages --limit-rate --retries --http-timeout --sleep --sleep-request --sleep-extractor --filesize-min --filesize-max --chunk-size --no-part --no-skip --no-mtime --no-download --no-postprocessors --no-check-certificate --option --config --config-yaml --config-toml --config-create --config-ignore --ignore-config --username --password --netrc --cookies --cookies-export --cookies-from-browser --download-archive --abort --terminate --range --chapter-range --filter --chapter-filter --zip --ugoira-conv --ugoira-conv-lossless --ugoira-conv-copy --write-metadata --write-info-json --write-infojson --write-tags --mtime-from-date --exec --exec-after --postprocessor --postprocessor-option" -- "${cur}") )
     fi
 }
 
diff --git a/data/completion/gallery-dl.fish b/data/completion/gallery-dl.fish
index d764543..00e7b24 100644
--- a/data/completion/gallery-dl.fish
+++ b/data/completion/gallery-dl.fish
@@ -10,8 +10,6 @@ complete -c gallery-dl -x -l 'proxy' -d 'Use the specified proxy'
 complete -c gallery-dl -x -l 'source-address' -d 'Client-side IP address to bind to'
 complete -c gallery-dl -x -l 'user-agent' -d 'User-Agent request header'
 complete -c gallery-dl -x -l 'clear-cache' -d 'Delete cached login sessions, cookies, etc. for MODULE (ALL to delete everything)'
-complete -c gallery-dl -r -F -l 'cookies' -d 'File to load additional cookies from'
-complete -c gallery-dl -x -l 'cookies-from-browser' -d 'Name of the browser to load cookies from, with optional keyring name prefixed with "+", profile prefixed with ":", and container prefixed with "::" ("none" for no container)'
 complete -c gallery-dl -s 'q' -l 'quiet' -d 'Activate quiet mode'
 complete -c gallery-dl -s 'v' -l 'verbose' -d 'Print various debugging information'
 complete -c gallery-dl -s 'g' -l 'get-urls' -d 'Print URLs instead of downloading'
@@ -50,6 +48,9 @@ complete -c gallery-dl -l 'ignore-config' -d '==SUPPRESS=='
 complete -c gallery-dl -x -s 'u' -l 'username' -d 'Username to login with'
 complete -c gallery-dl -x -s 'p' -l 'password' -d 'Password belonging to the given username'
 complete -c gallery-dl -l 'netrc' -d 'Enable .netrc authentication data'
+complete -c gallery-dl -r -F -s 'C' -l 'cookies' -d 'File to load additional cookies from'
+complete -c gallery-dl -r -F -l 'cookies-export' -d 'Export session cookies to FILE'
+complete -c gallery-dl -x -l 'cookies-from-browser' -d 'Name of the browser to load cookies from, with optional domain prefixed with "/", keyring name prefixed with "+", profile prefixed with ":", and container prefixed with "::" ("none" for no container)'
 complete -c gallery-dl -r -F -l 'download-archive' -d 'Record all downloaded or skipped files in FILE and skip downloading any file already in it'
 complete -c gallery-dl -x -s 'A' -l 'abort' -d 'Stop current extractor run after N consecutive file downloads were skipped'
 complete -c gallery-dl -x -s 'T' -l 'terminate' -d 'Stop current and parent extractor runs after N consecutive file downloads were skipped'
diff --git a/data/man/gallery-dl.1 b/data/man/gallery-dl.1
index b5ad7f2..f018c63 100644
--- a/data/man/gallery-dl.1
+++ b/data/man/gallery-dl.1
@@ -1,4 +1,4 @@
-.TH "GALLERY-DL" "1" "2023-04-30" "1.25.3" "gallery-dl Manual"
+.TH "GALLERY-DL" "1" "2023-05-07" "1.25.4" "gallery-dl Manual"
 .\" disable hyphenation
 .nh
 
@@ -50,12 +50,6 @@ User-Agent request header
 .B "\-\-clear\-cache" \f[I]MODULE\f[]
 Delete cached login sessions, cookies, etc. for MODULE (ALL to delete everything)
 .TP
-.B "\-\-cookies" \f[I]FILE\f[]
-File to load additional cookies from
-.TP
-.B "\-\-cookies\-from\-browser" \f[I]BROWSER[+KEYRING][:PROFILE][::CONTAINER]\f[]
-Name of the browser to load cookies from, with optional keyring name prefixed with '+', profile prefixed with ':', and container prefixed with '::' ('none' for no container)
-.TP
 .B "\-q, \-\-quiet" 
 Activate quiet mode
 .TP
@@ -167,6 +161,15 @@ Password belonging to the given username
 .B "\-\-netrc" 
 Enable .netrc authentication data
 .TP
+.B "\-C, \-\-cookies" \f[I]FILE\f[]
+File to load additional cookies from
+.TP
+.B "\-\-cookies\-export" \f[I]FILE\f[]
+Export session cookies to FILE
+.TP
+.B "\-\-cookies\-from\-browser" \f[I]BROWSER[/DOMAIN][+KEYRING][:PROFILE][::CONTAINER]\f[]
+Name of the browser to load cookies from, with optional domain prefixed with '/', keyring name prefixed with '+', profile prefixed with ':', and container prefixed with '::' ('none' for no container)
+.TP
 .B "\-\-download\-archive" \f[I]FILE\f[]
 Record all downloaded or skipped files in FILE and skip downloading any file already in it
 .TP
diff --git a/data/man/gallery-dl.conf.5 b/data/man/gallery-dl.conf.5
index 3bd9f17..8008451 100644
--- a/data/man/gallery-dl.conf.5
+++ b/data/man/gallery-dl.conf.5
@@ -1,4 +1,4 @@
-.TH "GALLERY-DL.CONF" "5" "2023-04-30" "1.25.3" "gallery-dl Manual"
+.TH "GALLERY-DL.CONF" "5" "2023-05-07" "1.25.4" "gallery-dl Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -548,25 +548,35 @@ Source to read additional cookies from. This can be
 * The optional third entry is the keyring to retrieve passwords for decrypting cookies from
 .br
 * The optional fourth entry is a (Firefox) container name (\f[I]"none"\f[] for only cookies with no container)
+.br
+* The optional fifth entry is the domain to extract cookies for. Prefix it with a dot \f[I].\f[] to include cookies for subdomains. Has no effect when also specifying a container.
 
 .. code:: json
 
 ["firefox"]
 ["firefox", null, null, "Personal"]
-["chromium", "Private", "kwallet"]
+["chromium", "Private", "kwallet", null, ".twitter.com"]
 
 
 .SS extractor.*.cookies-update
 .IP "Type:" 6
-\f[I]bool\f[]
+.br
+* \f[I]bool\f[]
+.br
+* \f[I]Path\f[]
 
 .IP "Default:" 9
 \f[I]true\f[]
 
 .IP "Description:" 4
-If \f[I]extractor.*.cookies\f[] specifies the \f[I]Path\f[] of a cookies.txt
-file and it can be opened and parsed without errors,
-update its contents with cookies received during data extraction.
+Export session cookies in cookies.txt format.
+
+.br
+* If this is a \f[I]Path\f[], write cookies to the given file path.
+
+.br
+* If this is \f[I]true\f[] and \f[I]extractor.*.cookies\f[] specifies the \f[I]Path\f[]
+of a valid cookies.txt file, update its contents.
 
 
 .SS extractor.*.proxy
@@ -2409,18 +2419,6 @@ Fetch media from renoted notes.
 Fetch media from replies to other notes.
 
 
-.SS extractor.nana.favkey
-.IP "Type:" 6
-\f[I]string\f[]
-
-.IP "Default:" 9
-\f[I]null\f[]
-
-.IP "Description:" 4
-Your \f[I]Nana Favorite Key\f[],
-used to access your favorite archives.
-
-
 .SS extractor.newgrounds.flash
 .IP "Type:" 6
 \f[I]bool\f[]