diff --git a/files/assets/css/lite-youtube.css b/files/assets/css/lite-youtube.css index 78eb5459c..2199a725c 100644 --- a/files/assets/css/lite-youtube.css +++ b/files/assets/css/lite-youtube.css @@ -53,7 +53,7 @@ lite-youtube > .lty-playbtn { z-index: 1; background-color: transparent; /* YT's actual play button svg */ - background-image: url('data:image/svg+xml;utf8,'); + background-image: url('data:image/svg+xml;utf8,'); filter: grayscale(100%); transition: filter .1s cubic-bezier(0, 0, 0.2, 1); border: none; diff --git a/files/assets/js/lite-youtube.js b/files/assets/js/lite-youtube.js index 74af1bed8..cd38a64b7 100644 --- a/files/assets/js/lite-youtube.js +++ b/files/assets/js/lite-youtube.js @@ -77,7 +77,7 @@ * preload/prefetch'ing them outside the iframe will only cause double-downloads. * So, the best we can do is warm up a few connections to origins that are in the critical path. * - * Maybe `` would work, but it's unsupported: http://crbug.com/593267 + * Maybe `` would work, but it's unsupported: https://crbug.com/593267 * But TBH, I don't think it'll happen soon with Site Isolation and split caches adding serious complexity. */ static warmConnections() { diff --git a/files/classes/submission.py b/files/classes/submission.py index d876b25a0..54af7298f 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -213,11 +213,11 @@ class Submission(Base): @property @lazy def thumb_url(self): - if self.over_18: return f"http://{site}/assets/images/nsfw.webp" - elif not self.url: return f"http://{site}/assets/images/{site_name}/default_text.webp" + if self.over_18: return f"https://{site}/assets/images/nsfw.webp" + elif not self.url: return f"https://{site}/assets/images/{site_name}/default_text.webp" elif self.thumburl: return self.thumburl - elif "youtu.be" in self.domain or "youtube.com" == self.domain: return f"http://{site}/assets/images/default_thumb_yt.webp" - else: return f"http://{site}/assets/images/default_thumb_link.webp" + elif "youtu.be" in self.domain or "youtube.com" == self.domain: return f"https://{site}/assets/images/default_thumb_yt.webp" + else: return f"https://{site}/assets/images/default_thumb_link.webp" @property @lazy diff --git a/files/classes/user.py b/files/classes/user.py index 67d3aa392..d629100b1 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -411,15 +411,15 @@ class User(Base): @lazy def banner_url(self): if self.bannerurl: return self.bannerurl - else: return f"http://{site}/assets/images/{site_name}/preview.webp?v=3" + else: return f"https://{site}/assets/images/{site_name}/preview.webp?v=3" @property @lazy def profile_url(self): - if self.agendaposter: return f"http://{site}/assets/images/defaultpictures/agendaposter/{random.randint(1, 50)}.webp?v=1" + if self.agendaposter: return f"https://{site}/assets/images/defaultpictures/agendaposter/{random.randint(1, 50)}.webp?v=1" if self.profileurl: return self.profileurl - if "rama" in site: return f"http://{site}/assets/images/defaultpictures/{random.randint(1, 150)}.webp?v=1" - return f"http://{site}/assets/images/default-profile-pic.webp" + if "rama" in site: return f"https://{site}/assets/images/defaultpictures/{random.randint(1, 150)}.webp?v=1" + return f"https://{site}/assets/images/default-profile-pic.webp" @property @lazy diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index 4d8df5f94..539233756 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -182,7 +182,7 @@ def sanitize(sanitized, noimages=False): remoji = emoji if path.isfile(f'./files/assets/images/emojis/{remoji}.webp'): - new = re.sub(f'(?', new) + new = re.sub(f'(?', new) if remoji in session["favorite_emojis"]: session["favorite_emojis"][remoji] += 1 else: session["favorite_emojis"][remoji] = 1 @@ -195,13 +195,13 @@ def sanitize(sanitized, noimages=False): if emoji.startswith("!"): emoji = emoji[1:] if path.isfile(f'./files/assets/images/emojis/{emoji}.webp'): - sanitized = re.sub(f'(?', sanitized) + sanitized = re.sub(f'(?', sanitized) if emoji in session["favorite_emojis"]: session["favorite_emojis"][emoji] += 1 else: session["favorite_emojis"][emoji] = 1 elif path.isfile(f'./files/assets/images/emojis/{emoji}.webp'): - sanitized = re.sub(f'(?', sanitized) + sanitized = re.sub(f'(?', sanitized) if emoji in session["favorite_emojis"]: session["favorite_emojis"][emoji] += 1 else: session["favorite_emojis"][emoji] = 1 @@ -265,10 +265,10 @@ def filter_title(title): if emoji.startswith("!"): emoji = emoji[1:] if path.isfile(f'./files/assets/images/emojis/{emoji}.webp'): - title = re.sub(f'(?', title) + title = re.sub(f'(?', title) elif path.isfile(f'./files/assets/images/emojis/{emoji}.webp'): - title = re.sub(f'(?', title) + title = re.sub(f'(?', title) if len(title) > 1500: abort(400) else: return title \ No newline at end of file diff --git a/files/routes/comments.py b/files/routes/comments.py index 71867fbf1..f51ec5fc3 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -565,7 +565,7 @@ def api_comment(v): 'notification': { 'title': f'New reply by @{v.username}', 'body': c.body, - 'deep_link': f'http://{site}/comment/{c.id}?context=9&read=true#context', + 'deep_link': f'https://{site}/comment/{c.id}?context=9&read=true#context', }, }, }, diff --git a/files/routes/feeds.py b/files/routes/feeds.py index 50b49c980..f2ed56b31 100644 --- a/files/routes/feeds.py +++ b/files/routes/feeds.py @@ -51,7 +51,7 @@ def feeds_user(sort='hot', t='all'): with tag("name"): text(post.author.username) with tag("uri"): - text(f'http://{site}/@{post.author.username}') + text(f'https://{site}/@{post.author.username}') doc.stag("link", href=full_link(post.permalink)) diff --git a/files/routes/posts.py b/files/routes/posts.py index 643acb235..7d068a044 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -62,12 +62,12 @@ def publish(pid, v): user = g.db.query(User).filter_by(username=username).first() if user and not v.any_block_exists(user) and user.id != v.id: notify_users.add(user.id) - for x in notify_users: send_notification(x, f"@{v.username} has mentioned you: http://{site}{post.permalink}") + for x in notify_users: send_notification(x, f"@{v.username} has mentioned you: https://{site}{post.permalink}") for follow in v.followers: user = get_account(follow.user_id) if post.club and not user.club_allowed: continue - send_notification(user.id, f"@{v.username} has made a new post: [{post.title}](http://{site}{post.permalink})", True) + send_notification(user.id, f"@{v.username} has made a new post: [{post.title}](https://{site}{post.permalink})", True) cache.delete_memoized(frontlist) @@ -481,7 +481,7 @@ def edit_post(pid, v): user = g.db.query(User).filter_by(username=username).first() if user and not v.any_block_exists(user) and user.id != v.id: notify_users.add(user.id) - message = f"@{v.username} has mentioned you: http://{site}{p.permalink}" + message = f"@{v.username} has mentioned you: https://{site}{p.permalink}" for x in notify_users: send_notification(x, message) @@ -524,8 +524,8 @@ def thumbnail_thread(pid): if fragment_url.startswith("https://"): return fragment_url - elif fragment_url.startswith("http://"): - return f"https://{fragment_url.split('http://')[1]}" + elif fragment_url.startswith("https://"): + return f"https://{fragment_url.split('https://')[1]}" elif fragment_url.startswith('//'): return f"https:{fragment_url}" elif fragment_url.startswith('/'): @@ -968,12 +968,12 @@ def submit_post(v): user = g.db.query(User).filter_by(username=username).first() if user and not v.any_block_exists(user) and user.id != v.id: notify_users.add(user.id) - for x in notify_users: send_notification(x, f"@{v.username} has mentioned you: http://{site}{new_post.permalink}") + for x in notify_users: send_notification(x, f"@{v.username} has mentioned you: https://{site}{new_post.permalink}") for follow in v.followers: user = get_account(follow.user_id) if new_post.club and not user.club_allowed: continue - send_notification(user.id, f"@{v.username} has made a new post: [{title}](http://{site}{new_post.permalink})", True) + send_notification(user.id, f"@{v.username} has made a new post: [{title}](https://{site}{new_post.permalink})", True) g.db.add(new_post) g.db.flush() @@ -1119,7 +1119,7 @@ def submit_post(v): cache.delete_memoized(frontlist) cache.delete_memoized(User.userpagelisting) if v.admin_level > 1 and ("[changelog]" in new_post.title or "(changelog)" in new_post.title): - send_message(f"http://{site}{new_post.permalink}") + send_message(f"https://{site}{new_post.permalink}") cache.delete_memoized(changeloglist) g.db.commit() diff --git a/files/routes/reporting.py b/files/routes/reporting.py index 4e8cde187..f0b24c48c 100644 --- a/files/routes/reporting.py +++ b/files/routes/reporting.py @@ -21,7 +21,7 @@ def api_flag_post(pid, v): for i in re.finditer(':(.{1,30}?):', reason): if path.isfile(f'./files/assets/images/emojis/{i.group(1)}.webp'): - reason = reason.replace(f':{i.group(1)}:', f':{i.group(1)}:') + reason = reason.replace(f':{i.group(1)}:', f':{i.group(1)}:') if len(reason) > 350: return {"error": f"Too long."} @@ -55,7 +55,7 @@ def api_flag_comment(cid, v): for i in re.finditer(':(.{1,30}?):', reason): if path.isfile(f'./files/assets/images/emojis/{i.group(1)}.webp'): - reason = reason.replace(f':{i.group(1)}:', f':{i.group(1)}:') + reason = reason.replace(f':{i.group(1)}:', f':{i.group(1)}:') if len(reason) > 350: return {"error": f"Too long."} diff --git a/files/routes/static.py b/files/routes/static.py index 476d4ae3b..6b5f2f4de 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -231,7 +231,7 @@ def contact(v): @limiter.limit("1/second") @auth_required def submit_contact(v): - message = f'This message has been sent automatically to all admins via http://{site}/contact, user email is "{v.email}"\n\nMessage:\n\n' + request.values.get("message", "") + message = f'This message has been sent automatically to all admins via https://{site}/contact, user email is "{v.email}"\n\nMessage:\n\n' + request.values.get("message", "") send_admin(v.id, message) g.db.commit() return render_template("contact.html", v=v, msg="Your message has been sent.") diff --git a/files/routes/users.py b/files/routes/users.py index 36213e729..46e5e9a68 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -383,7 +383,7 @@ def message2(v, username): 'notification': { 'title': f'New message from @{v.username}', 'body': message, - 'deep_link': f'http://{site}/notifications', + 'deep_link': f'https://{site}/notifications', }, }, }, diff --git a/files/templates/default.html b/files/templates/default.html index 874e99f08..fa20c2438 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -206,7 +206,7 @@ - + {% endif %} {% endblock %} diff --git a/redis.conf b/redis.conf index 7c4de0e43..32dd36978 100644 --- a/redis.conf +++ b/redis.conf @@ -694,7 +694,7 @@ replica-lazy-flush no # If the AOF is enabled on startup Redis will load the AOF, that is the file # with the better durability guarantees. # -# Please check http://redis.io/topics/persistence for more information. +# Please check https://redis.io/topics/persistence for more information. appendonly no @@ -721,7 +721,7 @@ appendfilename "appendonly.aof" # everysec. # # More details please check the following article: -# http://antirez.com/post/redis-persistence-demystified.html +# https://antirez.com/post/redis-persistence-demystified.html # # If unsure, use "everysec". @@ -933,7 +933,7 @@ lua-time-limit 5000 # cluster-replica-no-failover no # In order to setup your cluster make sure to read the documentation -# available at http://redis.io web site. +# available at https://redis.io web site. ########################## CLUSTER DOCKER/NAT support ######################## @@ -1016,7 +1016,7 @@ latency-monitor-threshold 0 ############################# EVENT NOTIFICATION ############################## # Redis can notify Pub/Sub clients about events happening in the key space. -# This feature is documented at http://redis.io/topics/notifications +# This feature is documented at https://redis.io/topics/notifications # # For instance if keyspace events notification is enabled, and a client # performs a DEL operation on key "foo" stored in the Database 0, two