octospacc
/
staticoso
mirror of https://gitlab.com/octtspacc/staticoso
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix deps

This commit is contained in:
octospacc 2022-07-01 15:14:05 +02:00
parent aff9a36c4a
commit 96c2695de4
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Build.py
View File

@ -491,24 +491,20 @@ def Main(Args, FeedEntries):
SiteDomain, SiteDomain,
SiteLang, SiteLang,
Locale) Locale)
#print(MastodonPosts)
else: else:
MastodonPosts = [] MastodonPosts = []
for File, Content, Titles, Meta, HTMLContent, Description, Image in Pages: for File, Content, Titles, Meta, HTMLContent, Description, Image in Pages:
#if Meta['Type'] == 'Post':
File = 'public/{}.html'.format(StripExt(File)) File = 'public/{}.html'.format(StripExt(File))
Content = ReadFile(File) Content = ReadFile(File)
Post = '' Post = ''
for p in MastodonPosts: for p in MastodonPosts:
#print(SiteDomain + File[len('public/'):])
if p['Link'] == SiteDomain + '/' + File[len('public/'):]: if p['Link'] == SiteDomain + '/' + File[len('public/'):]:
Post = '<br><h3>{StrComments}</h3><a href="{URL}" rel="noopener" target="_blank">{StrOpen} ↗️</a>'.format( Post = '<br><h3>{StrComments}</h3><a href="{URL}" rel="noopener" target="_blank">{StrOpen} ↗️</a>'.format(
StrComments=Locale['Comments'], StrComments=Locale['Comments'],
StrOpen=Locale['OpenInNewTab'], StrOpen=Locale['OpenInNewTab'],
URL=p['Post']) URL=p['Post'])
break break
#print(Post)
Content = Content.replace('[HTML:Comments]', Post) Content = Content.replace('[HTML:Comments]', Post)
WriteFile(File, Content) WriteFile(File, Content)

12
Source/Libs/mastodon/Mastodon.py
View File

@ -18,13 +18,13 @@ except ModuleNotFoundError:
import requests import requests
from requests.models import urlencode from requests.models import urlencode
import dateutil from .. import dateutil
import dateutil.parser from ..dateutil import parser as dateutil_parser #import dateutil.parser
import re import re
import copy import copy
import threading import threading
import sys import sys
import six from .. import six
from decorator import decorate from decorator import decorate
import hashlib import hashlib
@ -3222,7 +3222,7 @@ class Mastodon:
if isinstance(v, int): if isinstance(v, int):
json_object[k] = datetime.datetime.fromtimestamp(v, pytz.utc) if have_pytz else datetime.datetime json_object[k] = datetime.datetime.fromtimestamp(v, pytz.utc) if have_pytz else datetime.datetime
else: else:
json_object[k] = dateutil.parser.parse(v) json_object[k] = dateutil_parser.parse(v)
except: except:
raise MastodonAPIError('Encountered invalid date.') raise MastodonAPIError('Encountered invalid date.')
return json_object return json_object
@ -3361,12 +3361,12 @@ class Mastodon:
self.ratelimit_limit = int(response_object.headers['X-RateLimit-Limit']) self.ratelimit_limit = int(response_object.headers['X-RateLimit-Limit'])
try: try:
ratelimit_reset_datetime = dateutil.parser.parse(response_object.headers['X-RateLimit-Reset']) ratelimit_reset_datetime = dateutil_parser.parse(response_object.headers['X-RateLimit-Reset'])
self.ratelimit_reset = self.__datetime_to_epoch(ratelimit_reset_datetime) self.ratelimit_reset = self.__datetime_to_epoch(ratelimit_reset_datetime)
# Adjust server time to local clock # Adjust server time to local clock
if 'Date' in response_object.headers: if 'Date' in response_object.headers:
server_time_datetime = dateutil.parser.parse(response_object.headers['Date']) server_time_datetime = dateutil_parser.parse(response_object.headers['Date'])
server_time = self.__datetime_to_epoch(server_time_datetime) server_time = self.__datetime_to_epoch(server_time_datetime)
server_time_diff = time.time() - server_time server_time_diff = time.time() - server_time
self.ratelimit_reset += server_time_diff self.ratelimit_reset += server_time_diff