From fc4655157adf0cd245ce16a3a7e38e144992152d Mon Sep 17 00:00:00 2001
From: Tobias Gruetzmacher <tobias-git@23.gs>
Date: Sun, 12 Jan 2020 22:36:24 +0100
Subject: [PATCH] Move some more modules to HTTPS and fix canonical URL

---
 dosagelib/plugins/a.py        |  4 ++--
 dosagelib/plugins/cyantian.py | 10 ++++------
 dosagelib/plugins/d.py        |  2 +-
 dosagelib/plugins/f.py        |  2 +-
 dosagelib/plugins/s.py        |  3 +--
 dosagelib/plugins/t.py        |  2 +-
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/dosagelib/plugins/a.py b/dosagelib/plugins/a.py
index eeca81e52..4ce0867c3 100644
--- a/dosagelib/plugins/a.py
+++ b/dosagelib/plugins/a.py
@@ -173,7 +173,7 @@ class Alice(_WordPressScraper):
 
 
 class AlienDice(_WordPressScraper):
-    url = 'http://aliendice.com/'
+    url = 'https://aliendice.com/'
     stripUrl = url + 'comic/%s/'
     firstStripUrl = stripUrl % '05162001'
 
@@ -190,7 +190,7 @@ class AlienDice(_WordPressScraper):
 
 class AlienDiceLegacy(_WordPressScraper):
     name = 'AlienDice/Legacy'
-    stripUrl = 'http://aliendice.com/comic/%s/'
+    stripUrl = 'https://aliendice.com/comic/%s/'
     url = stripUrl % 'legacy-2-15'
     firstStripUrl = stripUrl % 'legacy-1'
 
diff --git a/dosagelib/plugins/cyantian.py b/dosagelib/plugins/cyantian.py
index 16d8c9206..c94230070 100644
--- a/dosagelib/plugins/cyantian.py
+++ b/dosagelib/plugins/cyantian.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs
-# Copyright (C) 2012-2014 Bastian Kleineidam
-# Copyright (C) 2015-2016 Tobias Gruetzmacher
+# Copyright (C) 2019-2020 Tobias Gruetzmacher
 
 from __future__ import absolute_import, division, print_function
 
@@ -9,7 +7,7 @@ from .common import _WordPressScraper
 
 
 class TheCyantianChronicles(_WordPressScraper):
-    baseUrl = 'http://cyantian.net/'
+    baseUrl = 'https://cyantian.net/'
     stripUrl = baseUrl + 'comic/%s/'
 
     def __init__(self, name, story, first, last=None, nav=None):
@@ -53,13 +51,13 @@ class TheCyantianChronicles(_WordPressScraper):
 
 
 class Shivae(_WordPressScraper):
-    url = 'http://shivae.com/'
+    url = 'https://shivae.com/'
     stripUrl = url + 'gnip/%s/'
     firstStripUrl = stripUrl % 'cler/09202001'
 
 
 class ShivaeComics(_WordPressScraper):
-    baseUrl = 'http://shivae.net/'
+    baseUrl = 'https://shivae.net/'
 
     def __init__(self, name, story, first, last=None, nav=None):
         super(ShivaeComics, self).__init__('Shivae/' + name)
diff --git a/dosagelib/plugins/d.py b/dosagelib/plugins/d.py
index b2926bbd6..e8042f339 100644
--- a/dosagelib/plugins/d.py
+++ b/dosagelib/plugins/d.py
@@ -188,7 +188,7 @@ class DieselSweetiesOld(_ParserScraper):
 
 
 class Dilbert(_ParserScraper):
-    url = 'http://dilbert.com/'
+    url = 'https://dilbert.com/'
     stripUrl = url + 'strip/%s'
     firstStripUrl = stripUrl % '1989-04-16'
     starter = indirectStarter
diff --git a/dosagelib/plugins/f.py b/dosagelib/plugins/f.py
index adc4ea069..ab8574459 100644
--- a/dosagelib/plugins/f.py
+++ b/dosagelib/plugins/f.py
@@ -220,7 +220,7 @@ class FullFrontalNerdity(_BasicScraper):
 
 class FunInJammies(_WordPressScraper):
     url = ('https://web.archive.org/web/20170205105241/'
-        'http://www.funinjammies.com/')
+        'http://funinjammies.com/')
     stripUrl = url + 'comic.php?issue=%s'
     firstStripUrl = stripUrl % '1'
     prevSearch = '//a[text()="< Prev"]'
diff --git a/dosagelib/plugins/s.py b/dosagelib/plugins/s.py
index 3b3a6a0c9..345f40edc 100644
--- a/dosagelib/plugins/s.py
+++ b/dosagelib/plugins/s.py
@@ -343,12 +343,11 @@ class SomethingPositive(_ParserScraper):
 
 
 class Sorcery101(_WPWebcomic):
-    baseUrl = 'http://www.sorcery101.net/sorcery-101/'
+    baseUrl = 'https://kelmcdonald.com/sorcery-101/'
     stripUrl = baseUrl + '%s/'
     url = stripUrl % 'sorcery101-ch-01'
     firstStripUrl = url
     starter = indirectStarter
-    allow_errors = (500,)
     help = 'Index format: stripname'
 
 
diff --git a/dosagelib/plugins/t.py b/dosagelib/plugins/t.py
index df8634052..174aede7c 100644
--- a/dosagelib/plugins/t.py
+++ b/dosagelib/plugins/t.py
@@ -59,7 +59,7 @@ class TheClassMenagerie(_ParserScraper):
 
 
 class TheDevilsPanties(_WPNavi):
-    url = 'http://thedevilspanties.com/'
+    url = 'https://thedevilspanties.com/'
     stripUrl = url + 'archives/%s'
     firstStripUrl = stripUrl % '300'
     help = 'Index format: number'