diff --git a/.github/funding.yml b/.github/funding.yml index fbd5f34..f211209 100644 --- a/.github/funding.yml +++ b/.github/funding.yml @@ -1 +1,2 @@ -custom: "https://instaloader.github.io/contributing.html#donations" +github: [aandergr] +custom: "https://instaloader.github.io/sponsors.html" diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 6a02162..6b17c6c 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -30,5 +30,5 @@ jobs: stale-pr-label: 'stale' exempt-issue-label: 'leave open' exempt-pr-label: 'leave open' - days-before-stale: 90 + days-before-stale: 135 days-before-close: 14 diff --git a/README.rst b/README.rst index b52c7ed..8f943d2 100644 --- a/README.rst +++ b/README.rst @@ -114,6 +114,34 @@ already have a valid session cookie file. `Instaloader Documentation `__ +Contributing +------------ + +As an open source project, Instaloader heavily depends on the contributions from +its community. See +`contributing `__ +for how you may help Instaloader to become an even greater tool. + +Supporters +---------- + +.. current-sponsors-start + +See `Alex' GitHub Sponsors `__ page for +how you can sponsor the development of Instaloader! + +.. current-sponsors-end + +It is a pleasure for us to share our Instaloader to the world, and we are proud +to have attracted such an active and motivating community, with so many users +who share their suggestions and ideas with us. Buying a community-sponsored beer +or coffee from time to time is very likely to further raise our passion for the +development of Instaloader. + +| For Donations, we provide GitHub Sponsors page, a PayPal.Me link and a Bitcoin address. +| GitHub Sponsors: `Sponsor @aandergr on GitHub Sponsors `__ +| PayPal: `PayPal.me/aandergr `__ +| BTC: 1Nst4LoadeYzrKjJ1DX9CpbLXBYE9RKLwY Disclaimer ---------- @@ -126,21 +154,3 @@ subsidiaries. This is an independent and unofficial project. Use at your own ris Instaloader is licensed under an MIT license. Refer to ``LICENSE`` file for more information. .. disclaimer-end - -Contributing ------------- - -As an open source project, Instaloader heavily depends on the contributions from -its community. See -`contributing `__ -for how you may help Instaloader to become an even greater tool. - -It is a pleasure for us to share our Instaloader to the world, and we are proud -to have attracted such an active and motivating community, with so many users -who share their suggestions and ideas with us. Buying a community-sponsored beer -or coffee from time to time is very likely to further raise our passion for the -development of Instaloader. - -| For Donations, we provide a PayPal.Me link and a Bitcoin address. -| PayPal: `PayPal.me/aandergr `__ -| BTC: 1Nst4LoadeYzrKjJ1DX9CpbLXBYE9RKLwY diff --git a/docs/contributing.rst b/docs/contributing.rst index f011008..93d11e0 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -132,21 +132,9 @@ details. If you feel the need to do so, please create a "feature suggestion". be implemented and the underlying problem could be solved. Also **describe alternatives** that you have considered. -Donations ---------- +Sponsoring +---------- -.. donations-start - -It is a pleasure for us to share our Instaloader to the world, and we are proud -to have attracted such an active and motivating community, with so many users -who share their suggestions and ideas with us. Buying a community-sponsored beer -or coffee from time to time is very likely to further raise our passion for the -development of Instaloader. - -| For donations, we provide a PayPal.Me link and a Bitcoin address. -| `PayPal.me/aandergr `__ -| BTC: 1Nst4LoadeYzrKjJ1DX9CpbLXBYE9RKLwY - -.. donations-end - -.. (Discussion in :issue:`130`) +.. include:: sponsors.rst + :start-after: donations-start + :end-before: donations-end diff --git a/docs/index.rst b/docs/index.rst index 8bdbce6..aa935bf 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -78,13 +78,6 @@ Useful Links - `Issue Tracker / Bug Tracker `__ - `Version History `__ -Disclaimer ----------- - -.. include:: ../README.rst - :start-after: disclaimer-start - :end-before: disclaimer-end - Contributing ------------ @@ -92,10 +85,20 @@ As an open source project, Instaloader heavily depends on the contributions from its community. See :ref:`contributing` for how you may help Instaloader to become an even greater tool. -.. include:: contributing.rst +Supporters +---------- + +.. include:: sponsors.rst :start-after: donations-start :end-before: donations-end +Disclaimer +---------- + +.. include:: ../README.rst + :start-after: disclaimer-start + :end-before: disclaimer-end + .. * :ref:`genindex` * :ref:`modindex` diff --git a/docs/sponsors.rst b/docs/sponsors.rst new file mode 100644 index 0000000..0195ccd --- /dev/null +++ b/docs/sponsors.rst @@ -0,0 +1,23 @@ +.. _sponsors: + +Sponsoring the development of Instaloader +========================================= + +.. donations-start + +.. include:: ../README.rst + :start-after: current-sponsors-start + :end-before: current-sponsors-end + +It is a pleasure for us to share our Instaloader to the world, and we are proud +to have attracted such an active and motivating community, with so many users +who share their suggestions and ideas with us. Buying a community-sponsored beer +or coffee from time to time is very likely to further raise our passion for the +development of Instaloader. + +| For Donations, we provide GitHub Sponsors page, a PayPal.Me link and a Bitcoin address. +| GitHub Sponsors: `Sponsor @aandergr on GitHub Sponsors `__ +| PayPal: `PayPal.me/aandergr `__ +| BTC: 1Nst4LoadeYzrKjJ1DX9CpbLXBYE9RKLwY + +.. donations-end diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst index 35ca45b..a30ff5e 100644 --- a/docs/troubleshooting.rst +++ b/docs/troubleshooting.rst @@ -62,7 +62,8 @@ Two-Factor-Authentication. It also supports handling the *checkpoint challenge*, issued when Instagram suspects authentication activity on your account, by pointing the user to an URL to be opened in a browser. -Nevertheless, in :issue:`92` and :issue:`615` users reported problems with +Nevertheless, in :issue:`92`, :issue:`615`, :issue:`1150` and :issue:`1217`, +users reported problems with logging in. We recommend to always keep the session file which Instaloader creates when using :option:`--login`. If a session file is present, :option:`--login` does not make use of the failure-prone login procedure. diff --git a/instaloader/instaloadercontext.py b/instaloader/instaloadercontext.py index aab52f0..27474b1 100644 --- a/instaloader/instaloadercontext.py +++ b/instaloader/instaloadercontext.py @@ -154,7 +154,6 @@ class InstaloaderContext: if empty_session_only: del header['Host'] del header['Origin'] - del header['Referer'] del header['X-Instagram-AJAX'] del header['X-Requested-With'] return header