From 2587296deb6f1e509878edddaaa651ac646b100f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Thu, 2 Apr 2020 22:34:32 +0200
Subject: [PATCH] [mastodon] add access tokens for mastodon.social and
 baraag.net

(closes #665)
---
 docs/supportedsites.rst          |  2 ++
 gallery_dl/extractor/mastodon.py | 12 ++++++++++++
 scripts/supportedsites.py        |  2 ++
 3 files changed, 16 insertions(+)

diff --git a/docs/supportedsites.rst b/docs/supportedsites.rst
index c793c6c4..3b16fc40 100644
--- a/docs/supportedsites.rst
+++ b/docs/supportedsites.rst
@@ -18,6 +18,7 @@ arch.b4k.co          https://arch.b4k.co/                Threads
 Archive of Sins      https://archiveofsins.com/          Threads
 Archived.Moe         https://archived.moe/               Threads
 ArtStation           https://www.artstation.com/         |artstation-C|
+baraag               https://baraag.net/                 Images from Statuses, User Profiles
 Behance              https://www.behance.net/            Collections, Galleries, User Profiles
 Blogger              https://www.blogger.com/            Blogs, Posts
 BobX                 http://www.bobx.com/dark/           Galleries, Idols
@@ -77,6 +78,7 @@ Mangapanda           https://www.mangapanda.com/         Chapters, Manga
 MangaPark            https://mangapark.net/              Chapters, Manga
 Mangareader          https://www.mangareader.net/        Chapters, Manga
 Mangoxo              https://www.mangoxo.com/            Albums, Channels                                   Optional
+mastodon.social      https://mastodon.social/            Images from Statuses, User Profiles
 Naver                https://blog.naver.com/             Blogs, Posts
 Newgrounds           https://www.newgrounds.com/         |newgrounds-C|                                     Optional
 Ngomik               http://ngomik.in/                   Chapters
diff --git a/gallery_dl/extractor/mastodon.py b/gallery_dl/extractor/mastodon.py
index 36e0b62d..7219341d 100644
--- a/gallery_dl/extractor/mastodon.py
+++ b/gallery_dl/extractor/mastodon.py
@@ -189,6 +189,12 @@ def generate_extractors():
 
 
 EXTRACTORS = {
+    "mastodon.social": {
+        "category"     : "mastodon.social",
+        "access-token" : "Y06R36SMvuXXN5_wiPKFAEFiQaMSQg0o_hGgc86Jj48",
+        "client-id"    : "dBSHdpsnOUZgxOnjKSQrWEPakO3ctM7HmsyoOd4FcRo",
+        "client-secret": "DdrODTHs_XoeOsNVXnILTMabtdpWrWOAtrmw91wU1zI",
+    },
     "pawoo.net": {
         "category"     : "pawoo",
         "access-token" : "286462927198d0cf3e24683e91c8259a"
@@ -198,6 +204,12 @@ EXTRACTORS = {
         "client-secret": "e45bef4bad45b38abf7d9ef88a646b73"
                          "75e7fb2532c31a026327a93549236481",
     },
+    "baraag.net": {
+        "category"     : "baraag",
+        "access-token" : "53P1Mdigf4EJMH-RmeFOOSM9gdSDztmrAYFgabOKKE0",
+        "client-id"    : "czxx2qilLElYHQ_sm-lO8yXuGwOHxLX9RYYaD0-nq1o",
+        "client-secret": "haMaFdMBgK_-BIxufakmI2gFgkYjqmgXGEO2tB-R2xY",
+    },
 }
 
 
diff --git a/scripts/supportedsites.py b/scripts/supportedsites.py
index ac68c893..8bfb3941 100755
--- a/scripts/supportedsites.py
+++ b/scripts/supportedsites.py
@@ -18,6 +18,7 @@ CATEGORY_MAP = {
     "archiveofsins"  : "Archive of Sins",
     "artstation"     : "ArtStation",
     "b4k"            : "arch.b4k.co",
+    "baraag"         : "baraag",
     "bcy"            : "半次元",
     "bobx"           : "BobX",
     "deviantart"     : "DeviantArt",
@@ -55,6 +56,7 @@ CATEGORY_MAP = {
     "mangahere"      : "Manga Here",
     "mangapark"      : "MangaPark",
     "mangastream"    : "Manga Stream",
+    "mastodon.social": "mastodon.social",
     "myportfolio"    : "Adobe Portfolio",
     "nhentai"        : "nhentai",
     "nijie"          : "nijie",